From 496d887fdac5810a7c9288a8d9a5703fda600ff0 Mon Sep 17 00:00:00 2001 From: Frederic Devernay Date: Fri, 25 Nov 2022 16:00:32 -0800 Subject: [PATCH] clang-format guards --- Engine/AppInstance.cpp | 2 ++ Engine/AppManagerPrivate.cpp | 2 ++ Engine/Bezier.h | 2 ++ Engine/BezierCPSerialization.h | 2 ++ Engine/BezierSerialization.h | 2 ++ Engine/BlockingBackgroundRender.cpp | 2 ++ Engine/CacheSerialization.h | 2 ++ Engine/CurveSerialization.h | 2 ++ Engine/FileDownloader.h | 2 ++ Engine/FormatSerialization.h | 2 ++ Engine/FrameEntrySerialization.h | 2 ++ Engine/FrameParamsSerialization.h | 2 ++ Engine/ImageCopyChannels.cpp | 2 ++ Engine/ImageParamsSerialization.h | 2 ++ Engine/ImagePlaneDesc.h | 2 ++ Engine/ImageSerialization.h | 2 ++ Engine/KnobImpl.h | 2 ++ Engine/KnobSerialization.h | 2 ++ Engine/LRUHashTable.h | 2 ++ Engine/NodeGroupSerialization.h | 2 ++ Engine/NodeSerialization.h | 2 ++ Engine/NonKeyParamsSerialization.h | 2 ++ Engine/OSGLContext_mac.cpp | 4 ++++ Engine/OfxClipInstance.h | 2 ++ Engine/OfxEffectInstance.cpp | 2 ++ Engine/OfxHost.cpp | 4 ++++ Engine/OfxHost.h | 2 ++ Engine/OfxImageEffectInstance.h | 2 ++ Engine/OfxOverlayInteract.h | 2 ++ Engine/ProjectSerialization.h | 2 ++ Engine/PySideCompat.cpp | 2 ++ .../Qt4/NatronEngine/animatedparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/app_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/appsettings_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/beziercurve_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/booleanparam_wrapper.cpp | 2 ++ .../boolnodecreationproperty_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/buttonparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/choiceparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/colorparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/colortuple_wrapper.cpp | 2 ++ .../Qt4/NatronEngine/double2dparam_wrapper.cpp | 2 ++ .../Qt4/NatronEngine/double2dtuple_wrapper.cpp | 2 ++ .../Qt4/NatronEngine/double3dparam_wrapper.cpp | 2 ++ .../Qt4/NatronEngine/double3dtuple_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/doubleparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/effect_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/exprutils_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/fileparam_wrapper.cpp | 2 ++ .../floatnodecreationproperty_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/group_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/groupparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/imagelayer_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/int2dparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/int2dtuple_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/int3dparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/int3dtuple_wrapper.cpp | 2 ++ .../intnodecreationproperty_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/intparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/itembase_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/layer_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/natron_enum_wrapper.cpp | 2 ++ .../NatronEngine/natronengine_module_wrapper.cpp | 2 ++ .../nodecreationproperty_wrapper.cpp | 2 ++ .../Qt4/NatronEngine/outputfileparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/pageparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/param_wrapper.cpp | 2 ++ .../Qt4/NatronEngine/parametricparam_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/pathparam_wrapper.cpp | 2 ++ .../NatronEngine/pycoreapplication_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/rectd_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/recti_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/roto_wrapper.cpp | 2 ++ .../Qt4/NatronEngine/separatorparam_wrapper.cpp | 2 ++ .../stringnodecreationproperty_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/stringparam_wrapper.cpp | 2 ++ .../Qt4/NatronEngine/stringparambase_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/track_wrapper.cpp | 2 ++ Engine/Qt4/NatronEngine/tracker_wrapper.cpp | 2 ++ .../Qt4/NatronEngine/userparamholder_wrapper.cpp | 2 ++ Engine/ReadNode.cpp | 2 ++ Engine/RectD.h | 2 ++ Engine/RectDSerialization.h | 2 ++ Engine/RectI.h | 2 ++ Engine/RectISerialization.h | 2 ++ Engine/RotoContext.h | 2 ++ Engine/RotoContextSerialization.h | 2 ++ Engine/RotoDrawableItem.h | 2 ++ Engine/RotoDrawableItemSerialization.h | 2 ++ Engine/RotoItem.h | 2 ++ Engine/RotoItemSerialization.h | 2 ++ Engine/RotoLayer.h | 2 ++ Engine/RotoLayerSerialization.h | 2 ++ Engine/RotoPoint.h | 2 ++ Engine/RotoStrokeItem.h | 2 ++ Engine/RotoStrokeItemSerialization.h | 2 ++ Engine/TextureRectSerialization.h | 2 ++ Engine/TrackerContextPrivate.h | 2 ++ Engine/TrackerFrameAccessor.cpp | 2 ++ Engine/TrackerSerialization.h | 2 ++ Engine/VariantSerialization.h | 4 +++- Engine/ViewIdxSerialization.h | 2 ++ Engine/WriteNode.cpp | 2 ++ Global/Macros.h | 4 ++++ Global/glad_source.c | 2 ++ Gui/AnimatedCheckBox.cpp | 2 ++ Gui/ComboBox.cpp | 2 ++ Gui/KnobUndoCommand.cpp | 2 ++ Gui/NodeBackdropSerialization.h | 2 ++ Gui/NodeGraph40.cpp | 2 ++ Gui/NodeGuiSerialization.h | 2 ++ Gui/ProjectGuiSerialization.h | 2 ++ Gui/Qt4/NatronGui/guiapp_wrapper.cpp | 2 ++ Gui/Qt4/NatronGui/natrongui_module_wrapper.cpp | 2 ++ Gui/Qt4/NatronGui/natrongui_python.h | 4 ++++ Gui/Qt4/NatronGui/pyguiapplication_wrapper.cpp | 2 ++ Gui/Qt4/NatronGui/pymodaldialog_wrapper.cpp | 2 ++ Gui/Qt4/NatronGui/pypanel_wrapper.cpp | 2 ++ Gui/Qt4/NatronGui/pytabwidget_wrapper.cpp | 2 ++ Gui/Qt4/NatronGui/pyviewer_wrapper.cpp | 2 ++ Tests/BaseTest.cpp | 2 ++ Tests/Tracker_Test.cpp | 2 ++ tools/utils/runPostShiboken.sh | 16 +++++++++++----- tools/utils/runPostShiboken2.sh | 2 ++ 124 files changed, 266 insertions(+), 6 deletions(-) diff --git a/Engine/AppInstance.cpp b/Engine/AppInstance.cpp index 804f2abff6..722a8dd6d4 100644 --- a/Engine/AppInstance.cpp +++ b/Engine/AppInstance.cpp @@ -44,11 +44,13 @@ #include // ofxhPropertySuite.h:565:37: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Wtautological-undefined-compare] +// clang-format off CLANG_DIAG_OFF(unknown-pragmas) CLANG_DIAG_OFF(tautological-undefined-compare) // appeared in clang 3.5 #include CLANG_DIAG_ON(tautological-undefined-compare) CLANG_DIAG_ON(unknown-pragmas) +// clang-format on #include "Global/QtCompat.h" // removeFileExtension #include "Global/PythonUtils.h" diff --git a/Engine/AppManagerPrivate.cpp b/Engine/AppManagerPrivate.cpp index 87883b19e5..853b2d29fe 100644 --- a/Engine/AppManagerPrivate.cpp +++ b/Engine/AppManagerPrivate.cpp @@ -40,11 +40,13 @@ #include // stringstream GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #include #include diff --git a/Engine/Bezier.h b/Engine/Bezier.h index 1ecd10b83a..4f8f0f98ed 100644 --- a/Engine/Bezier.h +++ b/Engine/Bezier.h @@ -33,9 +33,11 @@ #include #include +// clang-format off CLANG_DIAG_OFF(deprecated-declarations) #include CLANG_DIAG_ON(deprecated-declarations) +// clang-format on #include "Global/GlobalDefines.h" diff --git a/Engine/BezierCPSerialization.h b/Engine/BezierCPSerialization.h index b54776b7cd..79fed29333 100644 --- a/Engine/BezierCPSerialization.h +++ b/Engine/BezierCPSerialization.h @@ -33,6 +33,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #include @@ -43,6 +44,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/EngineFwd.h" diff --git a/Engine/BezierSerialization.h b/Engine/BezierSerialization.h index a55309ab20..7e95f4d3f1 100644 --- a/Engine/BezierSerialization.h +++ b/Engine/BezierSerialization.h @@ -32,6 +32,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #if BOOST_VERSION == 107400 @@ -46,6 +47,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/AppManager.h" diff --git a/Engine/BlockingBackgroundRender.cpp b/Engine/BlockingBackgroundRender.cpp index f7f31d4324..40be760783 100644 --- a/Engine/BlockingBackgroundRender.cpp +++ b/Engine/BlockingBackgroundRender.cpp @@ -29,9 +29,11 @@ #include #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(deprecated-register) //'register' storage class specifier is deprecated #include CLANG_DIAG_ON(deprecated-register) +// clang-format on #include "Engine/AppManager.h" #include "Engine/EffectInstance.h" diff --git a/Engine/CacheSerialization.h b/Engine/CacheSerialization.h index 84e4312323..5932165db0 100644 --- a/Engine/CacheSerialization.h +++ b/Engine/CacheSerialization.h @@ -35,6 +35,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -47,6 +48,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/Cache.h" diff --git a/Engine/CurveSerialization.h b/Engine/CurveSerialization.h index a9ec419187..7c2adf0ec2 100644 --- a/Engine/CurveSerialization.h +++ b/Engine/CurveSerialization.h @@ -32,6 +32,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -42,6 +43,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/CurvePrivate.h" diff --git a/Engine/FileDownloader.h b/Engine/FileDownloader.h index 95d32a4e6a..67c34b7cb7 100644 --- a/Engine/FileDownloader.h +++ b/Engine/FileDownloader.h @@ -28,9 +28,11 @@ #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(deprecated-register) //'register' storage class specifier is deprecated #include CLANG_DIAG_ON(deprecated-register) +// clang-format on #include "Engine/EngineFwd.h" diff --git a/Engine/FormatSerialization.h b/Engine/FormatSerialization.h index 2527076de7..c62b3921fb 100644 --- a/Engine/FormatSerialization.h +++ b/Engine/FormatSerialization.h @@ -32,6 +32,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #include @@ -40,6 +41,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/EngineFwd.h" diff --git a/Engine/FrameEntrySerialization.h b/Engine/FrameEntrySerialization.h index d12dca67a3..4638aa9624 100644 --- a/Engine/FrameEntrySerialization.h +++ b/Engine/FrameEntrySerialization.h @@ -30,11 +30,13 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/FrameEntry.h" diff --git a/Engine/FrameParamsSerialization.h b/Engine/FrameParamsSerialization.h index 3c7d3a289b..ca03e06a63 100644 --- a/Engine/FrameParamsSerialization.h +++ b/Engine/FrameParamsSerialization.h @@ -30,6 +30,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -37,6 +38,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/FrameParams.h" #include "Engine/EngineFwd.h" diff --git a/Engine/ImageCopyChannels.cpp b/Engine/ImageCopyChannels.cpp index 6e2a557928..16fa5c95a2 100644 --- a/Engine/ImageCopyChannels.cpp +++ b/Engine/ImageCopyChannels.cpp @@ -35,10 +35,12 @@ // disable some warnings due to unused parameters +// clang-format off GCC_DIAG_OFF(unused-parameter) # if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 406 GCC_DIAG_OFF(unused-but-set-variable) // only on gcc >= 4.6 #endif +// clang-format on // NATRON_COPY_CHANNELS_UNPREMULT: // Repremult R G and B if output is premult and alpha was modified. diff --git a/Engine/ImageParamsSerialization.h b/Engine/ImageParamsSerialization.h index 3a314d7729..0afd8d48db 100644 --- a/Engine/ImageParamsSerialization.h +++ b/Engine/ImageParamsSerialization.h @@ -33,6 +33,7 @@ #include "Global/GlobalDefines.h" #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) +// clang-format off GCC_DIAG_OFF(unused-parameter) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF GCC_DIAG_OFF(sign-compare) @@ -46,6 +47,7 @@ GCC_DIAG_OFF(sign-compare) GCC_DIAG_ON(sign-compare) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/EngineFwd.h" diff --git a/Engine/ImagePlaneDesc.h b/Engine/ImagePlaneDesc.h index 7cc02b8b9a..d372392d90 100644 --- a/Engine/ImagePlaneDesc.h +++ b/Engine/ImagePlaneDesc.h @@ -33,6 +33,7 @@ #if (!defined(Q_MOC_RUN) && !defined(SBK_RUN)) || defined(SBK2_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -41,6 +42,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #define IMAGEPLANEDESC_SERIALIZATION_INTRODUCES_ID 2 diff --git a/Engine/ImageSerialization.h b/Engine/ImageSerialization.h index 6222d0653c..34883de402 100644 --- a/Engine/ImageSerialization.h +++ b/Engine/ImageSerialization.h @@ -31,6 +31,7 @@ #include "Engine/Image.h" #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) +// clang-format off GCC_DIAG_OFF(unused-parameter) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] @@ -39,6 +40,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF #include #include GCC_DIAG_ON(unused-parameter) +// clang-format on GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #endif diff --git a/Engine/KnobImpl.h b/Engine/KnobImpl.h index c96b11a7e6..9fa2ecfa5d 100644 --- a/Engine/KnobImpl.h +++ b/Engine/KnobImpl.h @@ -40,11 +40,13 @@ #include #include +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) #include CLANG_DIAG_ON(mismatched-tags) GCC_DIAG_ON(unused-parameter) +// clang-format on #include "Global/PythonUtils.h" diff --git a/Engine/KnobSerialization.h b/Engine/KnobSerialization.h index 629d7f4748..5b1b20963f 100644 --- a/Engine/KnobSerialization.h +++ b/Engine/KnobSerialization.h @@ -33,6 +33,7 @@ #include #if !defined(SBK_RUN) && !defined(Q_MOC_RUN) +// clang-format off GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(sign-compare) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF @@ -45,6 +46,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF #include GCC_DIAG_ON(unused-parameter) GCC_DIAG_ON(sign-compare) +// clang-format on GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #endif diff --git a/Engine/LRUHashTable.h b/Engine/LRUHashTable.h index d703e295a8..514063f00a 100644 --- a/Engine/LRUHashTable.h +++ b/Engine/LRUHashTable.h @@ -47,6 +47,7 @@ #include #include #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) +// clang-format off CLANG_DIAG_OFF(unknown-pragmas) CLANG_DIAG_OFF(redeclared-class-member) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF @@ -56,6 +57,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF #include CLANG_DIAG_ON(redeclared-class-member) CLANG_DIAG_ON(unknown-pragmas) +// clang-format on GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #endif diff --git a/Engine/NodeGroupSerialization.h b/Engine/NodeGroupSerialization.h index 793a3507bb..6a32fc52e4 100644 --- a/Engine/NodeGroupSerialization.h +++ b/Engine/NodeGroupSerialization.h @@ -30,6 +30,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -39,6 +40,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif CLANG_DIAG_OFF(deprecated) diff --git a/Engine/NodeSerialization.h b/Engine/NodeSerialization.h index a198e07466..f0687890c2 100644 --- a/Engine/NodeSerialization.h +++ b/Engine/NodeSerialization.h @@ -33,6 +33,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(sign-compare) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] @@ -44,6 +45,7 @@ GCC_DIAG_OFF(sign-compare) GCC_DIAG_ON(sign-compare) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/KnobSerialization.h" diff --git a/Engine/NonKeyParamsSerialization.h b/Engine/NonKeyParamsSerialization.h index 3aba4e63bc..3ccf3c3611 100644 --- a/Engine/NonKeyParamsSerialization.h +++ b/Engine/NonKeyParamsSerialization.h @@ -32,6 +32,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -42,6 +43,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/EngineFwd.h" diff --git a/Engine/OSGLContext_mac.cpp b/Engine/OSGLContext_mac.cpp index b85064baa2..df2eac5713 100644 --- a/Engine/OSGLContext_mac.cpp +++ b/Engine/OSGLContext_mac.cpp @@ -473,7 +473,9 @@ OSGLContext_mac::OSGLContext_mac(const FramebufferConfig& pixelFormatAttrs, #endif // if 0 } +// clang-format off GCC_DIAG_OFF(deprecated-declarations) +// clang-format on static const char *RendererIDString(GLint ID) { static char holder[256] = {0}; @@ -514,7 +516,9 @@ static const char *RendererIDString(GLint ID) } } } +// clang-format off GCC_DIAG_ON(deprecated-declarations) +// clang-format on void OSGLContext_mac::getGPUInfos(std::list& renderers) diff --git a/Engine/OfxClipInstance.h b/Engine/OfxClipInstance.h index 6f27ddee1e..dba5d31207 100644 --- a/Engine/OfxClipInstance.h +++ b/Engine/OfxClipInstance.h @@ -37,11 +37,13 @@ CLANG_DIAG_ON(deprecated) //ofx // ofxhPropertySuite.h:565:37: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Wtautological-undefined-compare] +// clang-format off CLANG_DIAG_OFF(unknown-pragmas) CLANG_DIAG_OFF(tautological-undefined-compare) // appeared in clang 3.5 #include CLANG_DIAG_ON(tautological-undefined-compare) CLANG_DIAG_ON(unknown-pragmas) +// clang-format on #include #include "Global/GlobalDefines.h" diff --git a/Engine/OfxEffectInstance.cpp b/Engine/OfxEffectInstance.cpp index 438ad6e577..158daafada 100644 --- a/Engine/OfxEffectInstance.cpp +++ b/Engine/OfxEffectInstance.cpp @@ -36,6 +36,7 @@ #include // ofxhPropertySuite.h:565:37: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Wtautological-undefined-compare] +// clang-format off CLANG_DIAG_OFF(unknown-pragmas) CLANG_DIAG_OFF(tautological-undefined-compare) // appeared in clang 3.5 #include @@ -46,6 +47,7 @@ CLANG_DIAG_OFF(tautological-undefined-compare) // appeared in clang 3.5 #include CLANG_DIAG_ON(tautological-undefined-compare) CLANG_DIAG_ON(unknown-pragmas) +// clang-format on #include #include diff --git a/Engine/OfxHost.cpp b/Engine/OfxHost.cpp index 862eff631a..3c578cc3e1 100644 --- a/Engine/OfxHost.cpp +++ b/Engine/OfxHost.cpp @@ -38,6 +38,7 @@ CLANG_DIAG_OFF(deprecated) CLANG_DIAG_OFF(uninitialized) +// clang-format off CLANG_DIAG_OFF(deprecated-register) //'register' storage class specifier is deprecated #include #include @@ -47,6 +48,7 @@ CLANG_DIAG_OFF(deprecated-register) //'register' storage class specifier is depr #include #include CLANG_DIAG_ON(deprecated-register) +// clang-format on #ifdef OFX_SUPPORTS_MULTITHREAD #include #include @@ -66,11 +68,13 @@ CLANG_DIAG_ON(uninitialized) //ofx host support #include // ofxhPropertySuite.h:565:37: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Wtautological-undefined-compare] +// clang-format off CLANG_DIAG_OFF(unknown-pragmas) CLANG_DIAG_OFF(tautological-undefined-compare) // appeared in clang 3.5 #include CLANG_DIAG_ON(tautological-undefined-compare) CLANG_DIAG_ON(unknown-pragmas) +// clang-format on #include #include #include diff --git a/Engine/OfxHost.h b/Engine/OfxHost.h index 7b91d3bd11..96c34b8f42 100644 --- a/Engine/OfxHost.h +++ b/Engine/OfxHost.h @@ -37,11 +37,13 @@ CLANG_DIAG_ON(deprecated) CLANG_DIAG_ON(uninitialized) // ofxhPropertySuite.h:565:37: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Wtautological-undefined-compare] +// clang-format off CLANG_DIAG_OFF(unknown-pragmas) CLANG_DIAG_OFF(tautological-undefined-compare) // appeared in clang 3.5 #include CLANG_DIAG_ON(tautological-undefined-compare) CLANG_DIAG_ON(unknown-pragmas) +// clang-format on #include "Global/Enums.h" #include "Engine/EngineFwd.h" diff --git a/Engine/OfxImageEffectInstance.h b/Engine/OfxImageEffectInstance.h index b6db3e2498..1128b4e8cb 100644 --- a/Engine/OfxImageEffectInstance.h +++ b/Engine/OfxImageEffectInstance.h @@ -37,11 +37,13 @@ CLANG_DIAG_OFF(uninitialized) CLANG_DIAG_ON(deprecated) CLANG_DIAG_ON(uninitialized) +// clang-format off CLANG_DIAG_OFF(unknown-pragmas) CLANG_DIAG_OFF(tautological-undefined-compare) #include CLANG_DIAG_ON(tautological-undefined-compare) CLANG_DIAG_ON(unknown-pragmas) +// clang-format on #include "Global/GlobalDefines.h" #include "Engine/EngineFwd.h" diff --git a/Engine/OfxOverlayInteract.h b/Engine/OfxOverlayInteract.h index 6c5d605383..3ed2418e2e 100644 --- a/Engine/OfxOverlayInteract.h +++ b/Engine/OfxOverlayInteract.h @@ -29,11 +29,13 @@ #include "Global/Macros.h" // ofxhPropertySuite.h:565:37: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Wtautological-undefined-compare] +// clang-format off CLANG_DIAG_OFF(unknown-pragmas) CLANG_DIAG_OFF(tautological-undefined-compare) // appeared in clang 3.5 #include CLANG_DIAG_ON(tautological-undefined-compare) CLANG_DIAG_ON(unknown-pragmas) +// clang-format on #include "Engine/EngineFwd.h" NATRON_NAMESPACE_ENTER diff --git a/Engine/ProjectSerialization.h b/Engine/ProjectSerialization.h index c8ed2e89f1..523fd5cd21 100644 --- a/Engine/ProjectSerialization.h +++ b/Engine/ProjectSerialization.h @@ -32,6 +32,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -45,6 +46,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Global/GitVersion.h" diff --git a/Engine/PySideCompat.cpp b/Engine/PySideCompat.cpp index 57cba4ab10..fde0129424 100644 --- a/Engine/PySideCompat.cpp +++ b/Engine/PySideCompat.cpp @@ -35,6 +35,7 @@ #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) @@ -53,6 +54,7 @@ GCC_DIAG_OFF(missing-field-initializers) CLANG_DIAG_ON(mismatched-tags) GCC_DIAG_ON(unused-parameter) GCC_DIAG_ON(missing-field-initializers) +// clang-format on #include #include diff --git a/Engine/Qt4/NatronEngine/animatedparam_wrapper.cpp b/Engine/Qt4/NatronEngine/animatedparam_wrapper.cpp index 312fa4504e..eb840a6be4 100644 --- a/Engine/Qt4/NatronEngine/animatedparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/animatedparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/app_wrapper.cpp b/Engine/Qt4/NatronEngine/app_wrapper.cpp index a57d43650f..8af6bc5f70 100644 --- a/Engine/Qt4/NatronEngine/app_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/app_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/appsettings_wrapper.cpp b/Engine/Qt4/NatronEngine/appsettings_wrapper.cpp index 8a1df46418..85cafbc074 100644 --- a/Engine/Qt4/NatronEngine/appsettings_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/appsettings_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/beziercurve_wrapper.cpp b/Engine/Qt4/NatronEngine/beziercurve_wrapper.cpp index 7b04f5c483..4789a90af3 100644 --- a/Engine/Qt4/NatronEngine/beziercurve_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/beziercurve_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/booleanparam_wrapper.cpp b/Engine/Qt4/NatronEngine/booleanparam_wrapper.cpp index 7d1b9a3d47..3d841ed3be 100644 --- a/Engine/Qt4/NatronEngine/booleanparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/booleanparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/boolnodecreationproperty_wrapper.cpp b/Engine/Qt4/NatronEngine/boolnodecreationproperty_wrapper.cpp index 5ca888d41a..7b09b638f0 100644 --- a/Engine/Qt4/NatronEngine/boolnodecreationproperty_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/boolnodecreationproperty_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/buttonparam_wrapper.cpp b/Engine/Qt4/NatronEngine/buttonparam_wrapper.cpp index 3b98b7a15b..87dc8535b7 100644 --- a/Engine/Qt4/NatronEngine/buttonparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/buttonparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/choiceparam_wrapper.cpp b/Engine/Qt4/NatronEngine/choiceparam_wrapper.cpp index 687909eb16..6dcef8af16 100644 --- a/Engine/Qt4/NatronEngine/choiceparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/choiceparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/colorparam_wrapper.cpp b/Engine/Qt4/NatronEngine/colorparam_wrapper.cpp index 950501f43c..fa50a2b778 100644 --- a/Engine/Qt4/NatronEngine/colorparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/colorparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/colortuple_wrapper.cpp b/Engine/Qt4/NatronEngine/colortuple_wrapper.cpp index c9da93339d..a6475452f8 100644 --- a/Engine/Qt4/NatronEngine/colortuple_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/colortuple_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/double2dparam_wrapper.cpp b/Engine/Qt4/NatronEngine/double2dparam_wrapper.cpp index c9e575c99f..bbfffac561 100644 --- a/Engine/Qt4/NatronEngine/double2dparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/double2dparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/double2dtuple_wrapper.cpp b/Engine/Qt4/NatronEngine/double2dtuple_wrapper.cpp index e71600c32e..bc1f0f0b09 100644 --- a/Engine/Qt4/NatronEngine/double2dtuple_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/double2dtuple_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/double3dparam_wrapper.cpp b/Engine/Qt4/NatronEngine/double3dparam_wrapper.cpp index 1bfa41ed29..439bace2ca 100644 --- a/Engine/Qt4/NatronEngine/double3dparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/double3dparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/double3dtuple_wrapper.cpp b/Engine/Qt4/NatronEngine/double3dtuple_wrapper.cpp index 3e3d2e6375..b6e3fec468 100644 --- a/Engine/Qt4/NatronEngine/double3dtuple_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/double3dtuple_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/doubleparam_wrapper.cpp b/Engine/Qt4/NatronEngine/doubleparam_wrapper.cpp index 3df430dce5..d259d92d4b 100644 --- a/Engine/Qt4/NatronEngine/doubleparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/doubleparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/effect_wrapper.cpp b/Engine/Qt4/NatronEngine/effect_wrapper.cpp index dc4a07352d..7f3df6f1c6 100644 --- a/Engine/Qt4/NatronEngine/effect_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/effect_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/exprutils_wrapper.cpp b/Engine/Qt4/NatronEngine/exprutils_wrapper.cpp index 9a8b6959a0..1bf981628a 100644 --- a/Engine/Qt4/NatronEngine/exprutils_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/exprutils_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/fileparam_wrapper.cpp b/Engine/Qt4/NatronEngine/fileparam_wrapper.cpp index a78fdfc41c..c25697c2e2 100644 --- a/Engine/Qt4/NatronEngine/fileparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/fileparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/floatnodecreationproperty_wrapper.cpp b/Engine/Qt4/NatronEngine/floatnodecreationproperty_wrapper.cpp index bf17bbe22b..57e0f2e153 100644 --- a/Engine/Qt4/NatronEngine/floatnodecreationproperty_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/floatnodecreationproperty_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/group_wrapper.cpp b/Engine/Qt4/NatronEngine/group_wrapper.cpp index 1d5e7d692b..8f041b6902 100644 --- a/Engine/Qt4/NatronEngine/group_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/group_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/groupparam_wrapper.cpp b/Engine/Qt4/NatronEngine/groupparam_wrapper.cpp index 6efddc4b35..330f671bc8 100644 --- a/Engine/Qt4/NatronEngine/groupparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/groupparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/imagelayer_wrapper.cpp b/Engine/Qt4/NatronEngine/imagelayer_wrapper.cpp index 100566e1f8..660b4e9946 100644 --- a/Engine/Qt4/NatronEngine/imagelayer_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/imagelayer_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/int2dparam_wrapper.cpp b/Engine/Qt4/NatronEngine/int2dparam_wrapper.cpp index df24912e73..6d853f6f5c 100644 --- a/Engine/Qt4/NatronEngine/int2dparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/int2dparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/int2dtuple_wrapper.cpp b/Engine/Qt4/NatronEngine/int2dtuple_wrapper.cpp index 534e7c1cf5..6315ed48e4 100644 --- a/Engine/Qt4/NatronEngine/int2dtuple_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/int2dtuple_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/int3dparam_wrapper.cpp b/Engine/Qt4/NatronEngine/int3dparam_wrapper.cpp index f17354a534..93259375ff 100644 --- a/Engine/Qt4/NatronEngine/int3dparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/int3dparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/int3dtuple_wrapper.cpp b/Engine/Qt4/NatronEngine/int3dtuple_wrapper.cpp index 90a01fefea..e634c9afb2 100644 --- a/Engine/Qt4/NatronEngine/int3dtuple_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/int3dtuple_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/intnodecreationproperty_wrapper.cpp b/Engine/Qt4/NatronEngine/intnodecreationproperty_wrapper.cpp index b3a0a76a06..7331fa7881 100644 --- a/Engine/Qt4/NatronEngine/intnodecreationproperty_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/intnodecreationproperty_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/intparam_wrapper.cpp b/Engine/Qt4/NatronEngine/intparam_wrapper.cpp index f5198b784c..2134e3dd25 100644 --- a/Engine/Qt4/NatronEngine/intparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/intparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/itembase_wrapper.cpp b/Engine/Qt4/NatronEngine/itembase_wrapper.cpp index cdaf7ad7fb..f2e4c7cabf 100644 --- a/Engine/Qt4/NatronEngine/itembase_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/itembase_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/layer_wrapper.cpp b/Engine/Qt4/NatronEngine/layer_wrapper.cpp index 9f83674f3d..76636b4d22 100644 --- a/Engine/Qt4/NatronEngine/layer_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/layer_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/natron_enum_wrapper.cpp b/Engine/Qt4/NatronEngine/natron_enum_wrapper.cpp index 9281ec4fb9..42523b62ea 100644 --- a/Engine/Qt4/NatronEngine/natron_enum_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/natron_enum_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/natronengine_module_wrapper.cpp b/Engine/Qt4/NatronEngine/natronengine_module_wrapper.cpp index 680cb93470..2eb0114924 100644 --- a/Engine/Qt4/NatronEngine/natronengine_module_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/natronengine_module_wrapper.cpp @@ -1,12 +1,14 @@ #include #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/nodecreationproperty_wrapper.cpp b/Engine/Qt4/NatronEngine/nodecreationproperty_wrapper.cpp index 0160ed3850..6d81a395b1 100644 --- a/Engine/Qt4/NatronEngine/nodecreationproperty_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/nodecreationproperty_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/outputfileparam_wrapper.cpp b/Engine/Qt4/NatronEngine/outputfileparam_wrapper.cpp index 8186a9964c..54ea59c360 100644 --- a/Engine/Qt4/NatronEngine/outputfileparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/outputfileparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/pageparam_wrapper.cpp b/Engine/Qt4/NatronEngine/pageparam_wrapper.cpp index d1b96cf855..541752f70c 100644 --- a/Engine/Qt4/NatronEngine/pageparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/pageparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/param_wrapper.cpp b/Engine/Qt4/NatronEngine/param_wrapper.cpp index 0c8f145370..79b91b1a8c 100644 --- a/Engine/Qt4/NatronEngine/param_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/param_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/parametricparam_wrapper.cpp b/Engine/Qt4/NatronEngine/parametricparam_wrapper.cpp index 56d20881d4..e003c4e9ea 100644 --- a/Engine/Qt4/NatronEngine/parametricparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/parametricparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/pathparam_wrapper.cpp b/Engine/Qt4/NatronEngine/pathparam_wrapper.cpp index 39d1e0b0d8..f6d60134c2 100644 --- a/Engine/Qt4/NatronEngine/pathparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/pathparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/pycoreapplication_wrapper.cpp b/Engine/Qt4/NatronEngine/pycoreapplication_wrapper.cpp index 1bd5922082..e3cb5e127c 100644 --- a/Engine/Qt4/NatronEngine/pycoreapplication_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/pycoreapplication_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/rectd_wrapper.cpp b/Engine/Qt4/NatronEngine/rectd_wrapper.cpp index 25b392ef33..4c561a2063 100644 --- a/Engine/Qt4/NatronEngine/rectd_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/rectd_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/recti_wrapper.cpp b/Engine/Qt4/NatronEngine/recti_wrapper.cpp index f938ed1300..7afb3c550f 100644 --- a/Engine/Qt4/NatronEngine/recti_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/recti_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/roto_wrapper.cpp b/Engine/Qt4/NatronEngine/roto_wrapper.cpp index b1004d012e..feb3228f41 100644 --- a/Engine/Qt4/NatronEngine/roto_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/roto_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/separatorparam_wrapper.cpp b/Engine/Qt4/NatronEngine/separatorparam_wrapper.cpp index a8f7611d54..560855c991 100644 --- a/Engine/Qt4/NatronEngine/separatorparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/separatorparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/stringnodecreationproperty_wrapper.cpp b/Engine/Qt4/NatronEngine/stringnodecreationproperty_wrapper.cpp index f2400b5cb5..bfde29b3e9 100644 --- a/Engine/Qt4/NatronEngine/stringnodecreationproperty_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/stringnodecreationproperty_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/stringparam_wrapper.cpp b/Engine/Qt4/NatronEngine/stringparam_wrapper.cpp index a628faf21e..3c219df837 100644 --- a/Engine/Qt4/NatronEngine/stringparam_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/stringparam_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/stringparambase_wrapper.cpp b/Engine/Qt4/NatronEngine/stringparambase_wrapper.cpp index c89d3458fa..304fe9f78d 100644 --- a/Engine/Qt4/NatronEngine/stringparambase_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/stringparambase_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/track_wrapper.cpp b/Engine/Qt4/NatronEngine/track_wrapper.cpp index 918e9318fa..57198a6e07 100644 --- a/Engine/Qt4/NatronEngine/track_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/track_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/tracker_wrapper.cpp b/Engine/Qt4/NatronEngine/tracker_wrapper.cpp index ef7d9328fe..68436caf5a 100644 --- a/Engine/Qt4/NatronEngine/tracker_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/tracker_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/Qt4/NatronEngine/userparamholder_wrapper.cpp b/Engine/Qt4/NatronEngine/userparamholder_wrapper.cpp index 7f64e4608d..235211c5a3 100644 --- a/Engine/Qt4/NatronEngine/userparamholder_wrapper.cpp +++ b/Engine/Qt4/NatronEngine/userparamholder_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Engine/ReadNode.cpp b/Engine/ReadNode.cpp index 3763034fcb..a60623fb65 100644 --- a/Engine/ReadNode.cpp +++ b/Engine/ReadNode.cpp @@ -32,6 +32,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -41,6 +42,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif diff --git a/Engine/RectD.h b/Engine/RectD.h index 2ac30ba099..0912746ad3 100644 --- a/Engine/RectD.h +++ b/Engine/RectD.h @@ -42,7 +42,9 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) //Shiboken fails if defined at the start of a header +// clang-format off GCC_DIAG_OFF(strict-overflow) +// clang-format on #endif NATRON_NAMESPACE_ENTER; diff --git a/Engine/RectDSerialization.h b/Engine/RectDSerialization.h index e75268b28a..86772bc465 100644 --- a/Engine/RectDSerialization.h +++ b/Engine/RectDSerialization.h @@ -32,12 +32,14 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/EngineFwd.h" diff --git a/Engine/RectI.h b/Engine/RectI.h index 596a027164..99892155ec 100644 --- a/Engine/RectI.h +++ b/Engine/RectI.h @@ -42,7 +42,9 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) //Shiboken fails if defined at the start of a header +// clang-format off GCC_DIAG_OFF(strict-overflow) +// clang-format on #endif NATRON_NAMESPACE_ENTER; diff --git a/Engine/RectISerialization.h b/Engine/RectISerialization.h index 0b45b277c4..3d97f27408 100644 --- a/Engine/RectISerialization.h +++ b/Engine/RectISerialization.h @@ -32,12 +32,14 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/EngineFwd.h" diff --git a/Engine/RotoContext.h b/Engine/RotoContext.h index f29daa17bb..1c12f9aa5d 100644 --- a/Engine/RotoContext.h +++ b/Engine/RotoContext.h @@ -32,11 +32,13 @@ #include #include +// clang-format off CLANG_DIAG_OFF(deprecated-declarations) #include #include #include CLANG_DIAG_ON(deprecated-declarations) +// clang-format on #include "Global/GlobalDefines.h" diff --git a/Engine/RotoContextSerialization.h b/Engine/RotoContextSerialization.h index 16241d739c..970a5e6baf 100644 --- a/Engine/RotoContextSerialization.h +++ b/Engine/RotoContextSerialization.h @@ -30,6 +30,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #include @@ -40,6 +41,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/AppManager.h" diff --git a/Engine/RotoDrawableItem.h b/Engine/RotoDrawableItem.h index 3c15bdf8b9..60a1f35d5a 100644 --- a/Engine/RotoDrawableItem.h +++ b/Engine/RotoDrawableItem.h @@ -32,11 +32,13 @@ #include #include +// clang-format off CLANG_DIAG_OFF(deprecated-declarations) #include #include #include CLANG_DIAG_ON(deprecated-declarations) +// clang-format on #include "Global/GlobalDefines.h" #include "Engine/FitCurve.h" diff --git a/Engine/RotoDrawableItemSerialization.h b/Engine/RotoDrawableItemSerialization.h index 64d6a0bf59..975f93a004 100644 --- a/Engine/RotoDrawableItemSerialization.h +++ b/Engine/RotoDrawableItemSerialization.h @@ -30,6 +30,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #include @@ -40,6 +41,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/AppManager.h" diff --git a/Engine/RotoItem.h b/Engine/RotoItem.h index 7355afb70e..47f280fef8 100644 --- a/Engine/RotoItem.h +++ b/Engine/RotoItem.h @@ -32,11 +32,13 @@ #include #include +// clang-format off CLANG_DIAG_OFF(deprecated-declarations) #include #include #include CLANG_DIAG_ON(deprecated-declarations) +// clang-format on #include "Global/GlobalDefines.h" #include "Engine/FitCurve.h" diff --git a/Engine/RotoItemSerialization.h b/Engine/RotoItemSerialization.h index f4859dc5dc..588a4a9038 100644 --- a/Engine/RotoItemSerialization.h +++ b/Engine/RotoItemSerialization.h @@ -30,6 +30,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #include @@ -40,6 +41,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/AppManager.h" diff --git a/Engine/RotoLayer.h b/Engine/RotoLayer.h index 11594742f4..71b49fc15d 100644 --- a/Engine/RotoLayer.h +++ b/Engine/RotoLayer.h @@ -32,11 +32,13 @@ #include #include +// clang-format off CLANG_DIAG_OFF(deprecated-declarations) #include #include #include CLANG_DIAG_ON(deprecated-declarations) +// clang-format on #include "Global/GlobalDefines.h" #include "Engine/FitCurve.h" diff --git a/Engine/RotoLayerSerialization.h b/Engine/RotoLayerSerialization.h index 035508d081..115e9b1a81 100644 --- a/Engine/RotoLayerSerialization.h +++ b/Engine/RotoLayerSerialization.h @@ -30,6 +30,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #include @@ -40,6 +41,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/AppManager.h" diff --git a/Engine/RotoPoint.h b/Engine/RotoPoint.h index 5b131d62b5..3451781cbf 100644 --- a/Engine/RotoPoint.h +++ b/Engine/RotoPoint.h @@ -32,11 +32,13 @@ #include #include +// clang-format off CLANG_DIAG_OFF(deprecated-declarations) #include #include #include CLANG_DIAG_ON(deprecated-declarations) +// clang-format on #include "Global/GlobalDefines.h" #include "Engine/FitCurve.h" diff --git a/Engine/RotoStrokeItem.h b/Engine/RotoStrokeItem.h index e95aca7bd3..fe9a2168bf 100644 --- a/Engine/RotoStrokeItem.h +++ b/Engine/RotoStrokeItem.h @@ -32,11 +32,13 @@ #include #include +// clang-format off CLANG_DIAG_OFF(deprecated-declarations) #include #include #include CLANG_DIAG_ON(deprecated-declarations) +// clang-format on #include "Global/GlobalDefines.h" #include "Engine/FitCurve.h" diff --git a/Engine/RotoStrokeItemSerialization.h b/Engine/RotoStrokeItemSerialization.h index 0db8a42abf..5dfcc9ffd5 100644 --- a/Engine/RotoStrokeItemSerialization.h +++ b/Engine/RotoStrokeItemSerialization.h @@ -30,6 +30,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #include @@ -40,6 +41,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/AppManager.h" diff --git a/Engine/TextureRectSerialization.h b/Engine/TextureRectSerialization.h index 1730d104fa..f8f374aa23 100644 --- a/Engine/TextureRectSerialization.h +++ b/Engine/TextureRectSerialization.h @@ -30,6 +30,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -37,6 +38,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/TextureRect.h" #include "Engine/EngineFwd.h" diff --git a/Engine/TrackerContextPrivate.h b/Engine/TrackerContextPrivate.h index f94848c7f8..12ea776d3a 100644 --- a/Engine/TrackerContextPrivate.h +++ b/Engine/TrackerContextPrivate.h @@ -32,6 +32,7 @@ #include +// clang-format off GCC_DIAG_OFF(unused-function) GCC_DIAG_OFF(unused-parameter) #if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 408 @@ -49,6 +50,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 408 GCC_DIAG_ON(maybe-uninitialized) #endif +// clang-format on #include #include diff --git a/Engine/TrackerFrameAccessor.cpp b/Engine/TrackerFrameAccessor.cpp index 12861d81d1..168375a3a2 100644 --- a/Engine/TrackerFrameAccessor.cpp +++ b/Engine/TrackerFrameAccessor.cpp @@ -25,6 +25,7 @@ #include "TrackerFrameAccessor.h" +// clang-format off GCC_DIAG_OFF(unused-function) GCC_DIAG_OFF(unused-parameter) #include @@ -32,6 +33,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_ON(unused-function) GCC_DIAG_ON(unused-parameter) +// clang-format on #include diff --git a/Engine/TrackerSerialization.h b/Engine/TrackerSerialization.h index 9fe1243aaf..f26543d069 100644 --- a/Engine/TrackerSerialization.h +++ b/Engine/TrackerSerialization.h @@ -30,6 +30,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) #include #include @@ -39,6 +40,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/KnobSerialization.h" diff --git a/Engine/VariantSerialization.h b/Engine/VariantSerialization.h index bae0e709fb..79876383dd 100644 --- a/Engine/VariantSerialization.h +++ b/Engine/VariantSerialization.h @@ -34,6 +34,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -42,7 +43,8 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) -#endif +#// clang-format on +endif #include "Engine/EngineFwd.h" diff --git a/Engine/ViewIdxSerialization.h b/Engine/ViewIdxSerialization.h index 46254d03f5..3b1a35a16a 100644 --- a/Engine/ViewIdxSerialization.h +++ b/Engine/ViewIdxSerialization.h @@ -29,6 +29,7 @@ #include "Engine/ViewIdx.h" #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) +// clang-format off GCC_DIAG_OFF(unused-parameter) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] @@ -37,6 +38,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF #include #include GCC_DIAG_ON(unused-parameter) +// clang-format on GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #endif diff --git a/Engine/WriteNode.cpp b/Engine/WriteNode.cpp index 55340399fe..56a377b70a 100644 --- a/Engine/WriteNode.cpp +++ b/Engine/WriteNode.cpp @@ -31,6 +31,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -40,6 +41,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif CLANG_DIAG_OFF(deprecated) diff --git a/Global/Macros.h b/Global/Macros.h index 0445903ed2..6a809972b4 100644 --- a/Global/Macros.h +++ b/Global/Macros.h @@ -446,7 +446,9 @@ GCC_ONLY_DIAG_OFF(pragmas) // warning: unknown option after '#pragma GCC diagno // silence warnings from the COMPILER() COMPILER_SUPPORTS() and COMPILER_QUIRK() macros below #if __has_warning("-Wexpansion-to-defined") +// clang-format off CLANG_DIAG_OFF(expansion-to-defined) +// clang-format on #endif @@ -890,8 +892,10 @@ ignore_result(T x) #if COMPILER_SUPPORTS(CXX_OVERRIDE_CONTROL) // we want to use override & final, and get no warnings even if not compiling in c++11 mode +// clang-format off CLANG_DIAG_OFF(c++11-extensions) //GCC_DIAG_OFF(c++11-extensions) // no corresponding GCC warning option? +// clang-format on #endif diff --git a/Global/glad_source.c b/Global/glad_source.c index 2f5083bf86..4d428a1dee 100644 --- a/Global/glad_source.c +++ b/Global/glad_source.c @@ -2,9 +2,11 @@ #include "Global/Macros.h" +// clang-format off GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-prototypes) GCC_DIAG_OFF(unused-variable) +// clang-format on #ifdef GLAD_DEBUG #include "gladDeb/src/glad.c" diff --git a/Gui/AnimatedCheckBox.cpp b/Gui/AnimatedCheckBox.cpp index ac7e2b6ee1..c4bf8c965a 100644 --- a/Gui/AnimatedCheckBox.cpp +++ b/Gui/AnimatedCheckBox.cpp @@ -31,12 +31,14 @@ #include #include #include "Gui/GuiMacros.h" +// clang-format off CLANG_DIAG_OFF(deprecated-register) //'register' storage class specifier is deprecated GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF // /opt/local/include/QtGui/qmime.h:119:10: warning: private field 'type' is not used [-Wunused-private-field] #include GCC_DIAG_UNUSED_PRIVATE_FIELD_ON CLANG_DIAG_ON(deprecated-register) +// clang-format on #include "Gui/GuiApplicationManager.h" #include "Engine/Settings.h" diff --git a/Gui/ComboBox.cpp b/Gui/ComboBox.cpp index c35f4f8d6f..9a95355b0e 100644 --- a/Gui/ComboBox.cpp +++ b/Gui/ComboBox.cpp @@ -38,10 +38,12 @@ #include #include GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF +// clang-format off CLANG_DIAG_OFF(deprecated-register) //'register' storage class specifier is deprecated #include GCC_DIAG_UNUSED_PRIVATE_FIELD_ON CLANG_DIAG_ON(deprecated-register) +// clang-format on #include "Engine/Settings.h" #include "Engine/KnobTypes.h" diff --git a/Gui/KnobUndoCommand.cpp b/Gui/KnobUndoCommand.cpp index 601e4bf14e..8a8c6a9baa 100644 --- a/Gui/KnobUndoCommand.cpp +++ b/Gui/KnobUndoCommand.cpp @@ -30,6 +30,7 @@ #include #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -37,6 +38,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/KnobTypes.h" diff --git a/Gui/NodeBackdropSerialization.h b/Gui/NodeBackdropSerialization.h index aef515d38f..30507db49b 100644 --- a/Gui/NodeBackdropSerialization.h +++ b/Gui/NodeBackdropSerialization.h @@ -32,6 +32,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -40,6 +41,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/KnobSerialization.h" diff --git a/Gui/NodeGraph40.cpp b/Gui/NodeGraph40.cpp index b15bbe819a..d5507aff3b 100644 --- a/Gui/NodeGraph40.cpp +++ b/Gui/NodeGraph40.cpp @@ -32,6 +32,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -41,6 +42,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include diff --git a/Gui/NodeGuiSerialization.h b/Gui/NodeGuiSerialization.h index a7fdf3b7c9..b08a64bbaa 100644 --- a/Gui/NodeGuiSerialization.h +++ b/Gui/NodeGuiSerialization.h @@ -30,6 +30,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -38,6 +39,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/AppManager.h" diff --git a/Gui/ProjectGuiSerialization.h b/Gui/ProjectGuiSerialization.h index 4257545ca3..662b53f322 100644 --- a/Gui/ProjectGuiSerialization.h +++ b/Gui/ProjectGuiSerialization.h @@ -33,6 +33,7 @@ #if !defined(Q_MOC_RUN) && !defined(SBK_RUN) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format off GCC_DIAG_OFF(unused-parameter) // /opt/local/include/boost/serialization/smart_cast.hpp:254:25: warning: unused parameter 'u' [-Wunused-parameter] #include @@ -44,6 +45,7 @@ GCC_DIAG_OFF(unused-parameter) #include GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-parameter) +// clang-format on #endif #include "Engine/RectD.h" diff --git a/Gui/Qt4/NatronGui/guiapp_wrapper.cpp b/Gui/Qt4/NatronGui/guiapp_wrapper.cpp index c3a6440eee..3bec1ef234 100644 --- a/Gui/Qt4/NatronGui/guiapp_wrapper.cpp +++ b/Gui/Qt4/NatronGui/guiapp_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Gui/Qt4/NatronGui/natrongui_module_wrapper.cpp b/Gui/Qt4/NatronGui/natrongui_module_wrapper.cpp index e2d1df2407..70af28977f 100644 --- a/Gui/Qt4/NatronGui/natrongui_module_wrapper.cpp +++ b/Gui/Qt4/NatronGui/natrongui_module_wrapper.cpp @@ -1,12 +1,14 @@ #include #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Gui/Qt4/NatronGui/natrongui_python.h b/Gui/Qt4/NatronGui/natrongui_python.h index d2d08d9f3f..ef5ccec540 100644 --- a/Gui/Qt4/NatronGui/natrongui_python.h +++ b/Gui/Qt4/NatronGui/natrongui_python.h @@ -12,6 +12,7 @@ #include // Module Includes +// clang-format off CLANG_DIAG_OFF(deprecated) CLANG_DIAG_OFF(uninitialized) CLANG_DIAG_OFF(keyword-macro) @@ -19,6 +20,8 @@ CLANG_DIAG_OFF(keyword-macro) CLANG_DIAG_ON(deprecated) CLANG_DIAG_ON(uninitialized) CLANG_DIAG_ON(keyword-macro) +// clang-format on +// clang-format off CLANG_DIAG_OFF(deprecated) CLANG_DIAG_OFF(uninitialized) CLANG_DIAG_OFF(keyword-macro) @@ -26,6 +29,7 @@ CLANG_DIAG_OFF(keyword-macro) CLANG_DIAG_ON(deprecated) CLANG_DIAG_ON(uninitialized) CLANG_DIAG_ON(keyword-macro) +// clang-format on #include // Binded library includes diff --git a/Gui/Qt4/NatronGui/pyguiapplication_wrapper.cpp b/Gui/Qt4/NatronGui/pyguiapplication_wrapper.cpp index f19af4f04c..17b9091e41 100644 --- a/Gui/Qt4/NatronGui/pyguiapplication_wrapper.cpp +++ b/Gui/Qt4/NatronGui/pyguiapplication_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Gui/Qt4/NatronGui/pymodaldialog_wrapper.cpp b/Gui/Qt4/NatronGui/pymodaldialog_wrapper.cpp index a143f29ec1..bacabed07b 100644 --- a/Gui/Qt4/NatronGui/pymodaldialog_wrapper.cpp +++ b/Gui/Qt4/NatronGui/pymodaldialog_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Gui/Qt4/NatronGui/pypanel_wrapper.cpp b/Gui/Qt4/NatronGui/pypanel_wrapper.cpp index 35b4a649ab..a58442189a 100644 --- a/Gui/Qt4/NatronGui/pypanel_wrapper.cpp +++ b/Gui/Qt4/NatronGui/pypanel_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Gui/Qt4/NatronGui/pytabwidget_wrapper.cpp b/Gui/Qt4/NatronGui/pytabwidget_wrapper.cpp index f1cd87a7ef..9387a5863e 100644 --- a/Gui/Qt4/NatronGui/pytabwidget_wrapper.cpp +++ b/Gui/Qt4/NatronGui/pytabwidget_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Gui/Qt4/NatronGui/pyviewer_wrapper.cpp b/Gui/Qt4/NatronGui/pyviewer_wrapper.cpp index c14f8a58aa..2b6b8a0513 100644 --- a/Gui/Qt4/NatronGui/pyviewer_wrapper.cpp +++ b/Gui/Qt4/NatronGui/pyviewer_wrapper.cpp @@ -1,12 +1,14 @@ // default includes #include "Global/Macros.h" +// clang-format off CLANG_DIAG_OFF(mismatched-tags) GCC_DIAG_OFF(unused-parameter) GCC_DIAG_OFF(missing-field-initializers) GCC_DIAG_OFF(missing-declarations) GCC_DIAG_OFF(uninitialized) GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +// clang-format on #include // produces many warnings #include #include diff --git a/Tests/BaseTest.cpp b/Tests/BaseTest.cpp index 6969e44f84..799e7606cb 100644 --- a/Tests/BaseTest.cpp +++ b/Tests/BaseTest.cpp @@ -33,6 +33,7 @@ #include // ofxhPropertySuite.h:565:37: warning: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Wtautological-undefined-compare] +// clang-format off CLANG_DIAG_OFF(unknown-pragmas) CLANG_DIAG_OFF(tautological-undefined-compare) // appeared in clang 3.5 #include @@ -43,6 +44,7 @@ CLANG_DIAG_OFF(tautological-undefined-compare) // appeared in clang 3.5 //#include CLANG_DIAG_ON(tautological-undefined-compare) CLANG_DIAG_ON(unknown-pragmas) +// clang-format on #include "Engine/CreateNodeArgs.h" #include "Engine/Node.h" diff --git a/Tests/Tracker_Test.cpp b/Tests/Tracker_Test.cpp index 9852596a85..94028ec51c 100644 --- a/Tests/Tracker_Test.cpp +++ b/Tests/Tracker_Test.cpp @@ -31,6 +31,7 @@ #include +// clang-format off #if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 408 GCC_DIAG_OFF(maybe-uninitialized) #endif @@ -40,6 +41,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 408 GCC_DIAG_ON(maybe-uninitialized) #endif +// clang-format on #include "Engine/EngineFwd.h" #include "Engine/Transform.h" diff --git a/tools/utils/runPostShiboken.sh b/tools/utils/runPostShiboken.sh index 9d839a2adf..e27d7d50f7 100755 --- a/tools/utils/runPostShiboken.sh +++ b/tools/utils/runPostShiboken.sh @@ -45,15 +45,17 @@ if [ "$wrapper_name" = "natrongui" ]; then $SED -e '/SbkNatronEngineTypeConverters;/d' -i'.bak' "$wrapper_dir/$wrapper_source" $SED -e 's/cleanTypesAttributes/cleanGuiTypesAttributes/g' -i'.bak' "$wrapper_dir/$wrapper_source" fi - + # fix warnings sed -e 's@^#include $@#include "Global/Macros.h"\ +// clang-format off\ CLANG_DIAG_OFF(mismatched-tags)\ GCC_DIAG_OFF(unused-parameter)\ GCC_DIAG_OFF(missing-field-initializers)\ GCC_DIAG_OFF(missing-declarations)\ GCC_DIAG_OFF(uninitialized)\ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF\ +// clang-format on\ #include // produces many warnings@' -i'.bak' "$wrapper_dir"/*.cpp sed -e 's@// Extra includes@// Extra includes\ @@ -82,21 +84,25 @@ sed -e '/snakeoil_python/d' -i'.bak' "$wrapper_dir/$wrapper_header" sed -e 's@^#include $@CLANG_DIAG_OFF(header-guard)\ #include // has wrong header guards in pyside 1.2.2@' -i'.bak' "$wrapper_dir"/*.cpp -sed -e 's@^#include $@CLANG_DIAG_OFF(deprecated)\ +sed -e 's@^#include $@// clang-format off\ +CLANG_DIAG_OFF(deprecated)\ CLANG_DIAG_OFF(uninitialized)\ CLANG_DIAG_OFF(keyword-macro)\ #include // produces warnings\ CLANG_DIAG_ON(deprecated)\ CLANG_DIAG_ON(uninitialized)\ -CLANG_DIAG_ON(keyword-macro)@' -i'.bak' "$wrapper_dir"/*.cpp "$wrapper_dir"/*.h +CLANG_DIAG_ON(keyword-macro)\ +// clang-format on@' -i'.bak' "$wrapper_dir"/*.cpp "$wrapper_dir"/*.h -sed -e 's@^#include $@CLANG_DIAG_OFF(deprecated)\ +sed -e 's@^#include $@// clang-format off\ +CLANG_DIAG_OFF(deprecated)\ CLANG_DIAG_OFF(uninitialized)\ CLANG_DIAG_OFF(keyword-macro)\ #include // produces warnings\ CLANG_DIAG_ON(deprecated)\ CLANG_DIAG_ON(uninitialized)\ -CLANG_DIAG_ON(keyword-macro)@' -i'.bak' "$wrapper_dir"/*.cpp "$wrapper_dir"/*.h +CLANG_DIAG_ON(keyword-macro)\ +// clang-format on@' -i'.bak' "$wrapper_dir"/*.cpp "$wrapper_dir"/*.h # clean up rm "$wrapper_dir"/*.bak diff --git a/tools/utils/runPostShiboken2.sh b/tools/utils/runPostShiboken2.sh index bfc81fe9eb..349970b45e 100755 --- a/tools/utils/runPostShiboken2.sh +++ b/tools/utils/runPostShiboken2.sh @@ -55,12 +55,14 @@ fi # fix warnings $SED -e 's@^#include $@#include "Global/Macros.h"\ +// clang-format off\ CLANG_DIAG_OFF(mismatched-tags)\ GCC_DIAG_OFF(unused-parameter)\ GCC_DIAG_OFF(missing-field-initializers)\ GCC_DIAG_OFF(missing-declarations)\ GCC_DIAG_OFF(uninitialized)\ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF\ +// clang-format on\ #include \ #include // produces many warnings@' -i'.bak' "$wrapper_dir"/*.cpp