Remove NATRON_ENUM

acolwell · Dec 17, 2024 · 630bf00 · 630bf00
1 parent 8326245
commit 630bf00
Show file tree

Hide file tree

Showing 19 changed files with 150 additions and 275 deletions.
diff --git a/Engine/AppInstance.h b/Engine/AppInstance.h
@@ -193,22 +193,22 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     virtual void warningDialog(const std::string & title, const std::string & message, bool* stopAsking, bool useHtml) const;
     virtual void informationDialog(const std::string & title, const std::string & message, bool useHtml) const;
     virtual void informationDialog(const std::string & title, const std::string & message, bool* stopAsking, bool useHtml) const;
-    virtual NATRON_ENUM::StandardButtonEnum questionDialog(const std::string & title,
+    virtual StandardButtonEnum questionDialog(const std::string & title,
                                               const std::string & message,
                                               bool useHtml,
-                                              NATRON_ENUM::StandardButtons buttons =
-                                                  NATRON_ENUM::StandardButtons(NATRON_ENUM::eStandardButtonYes | NATRON_ENUM::eStandardButtonNo),
-                                              NATRON_ENUM::StandardButtonEnum defaultButton = NATRON_ENUM::eStandardButtonNoButton) const WARN_UNUSED_RETURN;
+                                              StandardButtons buttons =
+                                                  StandardButtons(eStandardButtonYes | eStandardButtonNo),
+                                              StandardButtonEnum defaultButton = eStandardButtonNoButton) const WARN_UNUSED_RETURN;
 
     /**
      * @brief Asks a question to the user and returns the reply.
      * @param stopAsking Set to true if the user do not want Natron to ask the question again.
      **/
-    virtual NATRON_ENUM::StandardButtonEnum questionDialog(const std::string & /*title*/,
+    virtual StandardButtonEnum questionDialog(const std::string & /*title*/,
                                               const std::string & /*message*/,
                                               bool /*useHtml*/,
-                                              NATRON_ENUM::StandardButtons /*buttons*/,
-                                              NATRON_ENUM::StandardButtonEnum /*defaultButton*/,
+                                              StandardButtons /*buttons*/,
+                                              StandardButtonEnum /*defaultButton*/,
                                               bool* /*stopAsking*/)
     {
         return eStandardButtonYes;
@@ -281,7 +281,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     {
     }
 
-    NATRON_ENUM::ViewerColorSpaceEnum getDefaultColorSpaceForBitDepth(NATRON_ENUM::ImageBitDepthEnum bitdepth) const;
+    ViewerColorSpaceEnum getDefaultColorSpaceForBitDepth(ImageBitDepthEnum bitdepth) const;
 
     double getProjectFrameRate() const;
 

diff --git a/Engine/AppManager.h b/Engine/AppManager.h
@@ -494,7 +494,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     void setOFXHostHandle(void* handle);
 
     OFX::Host::ImageEffect::Descriptor* getPluginContextAndDescribe(OFX::Host::ImageEffect::ImageEffectPlugin* plugin,
-                                                                    NATRON_ENUM::ContextEnum* ctx);
+                                                                    ContextEnum* ctx);
     AppTLS* getAppTLS() const;
     const OfxHost* getOFXHost() const;
     GPUContextPool* getGPUContextPool() const;
@@ -567,7 +567,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
 
     bool isTextureFloatSupported() const;
 
-    bool hasOpenGLForRequirements(NATRON_ENUM::OpenGLRequirementsTypeEnum type, QString* missingOpenGLError = 0) const;
+    bool hasOpenGLForRequirements(OpenGLRequirementsTypeEnum type, QString* missingOpenGLError = 0) const;
 
     virtual void updateAboutWindowLibrariesVersion() {}
 
@@ -736,14 +736,14 @@ void warningDialog(const std::string & title, const std::string & message, bool*
 void informationDialog(const std::string & title, const std::string & message, bool useHtml = false);
 void informationDialog(const std::string & title, const std::string & message, bool* stopAsking, bool useHtml = false);
 
-NATRON_ENUM::StandardButtonEnum questionDialog(const std::string & title, const std::string & message, bool useHtml,
-                                  NATRON_ENUM::StandardButtons buttons =
-                                      NATRON_ENUM::StandardButtons(NATRON_ENUM::eStandardButtonYes | NATRON_ENUM::eStandardButtonNo),
-                                  NATRON_ENUM::StandardButtonEnum defaultButton = NATRON_ENUM::eStandardButtonNoButton);
+StandardButtonEnum questionDialog(const std::string & title, const std::string & message, bool useHtml,
+                                  StandardButtons buttons =
+                                      StandardButtons(eStandardButtonYes | eStandardButtonNo),
+                                  StandardButtonEnum defaultButton = eStandardButtonNoButton);
 
-NATRON_ENUM::StandardButtonEnum questionDialog(const std::string & title, const std::string & message, bool useHtml,
-                                  NATRON_ENUM::StandardButtons buttons,
-                                  NATRON_ENUM::StandardButtonEnum defaultButton,
+StandardButtonEnum questionDialog(const std::string & title, const std::string & message, bool useHtml,
+                                  StandardButtons buttons,
+                                  StandardButtonEnum defaultButton,
                                   bool* stopAsking);
 } // namespace Dialogs