reduce warnings

MX-05 · Jun 29, 2017 · 8b2b551 · 8b2b551
1 parent 62cdf76
commit 8b2b551
Show file tree

Hide file tree

Showing 624 changed files with 1,862 additions and 1,689 deletions.
diff --git a/Engine/AbortableRenderInfo.cpp b/Engine/AbortableRenderInfo.cpp
@@ -46,7 +46,7 @@
 // waste resources.
 #define NATRON_ABORT_TIMEOUT_MS 5000
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 typedef std::set<AbortableThread*> ThreadSet;
 
@@ -279,7 +279,7 @@ AbortableRenderInfo::onAbortTimerTimeout()
     }
 } // AbortableRenderInfo::onAbortTimerTimeout
 
-NATRON_NAMESPACE_EXIT;
-NATRON_NAMESPACE_USING;
+NATRON_NAMESPACE_EXIT
+NATRON_NAMESPACE_USING
 
 #include "moc_AbortableRenderInfo.cpp"
diff --git a/Engine/AbortableRenderInfo.h b/Engine/AbortableRenderInfo.h
@@ -39,7 +39,7 @@
 #include "Engine/EngineFwd.h"
 
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 /**
  * @brief Holds infos necessary to identify one render request and whether it was aborted or not.
@@ -153,6 +153,6 @@ public Q_SLOTS:
     boost::scoped_ptr<AbortableRenderInfoPrivate> _imp;
 };
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 #endif // ABORTABLERENDERINFO_H
diff --git a/Engine/AfterQuitProcessingI.h b/Engine/AfterQuitProcessingI.h
@@ -29,7 +29,7 @@
 
 #include "Engine/EngineFwd.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 /**
  * @brief This class is used to be able to perform an action after a call to Project::quitAnyProcessingForAllNodes has been made.
@@ -51,6 +51,6 @@ class AfterQuitProcessingI
     friend class Project;
 };
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 #endif // AFTERQUITPROCESSINGI_H
diff --git a/Engine/AppInstance.cpp b/Engine/AppInstance.cpp
@@ -73,7 +73,7 @@ CLANG_DIAG_ON(unknown-pragmas)
 #include "Engine/Settings.h"
 #include "Engine/WriteNode.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 FlagSetter::FlagSetter(bool initialValue,
                        bool* p)
@@ -2340,7 +2340,7 @@ AppInstance::recheckInvalidExpressions()
     }
 }
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
-NATRON_NAMESPACE_USING;
+NATRON_NAMESPACE_USING
 #include "moc_AppInstance.cpp"
diff --git a/Engine/AppInstance.h b/Engine/AppInstance.h
@@ -46,7 +46,7 @@
 #include "Engine/TimeLineKeyFrames.h"
 #include "Engine/EngineFwd.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 struct AppInstancePrivate;
 
@@ -494,6 +494,6 @@ class CreatingNodeTreeFlag_RAII
     }
 };
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 #endif // APPINSTANCE_H
diff --git a/Engine/AppManager.cpp b/Engine/AppManager.cpp
@@ -116,7 +116,7 @@
 Q_DECLARE_METATYPE(QAbstractSocket::SocketState)
 #endif
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 AppManager* AppManager::_instance = 0;
 
@@ -4344,7 +4344,7 @@ NATRON_PYTHON_NAMESPACE::getAttrRecursive(const std::string& fullyQualifiedName,
     }
 }
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
-NATRON_NAMESPACE_USING;
+NATRON_NAMESPACE_USING
 #include "moc_AppManager.cpp"
diff --git a/Engine/AppManager.h b/Engine/AppManager.h
@@ -63,7 +63,7 @@ CLANG_DIAG_ON(deprecated)
 
 class QDir;
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 enum AppInstanceStatusEnum
 {
@@ -802,7 +802,7 @@ class PythonGILLocker
     ~PythonGILLocker();
 };
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 
 #endif // Engine_AppManager_h

diff --git a/Engine/AppManagerPrivate.cpp b/Engine/AppManagerPrivate.cpp
@@ -79,7 +79,7 @@ GCC_DIAG_ON(unused-parameter)
 BOOST_CLASS_EXPORT(NATRON_NAMESPACE::FrameParams)
 BOOST_CLASS_EXPORT(NATRON_NAMESPACE::ImageParams)
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 AppManagerPrivate::AppManagerPrivate()
     : globalTLS()
     , _appType(AppManager::eAppTypeBackground)
@@ -939,4 +939,4 @@ AppManagerPrivate::handleCommandLineArgsW(int argc, wchar_t** argv)
     copyUtf8ArgsToMembers(utf8Args);
 }
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
diff --git a/Engine/AppManagerPrivate.h b/Engine/AppManagerPrivate.h
@@ -69,7 +69,7 @@ GCC_DIAG_ON(deprecated)
 #include "Engine/EngineFwd.h"
 #include "Engine/TLSHolder.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 struct AppManagerPrivate
 {
@@ -240,7 +240,7 @@ struct AppManagerPrivate
     void copyUtf8ArgsToMembers(const std::vector<std::string>& utf8Args);
 };
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 #endif // Engine_AppManagerPrivate_h
 
diff --git a/Engine/Backdrop.cpp b/Engine/Backdrop.cpp
@@ -30,7 +30,7 @@
 #include "Engine/Transform.h"
 #include "Engine/KnobTypes.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 struct BackdropPrivate
 {
@@ -91,7 +91,7 @@ Backdrop::knobChanged(KnobI* k,
     return false;
 }
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
-NATRON_NAMESPACE_USING;
+NATRON_NAMESPACE_USING
 #include "moc_Backdrop.cpp"
diff --git a/Engine/Backdrop.h b/Engine/Backdrop.h
@@ -34,7 +34,7 @@
 #include "Engine/NoOpBase.h"
 #include "Engine/EngineFwd.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 struct BackdropPrivate;
 
@@ -92,6 +92,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     boost::scoped_ptr<BackdropPrivate> _imp;
 };
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 #endif // BACKDROP_H
diff --git a/Engine/Bezier.cpp b/Engine/Bezier.cpp
@@ -92,7 +92,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON
 #endif
 
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 
 static inline double
@@ -3687,7 +3687,7 @@ Bezier::expandToFeatherDistance(bool useGuiCurve,
     return ret;
 } // expandToFeatherDistance
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
-NATRON_NAMESPACE_USING;
+NATRON_NAMESPACE_USING
 #include "moc_Bezier.cpp"
diff --git a/Engine/Bezier.h b/Engine/Bezier.h
@@ -49,7 +49,7 @@ CLANG_DIAG_ON(deprecated-declarations)
 
 #define ROTO_BEZIER_EVAL_ITERATIVE
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 
 /**
@@ -667,7 +667,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON
     boost::scoped_ptr<BezierPrivate> _imp;
 };
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 
 #endif // Engine_Bezier_h
diff --git a/Engine/BezierCP.cpp b/Engine/BezierCP.cpp
@@ -41,7 +41,7 @@
 #include "Engine/Transform.h" // Point3D
 #include "Engine/ViewIdx.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 
 ////////////////////////////////////ControlPoint////////////////////////////////////
@@ -930,5 +930,5 @@ BezierCP::cloneGuiCurvesToInternalCurves()
     _imp->rightY = _imp->guiRightY;
 }
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
diff --git a/Engine/BezierCP.h b/Engine/BezierCP.h
@@ -43,7 +43,7 @@
 #include "Engine/ViewIdx.h"
 #include "Engine/EngineFwd.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 /**
  * @class A Bezier is an animated control point of a Bezier. It is the starting point
@@ -179,6 +179,6 @@ class BezierCP
 
 typedef std::list< boost::shared_ptr<BezierCP> > BezierCPs;
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 #endif // Engine_BezierCP_h
diff --git a/Engine/BezierCPPrivate.h b/Engine/BezierCPPrivate.h
@@ -38,7 +38,7 @@
 #include "Engine/Curve.h"
 #include "Engine/EngineFwd.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 struct BezierCPPrivate
 {
@@ -89,6 +89,6 @@ struct BezierCPPrivate
     }
 };
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 #endif // Engine_BezierCPPrivate_h_
diff --git a/Engine/BezierCPSerialization.h b/Engine/BezierCPSerialization.h
@@ -50,7 +50,7 @@ GCC_DIAG_ON(unused-parameter)
 #define BEZIER_CP_REMOVE_OFFSET 4
 #define BEZIER_CP_VERSION BEZIER_CP_REMOVE_OFFSET
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 template<class Archive>
 void
@@ -149,7 +149,7 @@ BezierCP::load(Archive & ar,
     }
 } // BezierCP::load
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 BOOST_CLASS_VERSION(NATRON_NAMESPACE::BezierCP, BEZIER_CP_VERSION)
 

diff --git a/Engine/BezierSerialization.h b/Engine/BezierSerialization.h
@@ -55,7 +55,7 @@ GCC_DIAG_ON(unused-parameter)
 #define BEZIER_SERIALIZATION_INTRODUCES_OPEN_BEZIER 4
 #define BEZIER_SERIALIZATION_VERSION BEZIER_SERIALIZATION_INTRODUCES_OPEN_BEZIER
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 class BezierSerialization
     : public RotoDrawableItemSerialization
@@ -144,7 +144,7 @@ class BezierSerialization
 };
 
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 BOOST_CLASS_VERSION(NATRON_NAMESPACE::BezierSerialization, BEZIER_SERIALIZATION_VERSION)
 

diff --git a/Engine/BlockingBackgroundRender.cpp b/Engine/BlockingBackgroundRender.cpp
@@ -37,7 +37,7 @@ CLANG_DIAG_ON(deprecated-register)
 #include "Engine/OutputEffectInstance.h"
 #include "Engine/Settings.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 
 BlockingBackgroundRender::BlockingBackgroundRender(OutputEffectInstance* writer)
@@ -78,4 +78,4 @@ BlockingBackgroundRender::notifyFinished()
     _runningCond.wakeOne();
 }
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
diff --git a/Engine/BlockingBackgroundRender.h b/Engine/BlockingBackgroundRender.h
@@ -32,7 +32,7 @@
 
 #include "Engine/EngineFwd.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 class BlockingBackgroundRender
 {
@@ -59,6 +59,6 @@ class BlockingBackgroundRender
     void blockingRender(bool enableRenderStats, int first, int last, int frameStep);
 };
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 #endif // BLOCKINGBACKGROUNDRENDER_H
diff --git a/Engine/BufferableObject.h b/Engine/BufferableObject.h
@@ -29,7 +29,7 @@
 
 #include <cstddef>
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 /**
  * @brief Stub class used by internal implementation of OutputSchedulerThread to pass objects through signal/slots
@@ -60,6 +60,6 @@ class BufferableObject
 
 typedef std::list<boost::shared_ptr<BufferableObject> > BufferableObjectList;
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 #endif // OUTPUTSCHEDULERTHREAD_H
diff --git a/Engine/CLArgs.cpp b/Engine/CLArgs.cpp
@@ -41,7 +41,7 @@
 
 #include "Engine/AppManager.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 
 struct CLArgsPrivate
@@ -1261,4 +1261,4 @@ CLArgs::ensureCommandLineArgsUtf8(int argc, char **argv, std::vector<std::string
 #endif
 }
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
diff --git a/Engine/CLArgs.h b/Engine/CLArgs.h
@@ -41,7 +41,7 @@ CLANG_DIAG_ON(deprecated)
 #endif
 #include "Engine/EngineFwd.h"
 
-NATRON_NAMESPACE_ENTER;
+NATRON_NAMESPACE_ENTER
 
 struct CLArgsPrivate;
 class CLArgs //: boost::noncopyable // GCC 4.2 requires the copy constructor
@@ -150,7 +150,7 @@ class CLArgs //: boost::noncopyable // GCC 4.2 requires the copy constructor
     boost::scoped_ptr<CLArgsPrivate> _imp;
 };
 
-NATRON_NAMESPACE_EXIT;
+NATRON_NAMESPACE_EXIT
 
 #endif // Engine_CLArgs_h