From 8b2b55162e35bbbe9acc3685973b07bef540cb3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Thu, 29 Jun 2017 12:05:26 +0200 Subject: [PATCH] reduce warnings --- Engine/AbortableRenderInfo.cpp | 6 +- Engine/AbortableRenderInfo.h | 4 +- Engine/AfterQuitProcessingI.h | 4 +- Engine/AppInstance.cpp | 6 +- Engine/AppInstance.h | 4 +- Engine/AppManager.cpp | 6 +- Engine/AppManager.h | 4 +- Engine/AppManagerPrivate.cpp | 4 +- Engine/AppManagerPrivate.h | 4 +- Engine/Backdrop.cpp | 6 +- Engine/Backdrop.h | 4 +- Engine/Bezier.cpp | 6 +- Engine/Bezier.h | 4 +- Engine/BezierCP.cpp | 4 +- Engine/BezierCP.h | 4 +- Engine/BezierCPPrivate.h | 4 +- Engine/BezierCPSerialization.h | 4 +- Engine/BezierSerialization.h | 4 +- Engine/BlockingBackgroundRender.cpp | 4 +- Engine/BlockingBackgroundRender.h | 4 +- Engine/BufferableObject.h | 4 +- Engine/CLArgs.cpp | 4 +- Engine/CLArgs.h | 4 +- Engine/Cache.cpp | 6 +- Engine/Cache.h | 4 +- Engine/CacheEntry.h | 4 +- Engine/CacheEntryHolder.h | 4 +- Engine/CacheSerialization.h | 4 +- Engine/CoonsRegularization.cpp | 4 +- Engine/CoonsRegularization.h | 4 +- Engine/CreateNodeArgs.cpp | 4 +- Engine/CreateNodeArgs.h | 4 +- Engine/Curve.cpp | 4 +- Engine/Curve.h | 4 +- Engine/CurvePrivate.h | 4 +- Engine/CurveSerialization.cpp | 4 +- Engine/CurveSerialization.h | 4 +- Engine/DefaultShaders.cpp | 4 +- Engine/DefaultShaders.h | 4 +- Engine/DiskCacheNode.cpp | 6 +- Engine/DiskCacheNode.h | 4 +- Engine/DockablePanelI.h | 4 +- Engine/Dot.cpp | 4 +- Engine/Dot.h | 4 +- Engine/EffectInstance.cpp | 6 +- Engine/EffectInstance.h | 4 +- Engine/EffectInstancePrivate.cpp | 4 +- Engine/EffectInstancePrivate.h | 4 +- Engine/EffectInstanceRenderRoI.cpp | 4 +- Engine/EngineFwd.h | 8 +- Engine/ExistenceCheckThread.cpp | 6 +- Engine/ExistenceCheckThread.h | 4 +- Engine/FStreamsSupport.cpp | 4 +- Engine/FStreamsSupport.h | 4 +- Engine/FeatherPoint.h | 4 +- Engine/FileDownloader.cpp | 6 +- Engine/FileDownloader.h | 4 +- Engine/FileSystemModel.cpp | 6 +- Engine/FileSystemModel.h | 4 +- Engine/FitCurve.cpp | 4 +- Engine/FitCurve.h | 4 +- Engine/Format.h | 6 +- Engine/FormatSerialization.h | 4 +- Engine/FrameEntry.cpp | 4 +- Engine/FrameEntry.h | 4 +- Engine/FrameEntrySerialization.h | 4 +- Engine/FrameKey.cpp | 4 +- Engine/FrameKey.h | 4 +- Engine/FrameParams.h | 4 +- Engine/FrameParamsSerialization.cpp | 4 +- Engine/FrameParamsSerialization.h | 4 +- Engine/GLShader.cpp | 4 +- Engine/GLShader.h | 4 +- Engine/GPUContextPool.cpp | 4 +- Engine/GPUContextPool.h | 4 +- Engine/GenericSchedulerThread.cpp | 6 +- Engine/GenericSchedulerThread.h | 4 +- Engine/GenericSchedulerThreadWatcher.cpp | 6 +- Engine/GenericSchedulerThreadWatcher.h | 4 +- Engine/GroupInput.cpp | 6 +- Engine/GroupInput.h | 4 +- Engine/GroupOutput.cpp | 4 +- Engine/GroupOutput.h | 4 +- Engine/Hash64.cpp | 4 +- Engine/Hash64.h | 4 +- Engine/HistogramCPU.cpp | 6 +- Engine/HistogramCPU.h | 4 +- Engine/HostOverlaySupport.cpp | 4 +- Engine/HostOverlaySupport.h | 4 +- Engine/Image.cpp | 29 +- Engine/Image.h | 4 +- Engine/ImageComponents.cpp | 4 +- Engine/ImageComponents.h | 4 +- Engine/ImageConvert.cpp | 4 +- Engine/ImageCopyChannels.cpp | 4 +- Engine/ImageKey.cpp | 4 +- Engine/ImageKey.h | 4 +- Engine/ImageLocker.h | 4 +- Engine/ImageMaskMix.cpp | 4 +- Engine/ImageParams.h | 6 +- Engine/ImageParamsSerialization.cpp | 4 +- Engine/ImageParamsSerialization.h | 4 +- Engine/ImageSerialization.h | 4 +- Engine/Interpolation.cpp | 4 +- Engine/Interpolation.h | 4 +- Engine/JoinViewsNode.cpp | 6 +- Engine/JoinViewsNode.h | 4 +- Engine/KeyHelper.h | 4 +- Engine/Knob.cpp | 6 +- Engine/Knob.h | 4 +- Engine/KnobFactory.cpp | 4 +- Engine/KnobFactory.h | 4 +- Engine/KnobFile.cpp | 6 +- Engine/KnobFile.h | 4 +- Engine/KnobGuiI.h | 4 +- Engine/KnobImpl.h | 4 +- Engine/KnobSerialization.cpp | 6 +- Engine/KnobSerialization.h | 4 +- Engine/KnobTypes.cpp | 6 +- Engine/KnobTypes.h | 4 +- Engine/LibraryBinary.cpp | 4 +- Engine/LibraryBinary.h | 4 +- Engine/Log.cpp | 4 +- Engine/Log.h | 8 +- Engine/LogEntry.h | 4 +- Engine/Lut.cpp | 4 +- Engine/Lut.h | 4 +- Engine/Markdown.cpp | 4 +- Engine/Markdown.h | 4 +- Engine/MemoryFile.cpp | 4 +- Engine/MemoryFile.h | 4 +- Engine/MemoryInfo.cpp | 4 +- Engine/MemoryInfo.h | 4 +- Engine/MergingEnum.h | 4 +- Engine/NatronEngine/animatedparam_wrapper.h | 4 +- Engine/NatronEngine/app_wrapper.h | 4 +- Engine/NatronEngine/beziercurve_wrapper.h | 4 +- Engine/NatronEngine/booleanparam_wrapper.h | 4 +- .../boolnodecreationproperty_wrapper.h | 4 +- Engine/NatronEngine/buttonparam_wrapper.h | 4 +- Engine/NatronEngine/choiceparam_wrapper.h | 4 +- Engine/NatronEngine/colorparam_wrapper.h | 4 +- Engine/NatronEngine/double2dparam_wrapper.h | 4 +- Engine/NatronEngine/double3dparam_wrapper.h | 4 +- Engine/NatronEngine/doubleparam_wrapper.h | 4 +- Engine/NatronEngine/effect_wrapper.h | 4 +- Engine/NatronEngine/fileparam_wrapper.h | 4 +- .../floatnodecreationproperty_wrapper.h | 4 +- Engine/NatronEngine/group_wrapper.h | 4 +- Engine/NatronEngine/groupparam_wrapper.h | 4 +- Engine/NatronEngine/int2dparam_wrapper.h | 4 +- Engine/NatronEngine/int3dparam_wrapper.h | 4 +- .../intnodecreationproperty_wrapper.h | 4 +- Engine/NatronEngine/intparam_wrapper.h | 4 +- Engine/NatronEngine/itembase_wrapper.h | 4 +- Engine/NatronEngine/layer_wrapper.h | 4 +- Engine/NatronEngine/natronengine_python.h | 2 + .../nodecreationproperty_wrapper.h | 4 +- Engine/NatronEngine/outputfileparam_wrapper.h | 4 +- Engine/NatronEngine/pageparam_wrapper.h | 4 +- Engine/NatronEngine/param_wrapper.h | 4 +- Engine/NatronEngine/parametricparam_wrapper.h | 4 +- Engine/NatronEngine/pathparam_wrapper.h | 4 +- .../NatronEngine/pycoreapplication_wrapper.h | 4 +- Engine/NatronEngine/rectd_wrapper.h | 4 +- Engine/NatronEngine/recti_wrapper.h | 4 +- Engine/NatronEngine/separatorparam_wrapper.h | 4 +- .../stringnodecreationproperty_wrapper.h | 4 +- Engine/NatronEngine/stringparam_wrapper.h | 4 +- Engine/NatronEngine/stringparambase_wrapper.h | 4 +- Engine/NatronEngine/userparamholder_wrapper.h | 4 +- Engine/NoOpBase.cpp | 4 +- Engine/NoOpBase.h | 4 +- Engine/Node.cpp | 6 +- Engine/Node.h | 4 +- Engine/NodeGraphI.h | 4 +- Engine/NodeGroup.cpp | 6 +- Engine/NodeGroup.h | 4 +- Engine/NodeGroupSerialization.cpp | 4 +- Engine/NodeGroupSerialization.h | 4 +- Engine/NodeGuiI.h | 4 +- Engine/NodeMetadata.cpp | 4 +- Engine/NodeMetadata.h | 2 +- Engine/NodeSerialization.cpp | 4 +- Engine/NodeSerialization.h | 4 +- Engine/Noise.cpp | 2 +- Engine/NonKeyParams.cpp | 4 +- Engine/NonKeyParams.h | 4 +- Engine/NonKeyParamsSerialization.cpp | 4 +- Engine/NonKeyParamsSerialization.h | 4 +- Engine/OSGLContext.cpp | 4 +- Engine/OSGLContext.h | 4 +- Engine/OSGLContext_mac.cpp | 4 +- Engine/OSGLContext_mac.h | 4 +- Engine/OSGLContext_win.cpp | 4 +- Engine/OSGLContext_win.h | 4 +- Engine/OSGLContext_x11.cpp | 4 +- Engine/OSGLContext_x11.h | 4 +- Engine/OfxClipInstance.cpp | 4 +- Engine/OfxClipInstance.h | 4 +- Engine/OfxEffectInstance.cpp | 6 +- Engine/OfxEffectInstance.h | 4 +- Engine/OfxHost.cpp | 4 +- Engine/OfxHost.h | 4 +- Engine/OfxImageEffectInstance.cpp | 4 +- Engine/OfxImageEffectInstance.h | 4 +- Engine/OfxMemory.cpp | 4 +- Engine/OfxMemory.h | 4 +- Engine/OfxOverlayInteract.cpp | 4 +- Engine/OfxOverlayInteract.h | 4 +- Engine/OfxParamInstance.cpp | 11 +- Engine/OfxParamInstance.h | 6 +- Engine/OneViewNode.cpp | 6 +- Engine/OneViewNode.h | 4 +- Engine/OpenGLViewerI.h | 4 +- Engine/OutputEffectInstance.cpp | 6 +- Engine/OutputEffectInstance.h | 4 +- Engine/OutputSchedulerThread.cpp | 6 +- Engine/OutputSchedulerThread.h | 4 +- Engine/OverlaySupport.h | 4 +- Engine/ParallelRenderArgs.cpp | 4 +- Engine/ParallelRenderArgs.h | 4 +- Engine/Plugin.cpp | 4 +- Engine/Plugin.h | 4 +- Engine/PluginActionShortcut.h | 4 +- Engine/PluginMemory.cpp | 4 +- Engine/PluginMemory.h | 4 +- Engine/PrecompNode.cpp | 6 +- Engine/PrecompNode.h | 4 +- Engine/ProcessHandler.cpp | 6 +- Engine/ProcessHandler.h | 4 +- Engine/Project.cpp | 6 +- Engine/Project.h | 4 +- Engine/ProjectPrivate.cpp | 4 +- Engine/ProjectPrivate.h | 4 +- Engine/ProjectSerialization.cpp | 4 +- Engine/ProjectSerialization.h | 4 +- Engine/PyAppInstance.cpp | 8 +- Engine/PyAppInstance.h | 8 +- Engine/PyExprUtils.h | 8 +- Engine/PyGlobalFunctions.h | 8 +- Engine/PyNode.cpp | 8 +- Engine/PyNode.h | 8 +- Engine/PyNodeGroup.cpp | 8 +- Engine/PyNodeGroup.h | 8 +- Engine/PyParameter.cpp | 8 +- Engine/PyParameter.h | 8 +- Engine/PyRoto.cpp | 8 +- Engine/PyRoto.h | 8 +- Engine/PyTracker.cpp | 8 +- Engine/PyTracker.h | 8 +- Engine/ReadNode.cpp | 6 +- Engine/ReadNode.h | 4 +- Engine/RectD.cpp | 4 +- Engine/RectD.h | 4 +- Engine/RectDSerialization.h | 4 +- Engine/RectI.cpp | 4 +- Engine/RectI.h | 4 +- Engine/RectISerialization.h | 4 +- Engine/RenderStats.cpp | 4 +- Engine/RenderStats.h | 4 +- Engine/RotoContext.cpp | 6 +- Engine/RotoContext.h | 4 +- Engine/RotoContextPrivate.h | 4 +- Engine/RotoContextSerialization.h | 4 +- Engine/RotoDrawableItem.cpp | 6 +- Engine/RotoDrawableItem.h | 4 +- Engine/RotoDrawableItemSerialization.h | 4 +- Engine/RotoItem.cpp | 4 +- Engine/RotoItem.h | 4 +- Engine/RotoItemSerialization.h | 4 +- Engine/RotoLayer.cpp | 4 +- Engine/RotoLayer.h | 4 +- Engine/RotoLayerSerialization.h | 4 +- Engine/RotoPaint.cpp | 6 +- Engine/RotoPaint.h | 4 +- Engine/RotoPaintInteract.cpp | 4 +- Engine/RotoPaintInteract.h | 4 +- Engine/RotoPoint.h | 4 +- Engine/RotoSmear.cpp | 4 +- Engine/RotoSmear.h | 4 +- Engine/RotoStrokeItem.cpp | 4 +- Engine/RotoStrokeItem.h | 4 +- Engine/RotoStrokeItemSerialization.h | 4 +- Engine/RotoUndoCommand.cpp | 4 +- Engine/RotoUndoCommand.h | 4 +- Engine/ScriptObject.cpp | 4 +- Engine/ScriptObject.h | 4 +- Engine/Settings.cpp | 6 +- Engine/Settings.h | 4 +- Engine/StandardPaths.cpp | 4 +- Engine/StandardPaths.h | 4 +- Engine/StringAnimationManager.cpp | 4 +- Engine/StringAnimationManager.h | 4 +- Engine/TLSHolder.cpp | 4 +- Engine/TLSHolder.h | 4 +- Engine/TLSHolderImpl.h | 4 +- Engine/Texture.cpp | 4 +- Engine/Texture.h | 4 +- Engine/TextureRect.cpp | 4 +- Engine/TextureRect.h | 4 +- Engine/ThreadPool.cpp | 4 +- Engine/ThreadPool.h | 4 +- Engine/ThreadStorage.h | 4 +- Engine/TimeLine.cpp | 6 +- Engine/TimeLine.h | 4 +- Engine/TimeLineKeyFrames.h | 8 +- Engine/Timer.cpp | 6 +- Engine/Timer.h | 4 +- Engine/TrackMarker.cpp | 6 +- Engine/TrackMarker.h | 4 +- Engine/TrackerContext.cpp | 6 +- Engine/TrackerContext.h | 4 +- Engine/TrackerContextPrivate.cpp | 6 +- Engine/TrackerContextPrivate.h | 4 +- Engine/TrackerFrameAccessor.cpp | 4 +- Engine/TrackerFrameAccessor.h | 4 +- Engine/TrackerNode.cpp | 6 +- Engine/TrackerNode.h | 4 +- Engine/TrackerNodeInteract.cpp | 6 +- Engine/TrackerNodeInteract.h | 4 +- Engine/TrackerSerialization.h | 4 +- Engine/TrackerUndoCommand.cpp | 4 +- Engine/TrackerUndoCommand.h | 4 +- Engine/Transform.cpp | 4 +- Engine/Transform.h | 4 +- Engine/UndoCommand.h | 4 +- Engine/UpdateViewerParams.h | 4 +- Engine/Utils.cpp | 4 +- Engine/Utils.h | 4 +- Engine/Variant.h | 4 +- Engine/ViewIdx.h | 4 +- Engine/ViewerInstance.cpp | 6 +- Engine/ViewerInstance.h | 4 +- Engine/ViewerInstancePrivate.h | 4 +- Engine/WriteNode.cpp | 6 +- Engine/WriteNode.h | 4 +- Engine/fstream_mingw.h | 4 +- Global/Enums.h | 8 +- Global/GlobalDefines.h | 4 +- Global/KeySymbols.h | 4 +- Global/Macros.h | 665 +++++++++++------- Global/ProcInfo.cpp | 4 +- Global/ProcInfo.h | 4 +- Global/QtCompat.h | 8 +- Global/StrUtils.h | 4 +- Gui/AboutWindow.cpp | 6 +- Gui/AboutWindow.h | 4 +- Gui/ActionShortcuts.cpp | 6 +- Gui/ActionShortcuts.h | 4 +- Gui/AddKnobDialog.cpp | 6 +- Gui/AddKnobDialog.h | 4 +- Gui/AnimatedCheckBox.cpp | 6 +- Gui/AnimatedCheckBox.h | 4 +- Gui/AutoHideToolBar.cpp | 4 +- Gui/AutoHideToolBar.h | 4 +- Gui/BackdropGui.cpp | 6 +- Gui/BackdropGui.h | 4 +- Gui/Button.cpp | 4 +- Gui/Button.h | 4 +- Gui/ChannelsComboBox.cpp | 4 +- Gui/ChannelsComboBox.h | 4 +- Gui/ClickableLabel.cpp | 6 +- Gui/ClickableLabel.h | 4 +- Gui/ColoredFrame.cpp | 6 +- Gui/ColoredFrame.h | 4 +- Gui/ComboBox.cpp | 6 +- Gui/ComboBox.h | 4 +- Gui/CurveEditor.cpp | 6 +- Gui/CurveEditor.h | 4 +- Gui/CurveEditorUndoRedo.cpp | 4 +- Gui/CurveEditorUndoRedo.h | 4 +- Gui/CurveGui.cpp | 6 +- Gui/CurveGui.h | 4 +- Gui/CurveSelection.h | 6 +- Gui/CurveWidget.cpp | 6 +- Gui/CurveWidget.h | 4 +- Gui/CurveWidgetDialogs.cpp | 6 +- Gui/CurveWidgetDialogs.h | 4 +- Gui/CurveWidgetPrivate.cpp | 4 +- Gui/CurveWidgetPrivate.h | 4 +- Gui/CustomParamInteract.cpp | 4 +- Gui/CustomParamInteract.h | 4 +- Gui/DialogButtonBox.cpp | 4 +- Gui/DialogButtonBox.h | 4 +- Gui/DockablePanel.cpp | 6 +- Gui/DockablePanel.h | 4 +- Gui/DockablePanelPrivate.cpp | 6 +- Gui/DockablePanelPrivate.h | 4 +- Gui/DockablePanelTabWidget.cpp | 4 +- Gui/DockablePanelTabWidget.h | 4 +- Gui/DocumentationManager.cpp | 6 +- Gui/DocumentationManager.h | 4 +- Gui/DopeSheet.cpp | 6 +- Gui/DopeSheet.h | 4 +- Gui/DopeSheetEditor.cpp | 4 +- Gui/DopeSheetEditor.h | 4 +- Gui/DopeSheetEditorUndoRedo.cpp | 4 +- Gui/DopeSheetEditorUndoRedo.h | 4 +- Gui/DopeSheetHierarchyView.cpp | 6 +- Gui/DopeSheetHierarchyView.h | 4 +- Gui/DopeSheetView.cpp | 6 +- Gui/DopeSheetView.h | 4 +- Gui/DotGui.cpp | 6 +- Gui/DotGui.h | 4 +- Gui/Edge.cpp | 6 +- Gui/Edge.h | 4 +- Gui/EditExpressionDialog.cpp | 6 +- Gui/EditExpressionDialog.h | 4 +- Gui/EditScriptDialog.cpp | 6 +- Gui/EditScriptDialog.h | 4 +- Gui/ExportGroupTemplateDialog.cpp | 6 +- Gui/ExportGroupTemplateDialog.h | 4 +- Gui/FileTypeMainWindow_win.cpp | 4 +- Gui/FileTypeMainWindow_win.h | 4 +- Gui/FloatingWidget.cpp | 6 +- Gui/FloatingWidget.h | 4 +- Gui/GroupBoxLabel.cpp | 6 +- Gui/GroupBoxLabel.h | 4 +- Gui/Gui.cpp | 6 +- Gui/Gui.h | 4 +- Gui/Gui05.cpp | 4 +- Gui/Gui10.cpp | 4 +- Gui/Gui15.cpp | 4 +- Gui/Gui20.cpp | 4 +- Gui/Gui30.cpp | 4 +- Gui/Gui40.cpp | 4 +- Gui/Gui50.cpp | 4 +- Gui/GuiAppInstance.cpp | 6 +- Gui/GuiAppInstance.h | 4 +- Gui/GuiApplicationManager.cpp | 6 +- Gui/GuiApplicationManager.h | 4 +- Gui/GuiApplicationManager10.cpp | 4 +- Gui/GuiApplicationManagerPrivate.cpp | 4 +- Gui/GuiApplicationManagerPrivate.h | 4 +- Gui/GuiFwd.h | 8 +- Gui/GuiPrivate.cpp | 4 +- Gui/GuiPrivate.h | 4 +- Gui/Histogram.cpp | 6 +- Gui/Histogram.h | 4 +- Gui/HostOverlay.cpp | 4 +- Gui/HostOverlay.h | 4 +- Gui/InfoViewerWidget.cpp | 6 +- Gui/InfoViewerWidget.h | 4 +- Gui/KnobGui.cpp | 6 +- Gui/KnobGui.h | 4 +- Gui/KnobGui10.cpp | 4 +- Gui/KnobGui20.cpp | 4 +- Gui/KnobGuiBool.cpp | 6 +- Gui/KnobGuiBool.h | 4 +- Gui/KnobGuiButton.cpp | 6 +- Gui/KnobGuiButton.h | 4 +- Gui/KnobGuiChoice.cpp | 6 +- Gui/KnobGuiChoice.h | 4 +- Gui/KnobGuiColor.cpp | 6 +- Gui/KnobGuiColor.h | 4 +- Gui/KnobGuiContainerHelper.cpp | 6 +- Gui/KnobGuiContainerHelper.h | 4 +- Gui/KnobGuiContainerI.h | 4 +- Gui/KnobGuiFactory.cpp | 4 +- Gui/KnobGuiFactory.h | 4 +- Gui/KnobGuiFile.cpp | 6 +- Gui/KnobGuiFile.h | 4 +- Gui/KnobGuiGroup.cpp | 6 +- Gui/KnobGuiGroup.h | 4 +- Gui/KnobGuiParametric.cpp | 6 +- Gui/KnobGuiParametric.h | 4 +- Gui/KnobGuiPrivate.cpp | 4 +- Gui/KnobGuiSeparator.cpp | 4 +- Gui/KnobGuiSeparator.h | 4 +- Gui/KnobGuiString.cpp | 6 +- Gui/KnobGuiString.h | 4 +- Gui/KnobGuiTable.cpp | 6 +- Gui/KnobGuiTable.h | 4 +- Gui/KnobGuiValue.cpp | 6 +- Gui/KnobGuiValue.h | 4 +- Gui/KnobUndoCommand.cpp | 4 +- Gui/KnobUndoCommand.h | 4 +- Gui/KnobWidgetDnD.cpp | 4 +- Gui/KnobWidgetDnD.h | 4 +- Gui/Label.cpp | 6 +- Gui/Label.h | 4 +- Gui/LineEdit.cpp | 6 +- Gui/LineEdit.h | 4 +- Gui/LinkToKnobDialog.cpp | 6 +- Gui/LinkToKnobDialog.h | 4 +- Gui/LogWindow.cpp | 6 +- Gui/LogWindow.h | 4 +- Gui/ManageUserParamsDialog.cpp | 6 +- Gui/ManageUserParamsDialog.h | 4 +- Gui/Menu.cpp | 4 +- Gui/Menu.h | 4 +- Gui/MessageBox.cpp | 6 +- Gui/MessageBox.h | 4 +- Gui/MultiInstancePanel.cpp | 6 +- Gui/MultiInstancePanel.h | 4 +- Gui/NatronGui/guiapp_wrapper.h | 4 +- Gui/NatronGui/natrongui_python.h | 4 + Gui/NatronGui/pyguiapplication_wrapper.h | 4 +- Gui/NatronGui/pymodaldialog_wrapper.h | 4 +- Gui/NatronGui/pypanel_wrapper.h | 4 +- Gui/NewLayerDialog.cpp | 6 +- Gui/NewLayerDialog.h | 4 +- Gui/NodeBackdropSerialization.cpp | 4 +- Gui/NodeBackdropSerialization.h | 4 +- Gui/NodeClipBoard.h | 4 +- Gui/NodeCreationDialog.cpp | 6 +- Gui/NodeCreationDialog.h | 4 +- Gui/NodeGraph.cpp | 6 +- Gui/NodeGraph.h | 4 +- Gui/NodeGraph05.cpp | 4 +- Gui/NodeGraph10.cpp | 4 +- Gui/NodeGraph13.cpp | 4 +- Gui/NodeGraph15.cpp | 4 +- Gui/NodeGraph20.cpp | 4 +- Gui/NodeGraph25.cpp | 4 +- Gui/NodeGraph30.cpp | 4 +- Gui/NodeGraph35.cpp | 4 +- Gui/NodeGraph40.cpp | 4 +- Gui/NodeGraph45.cpp | 4 +- Gui/NodeGraphPrivate.cpp | 4 +- Gui/NodeGraphPrivate.h | 4 +- Gui/NodeGraphPrivate10.cpp | 4 +- Gui/NodeGraphTextItem.cpp | 4 +- Gui/NodeGraphTextItem.h | 4 +- Gui/NodeGraphUndoRedo.cpp | 4 +- Gui/NodeGraphUndoRedo.h | 4 +- Gui/NodeGui.cpp | 6 +- Gui/NodeGui.h | 4 +- Gui/NodeGuiSerialization.cpp | 4 +- Gui/NodeGuiSerialization.h | 4 +- Gui/NodeSettingsPanel.cpp | 6 +- Gui/NodeSettingsPanel.h | 4 +- Gui/NodeViewerContext.cpp | 6 +- Gui/NodeViewerContext.h | 4 +- Gui/PanelWidget.cpp | 4 +- Gui/PanelWidget.h | 4 +- Gui/PickKnobDialog.cpp | 6 +- Gui/PickKnobDialog.h | 4 +- Gui/PreferencesPanel.cpp | 6 +- Gui/PreferencesPanel.h | 4 +- Gui/PreviewThread.cpp | 4 +- Gui/PreviewThread.h | 4 +- Gui/ProgressPanel.cpp | 6 +- Gui/ProgressPanel.h | 4 +- Gui/ProgressTaskInfo.cpp | 6 +- Gui/ProgressTaskInfo.h | 4 +- Gui/ProjectGui.cpp | 6 +- Gui/ProjectGui.h | 4 +- Gui/ProjectGuiSerialization.cpp | 4 +- Gui/ProjectGuiSerialization.h | 4 +- Gui/PropertiesBinWrapper.cpp | 4 +- Gui/PropertiesBinWrapper.h | 4 +- Gui/PyGlobalGui.h | 8 +- Gui/PyGuiApp.cpp | 8 +- Gui/PyGuiApp.h | 8 +- Gui/PythonPanels.cpp | 12 +- Gui/PythonPanels.h | 8 +- Gui/QtEnumConvert.cpp | 4 +- Gui/QtEnumConvert.h | 4 +- Gui/QtMac.mm | 4 +- Gui/RegisteredTabs.h | 4 +- Gui/RenderStatsDialog.cpp | 6 +- Gui/RenderStatsDialog.h | 4 +- Gui/ResizableMessageBox.cpp | 4 +- Gui/ResizableMessageBox.h | 4 +- Gui/RightClickableWidget.cpp | 6 +- Gui/RightClickableWidget.h | 4 +- Gui/RotoPanel.cpp | 6 +- Gui/RotoPanel.h | 4 +- Gui/ScaleSliderQWidget.cpp | 6 +- Gui/ScaleSliderQWidget.h | 4 +- Gui/ScriptEditor.cpp | 6 +- Gui/ScriptEditor.h | 4 +- Gui/ScriptTextEdit.cpp | 6 +- Gui/ScriptTextEdit.h | 4 +- Gui/SequenceFileDialog.cpp | 6 +- Gui/SequenceFileDialog.h | 4 +- Gui/SerializableWindow.cpp | 4 +- Gui/SerializableWindow.h | 4 +- Gui/Shaders.cpp | 4 +- Gui/Shaders.h | 4 +- Gui/SpinBox.cpp | 6 +- Gui/SpinBox.h | 4 +- Gui/SpinBoxValidator.cpp | 4 +- Gui/SpinBoxValidator.h | 4 +- Gui/SplashScreen.cpp | 6 +- Gui/SplashScreen.h | 4 +- Gui/Splitter.cpp | 4 +- Gui/Splitter.h | 4 +- Gui/TabGroup.cpp | 6 +- Gui/TabGroup.h | 4 +- Gui/TabWidget.cpp | 6 +- Gui/TabWidget.h | 4 +- Gui/TableModelView.cpp | 6 +- Gui/TableModelView.h | 4 +- Gui/TextRenderer.cpp | 4 +- Gui/TextRenderer.h | 4 +- Gui/TimeLineGui.cpp | 6 +- Gui/TimeLineGui.h | 4 +- Gui/ToolButton.cpp | 6 +- Gui/ToolButton.h | 4 +- Gui/TrackerPanel.cpp | 6 +- Gui/TrackerPanel.h | 4 +- Gui/VerticalColorBar.cpp | 6 +- Gui/VerticalColorBar.h | 4 +- Gui/ViewerGL.cpp | 6 +- Gui/ViewerGL.h | 4 +- Gui/ViewerGLPrivate.cpp | 4 +- Gui/ViewerGLPrivate.h | 4 +- Gui/ViewerTab.cpp | 6 +- Gui/ViewerTab.h | 4 +- Gui/ViewerTab10.cpp | 4 +- Gui/ViewerTab20.cpp | 4 +- Gui/ViewerTab30.cpp | 4 +- Gui/ViewerTab40.cpp | 4 +- Gui/ViewerTabPrivate.cpp | 4 +- Gui/ViewerTabPrivate.h | 4 +- Gui/ViewerToolButton.cpp | 6 +- Gui/ViewerToolButton.h | 4 +- Gui/ZoomContext.h | 4 +- Tests/Tracker_Test.cpp | 2 +- global.pri | 10 +- tools/utils/runPostShiboken.sh | 12 +- 624 files changed, 1862 insertions(+), 1689 deletions(-) diff --git a/Engine/AbortableRenderInfo.cpp b/Engine/AbortableRenderInfo.cpp index 777811e32f..7ae2587ac2 100644 --- 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 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 index 0b4008d8b5..afdcddf89b 100644 --- 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 _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ABORTABLERENDERINFO_H diff --git a/Engine/AfterQuitProcessingI.h b/Engine/AfterQuitProcessingI.h index f932cd65ca..6189828155 100644 --- 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 index 2f56b8c6bc..d154e0a993 100644 --- 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 index dae9aeed0a..7ec1ce7ffe 100644 --- 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 index c328af4d56..9464565e68 100644 --- 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 index 637952b22d..16a9e10edb 100644 --- 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 index 8164bc37ac..e2700fa73a 100644 --- 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 index e1ac99c710..63782dbfaf 100644 --- 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& utf8Args); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_AppManagerPrivate_h diff --git a/Engine/Backdrop.cpp b/Engine/Backdrop.cpp index 846d1ccff8..238f594505 100644 --- 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 index e30095fbe7..17aa6645dc 100644 --- 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 _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // BACKDROP_H diff --git a/Engine/Bezier.cpp b/Engine/Bezier.cpp index 785d48e011..b9c12f1027 100644 --- 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 index 7b4ae20dac..ef5e6b9652 100644 --- 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 _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_Bezier_h diff --git a/Engine/BezierCP.cpp b/Engine/BezierCP.cpp index da9505c858..8a9540b1ac 100644 --- 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 index 7e165a2fbe..6d2f85d7ab 100644 --- 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 > BezierCPs; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_BezierCP_h diff --git a/Engine/BezierCPPrivate.h b/Engine/BezierCPPrivate.h index 1fbb4626ec..e53f7d2da2 100644 --- 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 index 7b2f4bd3a7..f94b42e2dd 100644 --- 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 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 index 508adb110a..f3384c08d4 100644 --- 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 index 80e4a6c573..bd09d2c2fe 100644 --- 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 index f79f20e285..616c7af091 100644 --- 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 index 0ffb225e8c..bfd4cf1fbe 100644 --- a/Engine/BufferableObject.h +++ b/Engine/BufferableObject.h @@ -29,7 +29,7 @@ #include -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 > BufferableObjectList; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // OUTPUTSCHEDULERTHREAD_H diff --git a/Engine/CLArgs.cpp b/Engine/CLArgs.cpp index a9ccd8421f..c842442379 100644 --- 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 _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_CLArgs_h diff --git a/Engine/Cache.cpp b/Engine/Cache.cpp index fef2f137af..436ff5437b 100644 --- a/Engine/Cache.cpp +++ b/Engine/Cache.cpp @@ -27,8 +27,8 @@ #include #include -NATRON_NAMESPACE_ENTER; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_ENTER +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_Cache.cpp" diff --git a/Engine/Cache.h b/Engine/Cache.h index e725c55c59..425e22ba6b 100644 --- a/Engine/Cache.h +++ b/Engine/Cache.h @@ -71,7 +71,7 @@ GCC_DIAG_ON(deprecated) ///When defined, number of opened files, memory size and disk size of the cache are printed whenever there's activity. //#define NATRON_DEBUG_CACHE -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief The point of this thread is to delete the content of the list in a separate thread so the thread calling @@ -1891,7 +1891,7 @@ class Cache }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif /*NATRON_ENGINE_ABSTRACTCACHE_H_ */ diff --git a/Engine/CacheEntry.h b/Engine/CacheEntry.h index 12eb486cb6..03d23c5ae8 100644 --- a/Engine/CacheEntry.h +++ b/Engine/CacheEntry.h @@ -66,7 +66,7 @@ #include "Global/GlobalDefines.h" #include "Global/StrUtils.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ///////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////BUFFER//////////////////////////////////////////////////// @@ -1244,6 +1244,6 @@ class CacheEntryHelper bool _removeBackingFileBeforeDestruction; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // CACHEENTRY_H diff --git a/Engine/CacheEntryHolder.h b/Engine/CacheEntryHolder.h index 01bb865d87..b44809440b 100644 --- a/Engine/CacheEntryHolder.h +++ b/Engine/CacheEntryHolder.h @@ -31,7 +31,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief Public interface for all elements that can own something in the cache @@ -55,7 +55,7 @@ class CacheEntryHolder virtual std::string getCacheID() const = 0; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // CACHEENTRYHOLDER_H diff --git a/Engine/CacheSerialization.h b/Engine/CacheSerialization.h index 76a08bd9b0..494656d753 100644 --- a/Engine/CacheSerialization.h +++ b/Engine/CacheSerialization.h @@ -61,7 +61,7 @@ GCC_DIAG_ON(unused-parameter) ///When defined, number of opened files, memory size and disk size of the cache are printed whenever there's activity. //#define NATRON_DEBUG_CACHE -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*Saves cache to disk as a settings file. */ @@ -224,7 +224,7 @@ struct Cache::SerializedEntry } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_CacheSerialization_h diff --git a/Engine/CoonsRegularization.cpp b/Engine/CoonsRegularization.cpp index 5498c9042f..417f44fd1f 100644 --- a/Engine/CoonsRegularization.cpp +++ b/Engine/CoonsRegularization.cpp @@ -68,7 +68,7 @@ #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER static Point @@ -1569,4 +1569,4 @@ CoonsRegularization::regularize(const BezierCPs &patch, splitAt(patch, time, 0.5, fixedPatch); } // CoonsRegularization::regularize -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/CoonsRegularization.h b/Engine/CoonsRegularization.h index 5785e1a3b1..87ea0b3048 100644 --- a/Engine/CoonsRegularization.h +++ b/Engine/CoonsRegularization.h @@ -36,7 +36,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace CoonsRegularization { void regularize(const std::list >& coonsPatch, @@ -44,6 +44,6 @@ void regularize(const std::list >& coonsPatch, std::list > >* fixedPatch); } // namespace CoonsRegularization -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // COONSREGULARIZATION_H diff --git a/Engine/CreateNodeArgs.cpp b/Engine/CreateNodeArgs.cpp index a282eb7d0e..bb747ed284 100644 --- a/Engine/CreateNodeArgs.cpp +++ b/Engine/CreateNodeArgs.cpp @@ -27,7 +27,7 @@ #include "CreateNodeArgs.h" #include "Engine/NodeGroup.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER CreateNodeArgs::CreateNodeArgs() @@ -53,4 +53,4 @@ CreateNodeArgs::~CreateNodeArgs() } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/CreateNodeArgs.h b/Engine/CreateNodeArgs.h index dc8b406731..c936584fa2 100644 --- a/Engine/CreateNodeArgs.h +++ b/Engine/CreateNodeArgs.h @@ -184,7 +184,7 @@ **/ #define kCreateNodeArgsPropMultiInstanceParentName "CreateNodeArgsPropMultiInstanceParentName" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct CreateNodeArgsPrivate; class CreateNodeArgs @@ -424,6 +424,6 @@ class CreateNodeArgs std::map > _properties; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // CREATENODEARGS_H diff --git a/Engine/Curve.cpp b/Engine/Curve.cpp index eff2efa035..5df3aedaf3 100644 --- a/Engine/Curve.cpp +++ b/Engine/Curve.cpp @@ -41,7 +41,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #include "Engine/KnobFile.h" #include "Engine/Smooth1D.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -1917,4 +1917,4 @@ Curve::smooth(const RangeD* range) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Curve.h b/Engine/Curve.h index f873324cc0..0491037464 100644 --- a/Engine/Curve.h +++ b/Engine/Curve.h @@ -41,7 +41,7 @@ #define NATRON_CURVE_X_SPACING_EPSILON 1e-6 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief A KeyFrame is a lightweight pair . These are the values that are used @@ -400,6 +400,6 @@ class Curve boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_CURVE_H diff --git a/Engine/CurvePrivate.h b/Engine/CurvePrivate.h index e7dbaef846..65fa93cf36 100644 --- a/Engine/CurvePrivate.h +++ b/Engine/CurvePrivate.h @@ -41,7 +41,7 @@ //#define NATRON_CURVE_USE_CACHE -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct CurvePrivate { @@ -111,6 +111,6 @@ struct CurvePrivate }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_CURVEPRIVATE_H diff --git a/Engine/CurveSerialization.cpp b/Engine/CurveSerialization.cpp index 40bd4077e0..78a86d1a48 100644 --- a/Engine/CurveSerialization.cpp +++ b/Engine/CurveSerialization.cpp @@ -29,10 +29,10 @@ // explicit template instantiations -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void Curve::serialize(boost::archive::xml_iarchive & ar, const unsigned int file_version); template void Curve::serialize(boost::archive::xml_oarchive & ar, const unsigned int file_version); -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/CurveSerialization.h b/Engine/CurveSerialization.h index 89ae42b27a..a4d7dea6da 100644 --- a/Engine/CurveSerialization.h +++ b/Engine/CurveSerialization.h @@ -46,7 +46,7 @@ GCC_DIAG_ON(unused-parameter) #include "Engine/CurvePrivate.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void @@ -69,6 +69,6 @@ Curve::serialize(Archive & ar, ar & ::boost::serialization::make_nvp("KeyFrameSet", _imp->keyFrames); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_CURVESERIALIZATION_H diff --git a/Engine/DefaultShaders.cpp b/Engine/DefaultShaders.cpp index 2e6538d1d1..af75642a5a 100644 --- a/Engine/DefaultShaders.cpp +++ b/Engine/DefaultShaders.cpp @@ -25,7 +25,7 @@ #include "DefaultShaders.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER const char* fillConstant_FragmentShader = "uniform vec4 fillColor;\n" @@ -80,4 +80,4 @@ const char* copyUnprocessedChannels_FragmentShader = "#endif\n" "}"; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/DefaultShaders.h b/Engine/DefaultShaders.h index 0387ab57d6..6997458689 100644 --- a/Engine/DefaultShaders.h +++ b/Engine/DefaultShaders.h @@ -28,12 +28,12 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER extern const char* fillConstant_FragmentShader; extern const char* applyMaskMix_FragmentShader; extern const char* copyUnprocessedChannels_FragmentShader; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // DEFAULTSHADERS_H diff --git a/Engine/DiskCacheNode.cpp b/Engine/DiskCacheNode.cpp index b3096daf68..33091afb39 100644 --- a/Engine/DiskCacheNode.cpp +++ b/Engine/DiskCacheNode.cpp @@ -34,7 +34,7 @@ #include "Engine/TimeLine.h" #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct DiskCacheNodePrivate { @@ -240,8 +240,8 @@ DiskCacheNode::isHostChannelSelectorSupported(bool* /*defaultR*/, return false; } -NATRON_NAMESPACE_EXIT; -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_EXIT +NATRON_NAMESPACE_USING #include "moc_DiskCacheNode.cpp" diff --git a/Engine/DiskCacheNode.h b/Engine/DiskCacheNode.h index c4a8dd497e..b2a9cca3f0 100644 --- a/Engine/DiskCacheNode.h +++ b/Engine/DiskCacheNode.h @@ -35,7 +35,7 @@ #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct DiskCacheNodePrivate; @@ -154,6 +154,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // DISKCACHENODE_H diff --git a/Engine/DockablePanelI.h b/Engine/DockablePanelI.h index 749e1a9175..987113ae48 100644 --- a/Engine/DockablePanelI.h +++ b/Engine/DockablePanelI.h @@ -29,7 +29,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief Interface used by the Engine Knob class to interact with the gui for dynamic parmeter creation @@ -58,6 +58,6 @@ class DockablePanelI virtual void deleteKnobGui(const KnobPtr& knob) = 0; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // DOCKABLEPANELI_H diff --git a/Engine/Dot.cpp b/Engine/Dot.cpp index d076de8aac..71522757c0 100644 --- a/Engine/Dot.cpp +++ b/Engine/Dot.cpp @@ -27,7 +27,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER std::string Dot::getPluginDescription() const @@ -35,4 +35,4 @@ Dot::getPluginDescription() const return "Doesn't do anything to the input image, this is used in the node graph to make bends in the links."; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Dot.h b/Engine/Dot.h index ac2b798b3f..563a41552d 100644 --- a/Engine/Dot.h +++ b/Engine/Dot.h @@ -34,7 +34,7 @@ #include "Engine/NoOpBase.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class Dot : public NoOpBase @@ -70,6 +70,6 @@ class Dot } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_Dot_h diff --git a/Engine/EffectInstance.cpp b/Engine/EffectInstance.cpp index 751c633265..68fba2ae2b 100644 --- a/Engine/EffectInstance.cpp +++ b/Engine/EffectInstance.cpp @@ -85,7 +85,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON //#define NATRON_ALWAYS_ALLOCATE_FULL_IMAGE_BOUNDS -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class KnobFile; @@ -5885,8 +5885,8 @@ EffectInstance::setClipPreferencesRunning(bool running) _imp->runningClipPreferences = running; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_EffectInstance.cpp" diff --git a/Engine/EffectInstance.h b/Engine/EffectInstance.h index f513a6edae..de106a7391 100644 --- a/Engine/EffectInstance.h +++ b/Engine/EffectInstance.h @@ -110,7 +110,7 @@ #define kReaderParamNameOriginalFrameRange "originalFrameRange" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief This is the base class for visual effects. @@ -2257,6 +2257,6 @@ class ClipPreferencesRunning_RAII **/ typedef EffectInstance* (*EffectBuilder)(NodePtr); -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_EFFECTINSTANCE_H diff --git a/Engine/EffectInstancePrivate.cpp b/Engine/EffectInstancePrivate.cpp index 56261ed6d8..d6b6076594 100644 --- a/Engine/EffectInstancePrivate.cpp +++ b/Engine/EffectInstancePrivate.cpp @@ -34,7 +34,7 @@ #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ActionsCache::ActionsCacheInstance::ActionsCacheInstance() : _hash(0) @@ -653,6 +653,6 @@ EffectInstance::Implementation::clearInputImagePointers() tls->currentRenderArgs.inputImages.clear(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/EffectInstancePrivate.h b/Engine/EffectInstancePrivate.h index bab96c0eba..333ede94b2 100644 --- a/Engine/EffectInstancePrivate.h +++ b/Engine/EffectInstancePrivate.h @@ -46,7 +46,7 @@ #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ActionKey { @@ -385,6 +385,6 @@ class EffectInstance::Implementation }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_EffectInstancePrivate_h diff --git a/Engine/EffectInstanceRenderRoI.cpp b/Engine/EffectInstanceRenderRoI.cpp index b59c4b00fa..aa055e3bd2 100644 --- a/Engine/EffectInstanceRenderRoI.cpp +++ b/Engine/EffectInstanceRenderRoI.cpp @@ -82,7 +82,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON //#define NATRON_ALWAYS_ALLOCATE_FULL_IMAGE_BOUNDS -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /* * @brief Split all rects to render in smaller rects and check if each one of them is identity. @@ -2061,4 +2061,4 @@ EffectInstance::renderRoIInternal(EffectInstance* self, return retCode; } // renderRoIInternal -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/EngineFwd.h b/Engine/EngineFwd.h index b5349875f0..75cb690101 100644 --- a/Engine/EngineFwd.h +++ b/Engine/EngineFwd.h @@ -105,7 +105,7 @@ class SequenceFromFiles; // Natron Engine -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class AbortableRenderInfo; class AbortableThread; class AbstractOfxEffectInstance; @@ -249,7 +249,7 @@ struct OSGLContext_wgl_data; class OSGLContext_glx_data; #endif -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_PYTHON_NAMESPACE_ENTER class App; class AppSettings; class BezierCurve; @@ -282,7 +282,7 @@ class Track; class Tracker; class UserParamHolder; -NATRON_PYTHON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT typedef boost::shared_ptr OSGLContextPtr; typedef boost::shared_ptr PluginMemoryPtr; @@ -308,6 +308,6 @@ typedef std::list ImageList; typedef boost::shared_ptr GLTexturePtr; typedef boost::shared_ptr FrameEntryPtr; typedef boost::shared_ptr SettingsPtr; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_EngineFwd_h diff --git a/Engine/ExistenceCheckThread.cpp b/Engine/ExistenceCheckThread.cpp index 82f9ebfec5..c94fd78313 100644 --- a/Engine/ExistenceCheckThread.cpp +++ b/Engine/ExistenceCheckThread.cpp @@ -43,7 +43,7 @@ //After this time, we consider that the crash reporter is dead #define NATRON_BREAKPAD_WAIT_FOR_CRASH_REPORTER_ACK_MS 5000 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ExistenceCheckerThreadPrivate { @@ -162,8 +162,8 @@ ExistenceCheckerThread::run() } // for(;;) } // ExistenceCheckerThread::run -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ExistenceCheckThread.cpp" diff --git a/Engine/ExistenceCheckThread.h b/Engine/ExistenceCheckThread.h index a405c67cd9..2f7db195df 100644 --- a/Engine/ExistenceCheckThread.h +++ b/Engine/ExistenceCheckThread.h @@ -36,7 +36,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ExistenceCheckerThreadPrivate; class ExistenceCheckerThread @@ -69,7 +69,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_ExistenceCheckThread_h diff --git a/Engine/FStreamsSupport.cpp b/Engine/FStreamsSupport.cpp index 62209c2708..5b1dc59ba1 100644 --- a/Engine/FStreamsSupport.cpp +++ b/Engine/FStreamsSupport.cpp @@ -25,7 +25,7 @@ #include "FStreamsSupport.h" #include "Global/StrUtils.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -59,4 +59,4 @@ FStreamsSupport::open (FStreamsSupport::ofstream *stream, #endif } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/FStreamsSupport.h b/Engine/FStreamsSupport.h index d073d815a9..583f480a39 100644 --- a/Engine/FStreamsSupport.h +++ b/Engine/FStreamsSupport.h @@ -37,7 +37,7 @@ #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace FStreamsSupport { @@ -59,6 +59,6 @@ void open(ifstream* stream, const std::string& filename, std::ios_base::openmode void open(ofstream* stream, const std::string& filename, std::ios_base::openmode mode = std::ios_base::out); } //FStreamsSupport -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // FSTREAMSSUPPORT_H diff --git a/Engine/FeatherPoint.h b/Engine/FeatherPoint.h index a73332d57d..da8faa97bb 100644 --- a/Engine/FeatherPoint.h +++ b/Engine/FeatherPoint.h @@ -30,7 +30,7 @@ #include "Engine/BezierCP.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class FeatherPoint : public BezierCP @@ -53,6 +53,6 @@ class FeatherPoint } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_BezierCP_h diff --git a/Engine/FileDownloader.cpp b/Engine/FileDownloader.cpp index 781dcfd19b..dd35db3d46 100644 --- a/Engine/FileDownloader.cpp +++ b/Engine/FileDownloader.cpp @@ -35,7 +35,7 @@ #define NATRON_FILE_DOWNLOAD_HEARBEAT_TIMEOUT_MS 5000 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER FileDownloader::FileDownloader(const QUrl& imageUrl, bool useNetworkCache, @@ -106,7 +106,7 @@ FileDownloader::downloadedData() const return *m_DownloadedData; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_FileDownloader.cpp" diff --git a/Engine/FileDownloader.h b/Engine/FileDownloader.h index 92f05f7227..2ee2175ccf 100644 --- a/Engine/FileDownloader.h +++ b/Engine/FileDownloader.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(deprecated-register) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** Usage: @@ -92,6 +92,6 @@ public Q_SLOTS: boost::scoped_ptr m_timer; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // FILEDOWNLOADER_H diff --git a/Engine/FileSystemModel.cpp b/Engine/FileSystemModel.cpp index c86200aee2..ee0b467378 100644 --- a/Engine/FileSystemModel.cpp +++ b/Engine/FileSystemModel.cpp @@ -51,7 +51,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER static QStringList getSplitPath(const QString& path) @@ -1692,7 +1692,7 @@ FileSystemModel::filesListFromPattern(const std::string& pattern, SequenceParsin return SequenceParsing::filesListFromPattern_fast(pattern, filesList, sequence); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_FileSystemModel.cpp" diff --git a/Engine/FileSystemModel.h b/Engine/FileSystemModel.h index 30f9814fd0..d839be623a 100644 --- a/Engine/FileSystemModel.h +++ b/Engine/FileSystemModel.h @@ -44,7 +44,7 @@ #include "Global/GlobalDefines.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class FileSystemModel; struct FileSystemItemPrivate; @@ -361,6 +361,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // FILESYSTEMMODEL_H diff --git a/Engine/FitCurve.cpp b/Engine/FitCurve.cpp index 0daccf8263..56085504bb 100644 --- a/Engine/FitCurve.cpp +++ b/Engine/FitCurve.cpp @@ -33,7 +33,7 @@ #endif using namespace NATRON_NAMESPACE::FitCurve; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /* * This implementation is based on Graphic Gems I @@ -617,5 +617,5 @@ FitCurve::fit_cubic(const std::vector& points, } } // FitCurve::fit_cubic -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/FitCurve.h b/Engine/FitCurve.h index 40705ba5b1..4cd071a6f6 100644 --- a/Engine/FitCurve.h +++ b/Engine/FitCurve.h @@ -33,7 +33,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * Utility functions to fit a bezier curve to a set of points @@ -54,6 +54,6 @@ struct SimpleBezierCP void fit_cubic(const std::vector& points, double error, std::vector* generatedBezier); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Natron_Engine_FitCurve_h diff --git a/Engine/Format.h b/Engine/Format.h index 4562331469..e3d96f8162 100644 --- a/Engine/Format.h +++ b/Engine/Format.h @@ -37,7 +37,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/RectI.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*This class is used to hold the format of a frame (its resolution). * Some formats have a name , e.g : 1920*1080 is full HD, etc... @@ -146,8 +146,8 @@ class Format std::string _name; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -Q_DECLARE_METATYPE(NATRON_NAMESPACE::Format); +Q_DECLARE_METATYPE(NATRON_NAMESPACE::Format) #endif // Engine_Format_h diff --git a/Engine/FormatSerialization.h b/Engine/FormatSerialization.h index 02f4fbbdba..40bd9efe08 100644 --- a/Engine/FormatSerialization.h +++ b/Engine/FormatSerialization.h @@ -46,7 +46,7 @@ GCC_DIAG_ON(unused-parameter) #define FORMAT_SERIALIZATION_CHANGES_TO_RECTI 3 #define FORMAT_SERIALIZATION_VERSION FORMAT_SERIALIZATION_CHANGES_TO_RECTI -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void @@ -76,7 +76,7 @@ Format::serialize(Archive & ar, ar & ::boost::serialization::make_nvp("Name", _name); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::Format, FORMAT_SERIALIZATION_VERSION) diff --git a/Engine/FrameEntry.cpp b/Engine/FrameEntry.cpp index dee70b2368..f449e53a6c 100644 --- a/Engine/FrameEntry.cpp +++ b/Engine/FrameEntry.cpp @@ -30,7 +30,7 @@ #include "Engine/RectI.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER const U8* @@ -111,4 +111,4 @@ FrameEntry::copy(const FrameEntry& other) } } // FrameEntry::copy -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/FrameEntry.h b/Engine/FrameEntry.h index cd9d1d4516..1fe1699467 100644 --- a/Engine/FrameEntry.h +++ b/Engine/FrameEntry.h @@ -46,7 +46,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class FrameEntry : public CacheEntryHelper @@ -96,6 +96,6 @@ class FrameEntry }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_FRAMEENTRY_H diff --git a/Engine/FrameEntrySerialization.h b/Engine/FrameEntrySerialization.h index c08a398185..77f5b1f8c0 100644 --- a/Engine/FrameEntrySerialization.h +++ b/Engine/FrameEntrySerialization.h @@ -50,7 +50,7 @@ GCC_DIAG_ON(unused-parameter) #define FRAME_KEY_INTRODUCES_CACHE_HOLDER_ID 8 #define FRAME_KEY_VERSION FRAME_KEY_INTRODUCES_CACHE_HOLDER_ID -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void @@ -98,7 +98,7 @@ FrameKey::serialize(Archive & ar, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::FrameKey, FRAME_KEY_VERSION) diff --git a/Engine/FrameKey.cpp b/Engine/FrameKey.cpp index 1895194e29..b5c16cc828 100644 --- a/Engine/FrameKey.cpp +++ b/Engine/FrameKey.cpp @@ -29,7 +29,7 @@ #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER FrameKey::FrameKey() : KeyHelper() @@ -136,4 +136,4 @@ FrameKey::operator==(const FrameKey & other) const _draftMode == other._draftMode; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/FrameKey.h b/Engine/FrameKey.h index e374ef4184..664aa3ddb1 100644 --- a/Engine/FrameKey.h +++ b/Engine/FrameKey.h @@ -33,7 +33,7 @@ #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class FrameKey : public KeyHelper @@ -139,6 +139,6 @@ class FrameKey bool _draftMode; // Whether draft mode is enabled or not }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // FRAMEKEY_H diff --git a/Engine/FrameParams.h b/Engine/FrameParams.h index 2a37acf756..805c6b72e1 100644 --- a/Engine/FrameParams.h +++ b/Engine/FrameParams.h @@ -37,7 +37,7 @@ #include "Engine/EngineFwd.h" #include "Global/GLIncludes.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class FrameParams : public NonKeyParams @@ -111,7 +111,7 @@ class FrameParams RectI _rod; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // FRAMEPARAMS_H diff --git a/Engine/FrameParamsSerialization.cpp b/Engine/FrameParamsSerialization.cpp index 26b48417b0..d7916ab5c7 100644 --- a/Engine/FrameParamsSerialization.cpp +++ b/Engine/FrameParamsSerialization.cpp @@ -29,10 +29,10 @@ // explicit template instantiations -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void NATRON_NAMESPACE::FrameParams::serialize(boost::archive::binary_iarchive & ar, const unsigned int file_version); template void NATRON_NAMESPACE::FrameParams::serialize(boost::archive::binary_oarchive & ar, const unsigned int file_version); -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/FrameParamsSerialization.h b/Engine/FrameParamsSerialization.h index 71cd060a72..574981fc16 100644 --- a/Engine/FrameParamsSerialization.h +++ b/Engine/FrameParamsSerialization.h @@ -40,7 +40,7 @@ GCC_DIAG_ON(unused-parameter) #include "Engine/FrameParams.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // Note: these classes are used for cache serialization and do not have to maintain backward compatibility @@ -53,6 +53,6 @@ FrameParams::serialize(Archive & ar, ar & ::boost::serialization::make_nvp("Rod", _rod); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_FrameParamsSerialization_h diff --git a/Engine/GLShader.cpp b/Engine/GLShader.cpp index 4378b61681..a11a15e0b8 100644 --- a/Engine/GLShader.cpp +++ b/Engine/GLShader.cpp @@ -26,7 +26,7 @@ #include "Global/GLIncludes.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct GLShaderPrivate { @@ -203,4 +203,4 @@ GLShader::setUniform(const char* name, return false; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/GLShader.h b/Engine/GLShader.h index 40b560dd85..0d7153f921 100644 --- a/Engine/GLShader.h +++ b/Engine/GLShader.h @@ -35,7 +35,7 @@ #include "Engine/EngineFwd.h" #include "Global/GlobalDefines.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct GLShaderPrivate; class GLShader @@ -87,6 +87,6 @@ class GLShader boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // GLSHADER_H diff --git a/Engine/GPUContextPool.cpp b/Engine/GPUContextPool.cpp index 86149c3073..04bd9f6119 100644 --- a/Engine/GPUContextPool.cpp +++ b/Engine/GPUContextPool.cpp @@ -34,7 +34,7 @@ #include "Engine/OSGLContext.h" #include "Engine/Settings.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct GPUContextPoolPrivate { @@ -208,4 +208,4 @@ GPUContextPool::releaseGLContextFromRender(const OSGLContextPtr& context) #endif } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/GPUContextPool.h b/Engine/GPUContextPool.h index cf4ceeb236..0e63e54b32 100644 --- a/Engine/GPUContextPool.h +++ b/Engine/GPUContextPool.h @@ -34,7 +34,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // If set, multiple frame renders may use the same GPU context instead of locking it for the whole render of a frame. #define NATRON_RENDER_SHARED_CONTEXT @@ -94,6 +94,6 @@ class GPUContextPool boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // GPUCONTEXTPOOL_H diff --git a/Engine/GenericSchedulerThread.cpp b/Engine/GenericSchedulerThread.cpp index 16ceba36a2..ea5dd4bf0c 100644 --- a/Engine/GenericSchedulerThread.cpp +++ b/Engine/GenericSchedulerThread.cpp @@ -36,7 +36,7 @@ //#define TRACE_GENERIC_SCHEDULER_THREAD #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -608,7 +608,7 @@ GenericSchedulerThread::onExecutionOnMainThreadReceived(const ExecOnMTArgsPtr& a _imp->executingOnMainThreadCond.wakeOne(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_GenericSchedulerThread.cpp" diff --git a/Engine/GenericSchedulerThread.h b/Engine/GenericSchedulerThread.h index 4d2da23f0d..684f69f489 100644 --- a/Engine/GenericSchedulerThread.h +++ b/Engine/GenericSchedulerThread.h @@ -30,7 +30,7 @@ #include "Engine/EngineFwd.h" #include "Engine/ThreadPool.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class GenericThreadStartArgs @@ -319,6 +319,6 @@ private Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // GENERICSCHEDULERTHREAD_H diff --git a/Engine/GenericSchedulerThreadWatcher.cpp b/Engine/GenericSchedulerThreadWatcher.cpp index 6a232b36db..5957231d6b 100644 --- a/Engine/GenericSchedulerThreadWatcher.cpp +++ b/Engine/GenericSchedulerThreadWatcher.cpp @@ -34,7 +34,7 @@ #include "Engine/Node.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -249,7 +249,7 @@ NodeRenderWatcher::handleBlockingTask(int taskID) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_GenericSchedulerThreadWatcher.cpp" diff --git a/Engine/GenericSchedulerThreadWatcher.h b/Engine/GenericSchedulerThreadWatcher.h index c02f850dd1..5ef7a5b61d 100644 --- a/Engine/GenericSchedulerThreadWatcher.h +++ b/Engine/GenericSchedulerThreadWatcher.h @@ -38,7 +38,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief The purpose of this class is to safely destroy a GenericSchedulerThread and to get notify whenever the GenericSchedulerThread abortion is complete @@ -209,6 +209,6 @@ class NodeRenderWatcher }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // GENERICSCHEDULERTHREADWATCHER_H diff --git a/Engine/GroupInput.cpp b/Engine/GroupInput.cpp index 64f37a540e..56247c3bc8 100644 --- a/Engine/GroupInput.cpp +++ b/Engine/GroupInput.cpp @@ -33,7 +33,7 @@ #include "Engine/NodeGroup.h" // kNatronGroupInputIsOptionalParamName, kNatronGroupInputIsMaskParamName #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER std::string GroupInput::getPluginDescription() const @@ -92,7 +92,7 @@ GroupInput::knobChanged(KnobI* k, return ret; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_GroupInput.cpp" diff --git a/Engine/GroupInput.h b/Engine/GroupInput.h index e44dd81a77..469e4e0884 100644 --- a/Engine/GroupInput.h +++ b/Engine/GroupInput.h @@ -34,7 +34,7 @@ #include "Engine/NoOpBase.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class GroupInput : public NoOpBase @@ -93,6 +93,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON bool /*originatedFromMainThread*/) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NOOP_H diff --git a/Engine/GroupOutput.cpp b/Engine/GroupOutput.cpp index f279cb8693..d475ad0cf8 100644 --- a/Engine/GroupOutput.cpp +++ b/Engine/GroupOutput.cpp @@ -27,7 +27,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER std::string GroupOutput::getPluginDescription() const @@ -35,4 +35,4 @@ GroupOutput::getPluginDescription() const return "This node can only be used within a Group. There can only be 1 Output node in the group. It defines the output of the group."; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/GroupOutput.h b/Engine/GroupOutput.h index b3eb75b1fb..8dcd01e8ba 100644 --- a/Engine/GroupOutput.h +++ b/Engine/GroupOutput.h @@ -35,7 +35,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class GroupOutput : public NoOpBase @@ -79,6 +79,6 @@ class GroupOutput } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_GroupOutput_h diff --git a/Engine/Hash64.cpp b/Engine/Hash64.cpp index 54a5ff7645..ff6d60d690 100644 --- a/Engine/Hash64.cpp +++ b/Engine/Hash64.cpp @@ -35,7 +35,7 @@ #include "Engine/Node.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void Hash64::computeHash() @@ -66,4 +66,4 @@ Hash64_appendQString(Hash64* hash, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Hash64.h b/Engine/Hash64.h index 4a0b5da067..5375bf705f 100644 --- a/Engine/Hash64.h +++ b/Engine/Hash64.h @@ -36,7 +36,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*The hash of a Node is the checksum of the vector of data containing: - the values of the current knob for this node + the name of the node @@ -121,7 +121,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON void Hash64_appendQString(Hash64* hash, const QString & str); -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_Hash64_H diff --git a/Engine/HistogramCPU.cpp b/Engine/HistogramCPU.cpp index e4f309f4c8..de8d1e1f03 100644 --- a/Engine/HistogramCPU.cpp +++ b/Engine/HistogramCPU.cpp @@ -34,7 +34,7 @@ #include "Engine/Image.h" #include "Engine/Smooth1D.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct HistogramRequest { @@ -436,7 +436,7 @@ HistogramCPU::run() } } // run -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_HistogramCPU.cpp" diff --git a/Engine/HistogramCPU.h b/Engine/HistogramCPU.h index 34b61289de..9684a4f6aa 100644 --- a/Engine/HistogramCPU.h +++ b/Engine/HistogramCPU.h @@ -38,7 +38,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct HistogramCPUPrivate; @@ -93,6 +93,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // HISTOGRAMCPU_H diff --git a/Engine/HostOverlaySupport.cpp b/Engine/HostOverlaySupport.cpp index d9bb3b47f6..0e6873d104 100644 --- a/Engine/HostOverlaySupport.cpp +++ b/Engine/HostOverlaySupport.cpp @@ -29,7 +29,7 @@ #include "Engine/KnobTypes.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct HostOverlayKnobDescription { @@ -197,4 +197,4 @@ HostOverlayKnobsPosition::describeOverlayKnobs() describeKnob(eKnobsEnumerationInteractive, KnobBool::typeNameStatic(), 1, true); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/HostOverlaySupport.h b/Engine/HostOverlaySupport.h index e9a91dc05b..b469135ac7 100644 --- a/Engine/HostOverlaySupport.h +++ b/Engine/HostOverlaySupport.h @@ -34,7 +34,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct HostOverlayKnobsPrivate; @@ -173,6 +173,6 @@ class HostOverlayKnobsPosition }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // HOSTOVERLAYSUPPORT_H diff --git a/Engine/Image.cpp b/Engine/Image.cpp index fe4fd26216..62162693a9 100644 --- a/Engine/Image.cpp +++ b/Engine/Image.cpp @@ -37,7 +37,7 @@ #include "Engine/OSGLContext.h" #include "Engine/GLShader.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #define BM_GET(i, j) (&_map[( i - _bounds.bottom() ) * _bounds.width() + ( j - _bounds.left() )]) @@ -201,31 +201,6 @@ minimalNonMarkedBbox_internal(const RectI& roi, return bbox; } // minimalNonMarkedBbox_internal -#ifndef NDEBUG -static bool -isNonMarked_internal(const RectI & roi, - const RectI& _bounds, - const std::vector& _map) -{ - int x1 = std::max(roi.x1, _bounds.x1); - int y1 = std::max(roi.y1, _bounds.y1); - int x2 = std::min(roi.x2, _bounds.x2); - int y2 = std::min(roi.y2, _bounds.y2); - - const char* buf = &_map[( x1 - _bounds.bottom() ) * _bounds.width() + ( y1 - _bounds.left() )]; - int w = _bounds.width(); - int roiw = x2 - x1; - - for (int i = y1; i < y2; ++i, buf += w) { - for (int j = 0; j < roiw; ++j) { - if (buf[j]) { - return false; - } - } - } - return true; -} -#endif template void @@ -2416,4 +2391,4 @@ Image::unpremultImage(const RectI& roi) premultForDepth(roi); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Image.h b/Engine/Image.h index 8058486a89..676f184c28 100644 --- a/Engine/Image.h +++ b/Engine/Image.h @@ -49,7 +49,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class GenericAccess @@ -1066,6 +1066,6 @@ template<> inline float Image::clampIfInt(float v) { return v; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_IMAGE_H diff --git a/Engine/ImageComponents.cpp b/Engine/ImageComponents.cpp index 0f92151a3e..32aa807b36 100644 --- a/Engine/ImageComponents.cpp +++ b/Engine/ImageComponents.cpp @@ -29,7 +29,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER static const char* rgbaComps[4] = {"R", "G", "B", "A"}; static const char* rgbComps[3] = {"R", "G", "B"}; @@ -390,5 +390,5 @@ ImageComponents::getPairedStereoDisparity() return comp; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ImageComponents.h b/Engine/ImageComponents.h index f9ebdcba9f..fd62f564c3 100644 --- a/Engine/ImageComponents.h +++ b/Engine/ImageComponents.h @@ -54,7 +54,7 @@ #define kNatronBackwardMotionVectorsPlaneUserName kNatronBackwardMotionVectorsPlaneName #define kNatronForwardMotionVectorsPlaneUserName kNatronForwardMotionVectorsPlaneName -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class ImageComponents { @@ -185,6 +185,6 @@ class ImageComponents std::string _globalComponentsName; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // IMAGECOMPONENTS_H diff --git a/Engine/ImageConvert.cpp b/Engine/ImageConvert.cpp index 45d12bccab..26c2839691 100644 --- a/Engine/ImageConvert.cpp +++ b/Engine/ImageConvert.cpp @@ -39,7 +39,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #include "Engine/AppManager.h" #include "Engine/Lut.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ///explicit template instantiations @@ -906,4 +906,4 @@ Image::convertToFormatAlpha0(const RectI & renderWindow, convertToFormatCommon(renderWindow, srcColorSpace, dstColorSpace, channelForAlpha, true, copyBitmap, requiresUnpremult, dstImg); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ImageCopyChannels.cpp b/Engine/ImageCopyChannels.cpp index 0c0608d68c..e79b134781 100644 --- a/Engine/ImageCopyChannels.cpp +++ b/Engine/ImageCopyChannels.cpp @@ -45,7 +45,7 @@ GCC_DIAG_OFF(unused-but-set-variable) // only on gcc >= 4.6 // to get the values from input instead. //#define NATRON_COPY_CHANNELS_UNPREMULT -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void @@ -692,4 +692,4 @@ Image::copyUnProcessedChannels(const RectI& roi, } } // copyUnProcessedChannels -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ImageKey.cpp b/Engine/ImageKey.cpp index e0fe3d83e7..30af20c8e8 100644 --- a/Engine/ImageKey.cpp +++ b/Engine/ImageKey.cpp @@ -29,7 +29,7 @@ #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ImageKey::ImageKey() : KeyHelper() @@ -96,4 +96,4 @@ ImageKey::operator==(const ImageKey & other) const } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ImageKey.h b/Engine/ImageKey.h index 668d82da39..b3650379b4 100644 --- a/Engine/ImageKey.h +++ b/Engine/ImageKey.h @@ -31,7 +31,7 @@ #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class ImageKey : public KeyHelper @@ -83,6 +83,6 @@ class ImageKey void serialize(Archive & ar, const unsigned int version); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // IMAGEKEY_H diff --git a/Engine/ImageLocker.h b/Engine/ImageLocker.h index 8e79490e10..3e239c05d5 100644 --- a/Engine/ImageLocker.h +++ b/Engine/ImageLocker.h @@ -36,7 +36,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER @@ -124,6 +124,6 @@ class ImageLockerHelper typedef ImageLockerHelper ImageLocker; typedef ImageLockerHelper FrameEntryLocker; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // IMAGELOCKER_H diff --git a/Engine/ImageMaskMix.cpp b/Engine/ImageMaskMix.cpp index bb7f6b21d7..04cc090075 100644 --- a/Engine/ImageMaskMix.cpp +++ b/Engine/ImageMaskMix.cpp @@ -29,7 +29,7 @@ #include "Engine/GLShader.h" #include "Engine/OSGLContext.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void @@ -297,4 +297,4 @@ Image::applyMaskMix(const RectI& roi, } } // applyMaskMix -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ImageParams.h b/Engine/ImageParams.h index 5072ebb497..5797260305 100644 --- a/Engine/ImageParams.h +++ b/Engine/ImageParams.h @@ -44,7 +44,7 @@ #define IMAGE_SERIALIZATION_REMOVE_FRAMESNEEDED 2 #define IMAGE_SERIALIZATION_VERSION IMAGE_SERIALIZATION_REMOVE_FRAMESNEEDED -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER inline int getElementsCountForComponents(ImageComponentsEnum comp) @@ -274,9 +274,9 @@ class ImageParams bool _isRoDProjectFormat; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -BOOST_CLASS_VERSION(NATRON_NAMESPACE::ImageParams, IMAGE_SERIALIZATION_VERSION); +BOOST_CLASS_VERSION(NATRON_NAMESPACE::ImageParams, IMAGE_SERIALIZATION_VERSION) #endif // IMAGEPARAMS_H diff --git a/Engine/ImageParamsSerialization.cpp b/Engine/ImageParamsSerialization.cpp index 5679562d97..460375c41b 100644 --- a/Engine/ImageParamsSerialization.cpp +++ b/Engine/ImageParamsSerialization.cpp @@ -29,10 +29,10 @@ // explicit template instantiations -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void NATRON_NAMESPACE::ImageParams::serialize(boost::archive::binary_iarchive & ar, const unsigned int file_version); template void NATRON_NAMESPACE::ImageParams::serialize(boost::archive::binary_oarchive & ar, const unsigned int file_version); -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ImageParamsSerialization.h b/Engine/ImageParamsSerialization.h index 404ed345b0..9c20c08985 100644 --- a/Engine/ImageParamsSerialization.h +++ b/Engine/ImageParamsSerialization.h @@ -65,7 +65,7 @@ serialize(Archive & ar, } } -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void @@ -96,6 +96,6 @@ ImageParams::serialize(Archive & ar, ar & ::boost::serialization::make_nvp("Fielding", _fielding); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // IMAGEPARAMSSERIALIZATION_H diff --git a/Engine/ImageSerialization.h b/Engine/ImageSerialization.h index 3e493879d6..8a402e4895 100644 --- a/Engine/ImageSerialization.h +++ b/Engine/ImageSerialization.h @@ -47,7 +47,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #define IMAGE_KEY_SERIALIZATION_INTRODUCES_CACHE_HOLDER_ID 2 #define IMAGE_KEY_SERIALIZATION_VERSION IMAGE_KEY_SERIALIZATION_INTRODUCES_CACHE_HOLDER_ID -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void @@ -65,7 +65,7 @@ ImageKey::serialize(Archive & ar, ar & ::boost::serialization::make_nvp("Draft", _draftMode); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::ImageKey, IMAGE_KEY_SERIALIZATION_VERSION) diff --git a/Engine/Interpolation.cpp b/Engine/Interpolation.cpp index 705bfc3c95..9087fff7b8 100644 --- a/Engine/Interpolation.cpp +++ b/Engine/Interpolation.cpp @@ -42,7 +42,7 @@ GCC_DIAG_ON(unused-parameter) #define M_PI 3.14159265358979323846264338327950288 /* pi */ #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using boost::math::cbrt; using std::sqrt; @@ -1111,5 +1111,5 @@ Interpolation::autoComputeDerivatives(KeyframeTypeEnum interpPrev, assert( !boost::math::isnan(*vcurDerivRight) && !boost::math::isnan(*vcurDerivLeft) ); } // autoComputeDerivatives -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Interpolation.h b/Engine/Interpolation.h index c27c1fa1a4..7d542e6efd 100644 --- a/Engine/Interpolation.h +++ b/Engine/Interpolation.h @@ -31,7 +31,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace Interpolation { /** @@ -199,7 +199,7 @@ int solveCubic(double c0, double c1, double c2, double c3, double s[3], int o[3] int solveQuartic(double c0, double c1, double c2, double c3, double c4, double s[4], int o[4]); } // namespace Interpolation -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_INTERPOLATION_H diff --git a/Engine/JoinViewsNode.cpp b/Engine/JoinViewsNode.cpp index b3f24b6e54..c4c0adb95c 100644 --- a/Engine/JoinViewsNode.cpp +++ b/Engine/JoinViewsNode.cpp @@ -31,7 +31,7 @@ #include "Engine/Node.h" #include "Engine/NodeMetadata.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct JoinViewsNodePrivate { @@ -167,7 +167,7 @@ JoinViewsNode::onProjectViewsChanged() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_JoinViewsNode.cpp" diff --git a/Engine/JoinViewsNode.h b/Engine/JoinViewsNode.h index d7952902d9..dfad422fbd 100644 --- a/Engine/JoinViewsNode.h +++ b/Engine/JoinViewsNode.h @@ -29,7 +29,7 @@ #include "Engine/EffectInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct JoinViewsNodePrivate; class JoinViewsNode @@ -135,5 +135,5 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_JoinViewsNode_h diff --git a/Engine/KeyHelper.h b/Engine/KeyHelper.h index 45fdc57353..83c2a58279 100644 --- a/Engine/KeyHelper.h +++ b/Engine/KeyHelper.h @@ -33,7 +33,7 @@ #include "Engine/CacheEntryHolder.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** @brief Helper class that represents a Key in the cache. A key is a set * of 1 or more parameters that represent a "unique" element in the cache. @@ -148,6 +148,6 @@ class KeyHelper mutable bool _hashComputed; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // KEYHELPER_H diff --git a/Engine/Knob.cpp b/Engine/Knob.cpp index 38dda9bbbc..e66aeb015b 100644 --- a/Engine/Knob.cpp +++ b/Engine/Knob.cpp @@ -60,7 +60,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; using std::pair; @@ -6271,7 +6271,7 @@ template class Knob; template class Knob; template class Knob; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_Knob.cpp" diff --git a/Engine/Knob.h b/Engine/Knob.h index 1da1126189..c696af1988 100644 --- a/Engine/Knob.h +++ b/Engine/Knob.h @@ -52,7 +52,7 @@ #define NATRON_USER_MANAGED_KNOBS_PAGE_LABEL "User" #define NATRON_USER_MANAGED_KNOBS_PAGE "userNatron" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class KnobSignalSlotHandler : public QObject @@ -2827,6 +2827,6 @@ boost::shared_ptr KnobHolder::createKnob(const std::string &label, return AppManager::createKnob(this, label, dimension); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_Knob_h diff --git a/Engine/KnobFactory.cpp b/Engine/KnobFactory.cpp index e0deab62ab..b4e9a98992 100644 --- a/Engine/KnobFactory.cpp +++ b/Engine/KnobFactory.cpp @@ -36,7 +36,7 @@ #include "Engine/AppManager.h" #include "Engine/LibraryBinary.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //using std::make_pair; //using std::pair; @@ -123,4 +123,4 @@ boost::shared_ptr KnobFactory::createKnob(const std::string &id, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/KnobFactory.h b/Engine/KnobFactory.h index 7837810fcc..5972687ec7 100644 --- a/Engine/KnobFactory.h +++ b/Engine/KnobFactory.h @@ -38,7 +38,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /******************************KNOB_FACTORY**************************************/ @@ -76,6 +76,6 @@ class KnobFactory std::map _loadedKnobs; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_KnobFactory_h diff --git a/Engine/KnobFile.cpp b/Engine/KnobFile.cpp index 7de6a031ae..e59b5e8a34 100644 --- a/Engine/KnobFile.cpp +++ b/Engine/KnobFile.cpp @@ -45,7 +45,7 @@ #include #include "Global/QtCompat.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //using std::make_pair; //using std::pair; @@ -327,7 +327,7 @@ KnobPath::appendPath(const std::string& path) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobFile.cpp" diff --git a/Engine/KnobFile.h b/Engine/KnobFile.h index 0f3463e5ca..12f4f4ccaf 100644 --- a/Engine/KnobFile.h +++ b/Engine/KnobFile.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /******************************KnobFile**************************************/ @@ -262,6 +262,6 @@ class KnobPath bool _isStringList; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_KNOBFILE_H diff --git a/Engine/KnobGuiI.h b/Engine/KnobGuiI.h index cf78cabdec..f51f0833af 100644 --- a/Engine/KnobGuiI.h +++ b/Engine/KnobGuiI.h @@ -34,7 +34,7 @@ #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class KnobGuiI : public OverlaySupport @@ -92,6 +92,6 @@ class KnobGuiI virtual void setKnobGuiPointer() = 0; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_KnobGui_h diff --git a/Engine/KnobImpl.h b/Engine/KnobImpl.h index 92902d1f98..abb2ae8e06 100644 --- a/Engine/KnobImpl.h +++ b/Engine/KnobImpl.h @@ -62,7 +62,7 @@ GCC_DIAG_ON(unused-parameter) #define EXPR_RECURSION_LEVEL() KnobHelper::ExprRecursionLevel_RAII __recursionLevelIncrementer__(this) -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ///template specializations @@ -3019,6 +3019,6 @@ Knob::copyValuesFromCurve(int dim) } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // KNOBIMPL_H diff --git a/Engine/KnobSerialization.cpp b/Engine/KnobSerialization.cpp index 471a90f750..42c6f6b82c 100644 --- a/Engine/KnobSerialization.cpp +++ b/Engine/KnobSerialization.cpp @@ -49,7 +49,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #include "Engine/TrackMarker.h" #include "Engine/TrackerContext.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ValueSerialization::ValueSerialization() : _serialization(0) @@ -317,11 +317,13 @@ equalsStringCaseSensitive(const std::string& str1, const std::string& str2) return str1 == str2; } +#if 0 static bool equalsStringCaseInsensitive(const std::string& str1, const std::string& str2) { return boost::iequals(str1, str2); } +#endif typedef bool (*stringFuncPtr)(const std::string&,const std::string&); @@ -585,4 +587,4 @@ filterKnobNameCompat(const std::string& pluginID, int pluginVersionMajor, int pl return false; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/KnobSerialization.h b/Engine/KnobSerialization.h index b4465cbd7f..c31ccbadc8 100644 --- a/Engine/KnobSerialization.h +++ b/Engine/KnobSerialization.h @@ -84,7 +84,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #define MASTER_SERIALIZATION_INTRODUCE_MASTER_TRACK_NAME 2 #define MASTER_SERIALIZATION_VERSION MASTER_SERIALIZATION_INTRODUCE_MASTER_TRACK_NAME -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct MasterSerialization { @@ -1170,7 +1170,7 @@ class GroupKnobSerialization BOOST_SERIALIZATION_SPLIT_MEMBER() }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::KnobSerialization, KNOB_SERIALIZATION_VERSION) BOOST_CLASS_VERSION(NATRON_NAMESPACE::ValueSerialization, VALUE_SERIALIZATION_VERSION) diff --git a/Engine/KnobTypes.cpp b/Engine/KnobTypes.cpp index 56a5172c39..1713cb6e2e 100644 --- a/Engine/KnobTypes.cpp +++ b/Engine/KnobTypes.cpp @@ -61,7 +61,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #include "Engine/Transform.h" #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //using std::make_pair; //using std::pair; @@ -2600,7 +2600,7 @@ KnobLayers::typeNameStatic() return _typeNameStr; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobTypes.cpp" diff --git a/Engine/KnobTypes.h b/Engine/KnobTypes.h index 1f245a9f51..45eb654531 100644 --- a/Engine/KnobTypes.h +++ b/Engine/KnobTypes.h @@ -53,7 +53,7 @@ CLANG_DIAG_ON(deprecated) #define kItalicStartTag "" #define kItalicEndTag "" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /******************************KnobInt**************************************/ @@ -1232,6 +1232,6 @@ class KnobLayers static const std::string _typeNameStr; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_KNOBTYPES_H diff --git a/Engine/LibraryBinary.cpp b/Engine/LibraryBinary.cpp index d44a2dadcf..1d93bdf4b6 100644 --- a/Engine/LibraryBinary.cpp +++ b/Engine/LibraryBinary.cpp @@ -35,7 +35,7 @@ #include #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER LibraryBinary::LibraryBinary(LibraryBinary::LibraryTypeEnum type) : _type(type) @@ -168,5 +168,5 @@ LibraryBinary::~LibraryBinary() #endif } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/LibraryBinary.h b/Engine/LibraryBinary.h index 0a415ed4cc..159ed753bf 100644 --- a/Engine/LibraryBinary.h +++ b/Engine/LibraryBinary.h @@ -35,7 +35,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #ifdef __NATRON_OSX__ #define NATRON_LIBRARY_EXT "dylib" #elif defined(__NATRON_LINUX__) @@ -116,5 +116,5 @@ class LibraryBinary std::map _functions; // }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef NATRON_GLOBAL_LIBRARYBINARY_H diff --git a/Engine/Log.cpp b/Engine/Log.cpp index 9bd729a19b..ad3f8de57a 100644 --- a/Engine/Log.cpp +++ b/Engine/Log.cpp @@ -40,7 +40,7 @@ #include "Global/GlobalDefines.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // see second answer of http://stackoverflow.com/questions/2342162/stdstring-formatting-like-sprintf static @@ -226,6 +226,6 @@ Log::endFunction(const std::string & callerName, Log::instance()->_imp->endFunction(callerName, function); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifdef NATRON_LOG diff --git a/Engine/Log.h b/Engine/Log.h index 16af49d292..63cb5321bb 100644 --- a/Engine/Log.h +++ b/Engine/Log.h @@ -33,7 +33,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class LogPrivate; class Log @@ -83,13 +83,13 @@ class Log } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #else #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // no-op class class Log @@ -136,7 +136,7 @@ class Log } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifdef NATRON_LOG diff --git a/Engine/LogEntry.h b/Engine/LogEntry.h index d96f8fa156..7f018f18d4 100644 --- a/Engine/LogEntry.h +++ b/Engine/LogEntry.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct LogEntry { @@ -66,7 +66,7 @@ struct LogEntry }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // LOGENTRY_H diff --git a/Engine/Lut.cpp b/Engine/Lut.cpp index 44987fc3d3..6060557cec 100644 --- a/Engine/Lut.cpp +++ b/Engine/Lut.cpp @@ -45,7 +45,7 @@ */ -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace Color { // compile-time endianness checking found on: @@ -1661,5 +1661,5 @@ hsv_to_rgb(float h, } } // hsv_to_rgb } // namespace Color { -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Lut.h b/Engine/Lut.h index 8c7b87dc20..1510e3a655 100644 --- a/Engine/Lut.h +++ b/Engine/Lut.h @@ -45,7 +45,7 @@ CLANG_DIAG_ON(deprecated) #define NATRON_COLOR_HUE_CIRCLE 1. // if hue should be between 0 and 1 //#define NATRON_COLOR_HUE_CIRCLE 360. // if hue should be in degrees -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace Color { /// @enum An enum describing supported pixels packing formats enum PixelPackingEnum @@ -580,6 +580,6 @@ charToUint8xx(unsigned char quantum) } } //namespace Color -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif //NATRON_ENGINE_LUT_H diff --git a/Engine/Markdown.cpp b/Engine/Markdown.cpp index c172ee7575..ca98369816 100644 --- a/Engine/Markdown.cpp +++ b/Engine/Markdown.cpp @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "html.h" //hoedown -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER Markdown::Markdown() { @@ -118,5 +118,5 @@ Markdown::fixSettingsHTML(const QString &html) return result; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Markdown.h b/Engine/Markdown.h index da3d9b7af0..f32b886412 100644 --- a/Engine/Markdown.h +++ b/Engine/Markdown.h @@ -37,7 +37,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class Markdown { @@ -53,6 +53,6 @@ class Markdown static QString fixSettingsHTML(const QString& html); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // MARKDOWN_H diff --git a/Engine/MemoryFile.cpp b/Engine/MemoryFile.cpp index 41a4af61a7..aa5c478ca3 100644 --- a/Engine/MemoryFile.cpp +++ b/Engine/MemoryFile.cpp @@ -47,7 +47,7 @@ #define MIN_FILE_SIZE 4096 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct MemoryFilePrivate { @@ -439,5 +439,5 @@ MemoryFile::remove() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/MemoryFile.h b/Engine/MemoryFile.h index 7843b01d22..b28306c016 100644 --- a/Engine/MemoryFile.h +++ b/Engine/MemoryFile.h @@ -33,7 +33,7 @@ #include "Global/Enums.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct MemoryFilePrivate; @@ -161,6 +161,6 @@ class MemoryFile MemoryFilePrivate* _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif /* defined(NATRON_ENGINE_MEMORYFILE_H_) */ diff --git a/Engine/MemoryInfo.cpp b/Engine/MemoryInfo.cpp index baf2d4e3c0..095bb177ad 100644 --- a/Engine/MemoryInfo.cpp +++ b/Engine/MemoryInfo.cpp @@ -76,7 +76,7 @@ #include "Global/GlobalDefines.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER U64 getSystemTotalRAM() @@ -420,4 +420,4 @@ getAmountFreePhysicalRAM() #endif } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/MemoryInfo.h b/Engine/MemoryInfo.h index cc340a97e4..7671474bc8 100644 --- a/Engine/MemoryInfo.h +++ b/Engine/MemoryInfo.h @@ -33,7 +33,7 @@ #include "Global/GlobalDefines.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // Memory utility functions ( info about RAM etc...) @@ -66,6 +66,6 @@ std::size_t getCurrentRSS( ); std::size_t getAmountFreePhysicalRAM(); -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef Engine_MemoryInfo_h diff --git a/Engine/MergingEnum.h b/Engine/MergingEnum.h index 064e54b62b..5494d2fc56 100644 --- a/Engine/MergingEnum.h +++ b/Engine/MergingEnum.h @@ -32,7 +32,7 @@ #include "Global/Enums.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace Merge { @@ -430,6 +430,6 @@ getOperatorStrings(std::vector* operators, } } // namespace Merge -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // MERGINGENUM_H diff --git a/Engine/NatronEngine/animatedparam_wrapper.h b/Engine/NatronEngine/animatedparam_wrapper.h index b56f9a58a1..fadbb6d792 100644 --- a/Engine/NatronEngine/animatedparam_wrapper.h +++ b/Engine/NatronEngine/animatedparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class AnimatedParamWrapper : public AnimatedParam { public: @@ -13,7 +13,7 @@ class AnimatedParamWrapper : public AnimatedParam virtual ~AnimatedParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_ANIMATEDPARAMWRAPPER_H diff --git a/Engine/NatronEngine/app_wrapper.h b/Engine/NatronEngine/app_wrapper.h index 4fa4ae167d..3a9d4f1d5f 100644 --- a/Engine/NatronEngine/app_wrapper.h +++ b/Engine/NatronEngine/app_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class AppWrapper : public App { public: @@ -14,7 +14,7 @@ class AppWrapper : public App virtual ~AppWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_APPWRAPPER_H diff --git a/Engine/NatronEngine/beziercurve_wrapper.h b/Engine/NatronEngine/beziercurve_wrapper.h index 9aa96ccdd1..642c72a197 100644 --- a/Engine/NatronEngine/beziercurve_wrapper.h +++ b/Engine/NatronEngine/beziercurve_wrapper.h @@ -5,14 +5,14 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class BezierCurveWrapper : public BezierCurve { public: virtual ~BezierCurveWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_BEZIERCURVEWRAPPER_H diff --git a/Engine/NatronEngine/booleanparam_wrapper.h b/Engine/NatronEngine/booleanparam_wrapper.h index 2857efb47f..72e2e2566c 100644 --- a/Engine/NatronEngine/booleanparam_wrapper.h +++ b/Engine/NatronEngine/booleanparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class BooleanParamWrapper : public BooleanParam { public: @@ -13,7 +13,7 @@ class BooleanParamWrapper : public BooleanParam virtual ~BooleanParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_BOOLEANPARAMWRAPPER_H diff --git a/Engine/NatronEngine/boolnodecreationproperty_wrapper.h b/Engine/NatronEngine/boolnodecreationproperty_wrapper.h index 6cc70a2b62..c1be940914 100644 --- a/Engine/NatronEngine/boolnodecreationproperty_wrapper.h +++ b/Engine/NatronEngine/boolnodecreationproperty_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class BoolNodeCreationPropertyWrapper : public BoolNodeCreationProperty { public: @@ -14,7 +14,7 @@ class BoolNodeCreationPropertyWrapper : public BoolNodeCreationProperty virtual ~BoolNodeCreationPropertyWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_BOOLNODECREATIONPROPERTYWRAPPER_H diff --git a/Engine/NatronEngine/buttonparam_wrapper.h b/Engine/NatronEngine/buttonparam_wrapper.h index 6bec82a78c..8581299594 100644 --- a/Engine/NatronEngine/buttonparam_wrapper.h +++ b/Engine/NatronEngine/buttonparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class ButtonParamWrapper : public ButtonParam { public: @@ -13,7 +13,7 @@ class ButtonParamWrapper : public ButtonParam virtual ~ButtonParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_BUTTONPARAMWRAPPER_H diff --git a/Engine/NatronEngine/choiceparam_wrapper.h b/Engine/NatronEngine/choiceparam_wrapper.h index 6f9493b409..2bedd10ec6 100644 --- a/Engine/NatronEngine/choiceparam_wrapper.h +++ b/Engine/NatronEngine/choiceparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class ChoiceParamWrapper : public ChoiceParam { public: @@ -13,7 +13,7 @@ class ChoiceParamWrapper : public ChoiceParam virtual ~ChoiceParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_CHOICEPARAMWRAPPER_H diff --git a/Engine/NatronEngine/colorparam_wrapper.h b/Engine/NatronEngine/colorparam_wrapper.h index b6f50dc4ca..ac894f6869 100644 --- a/Engine/NatronEngine/colorparam_wrapper.h +++ b/Engine/NatronEngine/colorparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class ColorParamWrapper : public ColorParam { public: @@ -13,7 +13,7 @@ class ColorParamWrapper : public ColorParam virtual ~ColorParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_COLORPARAMWRAPPER_H diff --git a/Engine/NatronEngine/double2dparam_wrapper.h b/Engine/NatronEngine/double2dparam_wrapper.h index 83fa5bc7a3..b6609ee54c 100644 --- a/Engine/NatronEngine/double2dparam_wrapper.h +++ b/Engine/NatronEngine/double2dparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class Double2DParamWrapper : public Double2DParam { public: @@ -13,7 +13,7 @@ class Double2DParamWrapper : public Double2DParam virtual ~Double2DParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_DOUBLE2DPARAMWRAPPER_H diff --git a/Engine/NatronEngine/double3dparam_wrapper.h b/Engine/NatronEngine/double3dparam_wrapper.h index af8cacd010..0f8f795ca4 100644 --- a/Engine/NatronEngine/double3dparam_wrapper.h +++ b/Engine/NatronEngine/double3dparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class Double3DParamWrapper : public Double3DParam { public: @@ -13,7 +13,7 @@ class Double3DParamWrapper : public Double3DParam virtual ~Double3DParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_DOUBLE3DPARAMWRAPPER_H diff --git a/Engine/NatronEngine/doubleparam_wrapper.h b/Engine/NatronEngine/doubleparam_wrapper.h index aee0ba1587..1ccbe9c239 100644 --- a/Engine/NatronEngine/doubleparam_wrapper.h +++ b/Engine/NatronEngine/doubleparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class DoubleParamWrapper : public DoubleParam { public: @@ -13,7 +13,7 @@ class DoubleParamWrapper : public DoubleParam virtual ~DoubleParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_DOUBLEPARAMWRAPPER_H diff --git a/Engine/NatronEngine/effect_wrapper.h b/Engine/NatronEngine/effect_wrapper.h index 2bd378f245..ec3add2e40 100644 --- a/Engine/NatronEngine/effect_wrapper.h +++ b/Engine/NatronEngine/effect_wrapper.h @@ -5,14 +5,14 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class EffectWrapper : public Effect { public: ~EffectWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_EFFECTWRAPPER_H diff --git a/Engine/NatronEngine/fileparam_wrapper.h b/Engine/NatronEngine/fileparam_wrapper.h index 329d3f6d48..3e5151858a 100644 --- a/Engine/NatronEngine/fileparam_wrapper.h +++ b/Engine/NatronEngine/fileparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class FileParamWrapper : public FileParam { public: @@ -13,7 +13,7 @@ class FileParamWrapper : public FileParam virtual ~FileParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_FILEPARAMWRAPPER_H diff --git a/Engine/NatronEngine/floatnodecreationproperty_wrapper.h b/Engine/NatronEngine/floatnodecreationproperty_wrapper.h index cd76ae8672..daeb7deb6f 100644 --- a/Engine/NatronEngine/floatnodecreationproperty_wrapper.h +++ b/Engine/NatronEngine/floatnodecreationproperty_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class FloatNodeCreationPropertyWrapper : public FloatNodeCreationProperty { public: @@ -14,7 +14,7 @@ class FloatNodeCreationPropertyWrapper : public FloatNodeCreationProperty virtual ~FloatNodeCreationPropertyWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_FLOATNODECREATIONPROPERTYWRAPPER_H diff --git a/Engine/NatronEngine/group_wrapper.h b/Engine/NatronEngine/group_wrapper.h index 20b9c5b000..5870a777fa 100644 --- a/Engine/NatronEngine/group_wrapper.h +++ b/Engine/NatronEngine/group_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class GroupWrapper : public Group { public: @@ -13,7 +13,7 @@ class GroupWrapper : public Group virtual ~GroupWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_GROUPWRAPPER_H diff --git a/Engine/NatronEngine/groupparam_wrapper.h b/Engine/NatronEngine/groupparam_wrapper.h index 61c802afa8..b177029441 100644 --- a/Engine/NatronEngine/groupparam_wrapper.h +++ b/Engine/NatronEngine/groupparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class GroupParamWrapper : public GroupParam { public: @@ -13,7 +13,7 @@ class GroupParamWrapper : public GroupParam virtual ~GroupParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_GROUPPARAMWRAPPER_H diff --git a/Engine/NatronEngine/int2dparam_wrapper.h b/Engine/NatronEngine/int2dparam_wrapper.h index dc2d2d668e..9c50e28b29 100644 --- a/Engine/NatronEngine/int2dparam_wrapper.h +++ b/Engine/NatronEngine/int2dparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class Int2DParamWrapper : public Int2DParam { public: @@ -13,7 +13,7 @@ class Int2DParamWrapper : public Int2DParam virtual ~Int2DParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_INT2DPARAMWRAPPER_H diff --git a/Engine/NatronEngine/int3dparam_wrapper.h b/Engine/NatronEngine/int3dparam_wrapper.h index c726b4ed29..f8c8f2ece9 100644 --- a/Engine/NatronEngine/int3dparam_wrapper.h +++ b/Engine/NatronEngine/int3dparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class Int3DParamWrapper : public Int3DParam { public: @@ -13,7 +13,7 @@ class Int3DParamWrapper : public Int3DParam virtual ~Int3DParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_INT3DPARAMWRAPPER_H diff --git a/Engine/NatronEngine/intnodecreationproperty_wrapper.h b/Engine/NatronEngine/intnodecreationproperty_wrapper.h index 6863874fb8..b697d0989a 100644 --- a/Engine/NatronEngine/intnodecreationproperty_wrapper.h +++ b/Engine/NatronEngine/intnodecreationproperty_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class IntNodeCreationPropertyWrapper : public IntNodeCreationProperty { public: @@ -14,7 +14,7 @@ class IntNodeCreationPropertyWrapper : public IntNodeCreationProperty virtual ~IntNodeCreationPropertyWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_INTNODECREATIONPROPERTYWRAPPER_H diff --git a/Engine/NatronEngine/intparam_wrapper.h b/Engine/NatronEngine/intparam_wrapper.h index 3802f78fd6..76d366e966 100644 --- a/Engine/NatronEngine/intparam_wrapper.h +++ b/Engine/NatronEngine/intparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class IntParamWrapper : public IntParam { public: @@ -13,7 +13,7 @@ class IntParamWrapper : public IntParam virtual ~IntParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_INTPARAMWRAPPER_H diff --git a/Engine/NatronEngine/itembase_wrapper.h b/Engine/NatronEngine/itembase_wrapper.h index ba2e5cad0a..ab292cf730 100644 --- a/Engine/NatronEngine/itembase_wrapper.h +++ b/Engine/NatronEngine/itembase_wrapper.h @@ -5,14 +5,14 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class ItemBaseWrapper : public ItemBase { public: virtual ~ItemBaseWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_ITEMBASEWRAPPER_H diff --git a/Engine/NatronEngine/layer_wrapper.h b/Engine/NatronEngine/layer_wrapper.h index fd57fbf176..3680c891fc 100644 --- a/Engine/NatronEngine/layer_wrapper.h +++ b/Engine/NatronEngine/layer_wrapper.h @@ -5,14 +5,14 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class LayerWrapper : public Layer { public: virtual ~LayerWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_LAYERWRAPPER_H diff --git a/Engine/NatronEngine/natronengine_python.h b/Engine/NatronEngine/natronengine_python.h index 55f0e94ea8..05d18c44a4 100644 --- a/Engine/NatronEngine/natronengine_python.h +++ b/Engine/NatronEngine/natronengine_python.h @@ -14,9 +14,11 @@ // Module Includes 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) // Binded library includes #include diff --git a/Engine/NatronEngine/nodecreationproperty_wrapper.h b/Engine/NatronEngine/nodecreationproperty_wrapper.h index 205ff011c8..c6c3f4e7d6 100644 --- a/Engine/NatronEngine/nodecreationproperty_wrapper.h +++ b/Engine/NatronEngine/nodecreationproperty_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class NodeCreationPropertyWrapper : public NodeCreationProperty { public: @@ -13,7 +13,7 @@ class NodeCreationPropertyWrapper : public NodeCreationProperty virtual ~NodeCreationPropertyWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_NODECREATIONPROPERTYWRAPPER_H diff --git a/Engine/NatronEngine/outputfileparam_wrapper.h b/Engine/NatronEngine/outputfileparam_wrapper.h index c538d7c80e..49a1ef3ee7 100644 --- a/Engine/NatronEngine/outputfileparam_wrapper.h +++ b/Engine/NatronEngine/outputfileparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class OutputFileParamWrapper : public OutputFileParam { public: @@ -13,7 +13,7 @@ class OutputFileParamWrapper : public OutputFileParam virtual ~OutputFileParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_OUTPUTFILEPARAMWRAPPER_H diff --git a/Engine/NatronEngine/pageparam_wrapper.h b/Engine/NatronEngine/pageparam_wrapper.h index 7909c9bb25..b770c85678 100644 --- a/Engine/NatronEngine/pageparam_wrapper.h +++ b/Engine/NatronEngine/pageparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class PageParamWrapper : public PageParam { public: @@ -13,7 +13,7 @@ class PageParamWrapper : public PageParam virtual ~PageParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_PAGEPARAMWRAPPER_H diff --git a/Engine/NatronEngine/param_wrapper.h b/Engine/NatronEngine/param_wrapper.h index 8248ccc962..0b4843e5cc 100644 --- a/Engine/NatronEngine/param_wrapper.h +++ b/Engine/NatronEngine/param_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class ParamWrapper : public Param { public: @@ -13,7 +13,7 @@ class ParamWrapper : public Param virtual ~ParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_PARAMWRAPPER_H diff --git a/Engine/NatronEngine/parametricparam_wrapper.h b/Engine/NatronEngine/parametricparam_wrapper.h index ead720343d..e927d8e6f6 100644 --- a/Engine/NatronEngine/parametricparam_wrapper.h +++ b/Engine/NatronEngine/parametricparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class ParametricParamWrapper : public ParametricParam { public: @@ -13,7 +13,7 @@ class ParametricParamWrapper : public ParametricParam virtual ~ParametricParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_PARAMETRICPARAMWRAPPER_H diff --git a/Engine/NatronEngine/pathparam_wrapper.h b/Engine/NatronEngine/pathparam_wrapper.h index f76057411d..aa4c042843 100644 --- a/Engine/NatronEngine/pathparam_wrapper.h +++ b/Engine/NatronEngine/pathparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class PathParamWrapper : public PathParam { public: @@ -13,7 +13,7 @@ class PathParamWrapper : public PathParam virtual ~PathParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_PATHPARAMWRAPPER_H diff --git a/Engine/NatronEngine/pycoreapplication_wrapper.h b/Engine/NatronEngine/pycoreapplication_wrapper.h index bdaa419b50..d7adaf81fd 100644 --- a/Engine/NatronEngine/pycoreapplication_wrapper.h +++ b/Engine/NatronEngine/pycoreapplication_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class PyCoreApplicationWrapper : public PyCoreApplication { public: @@ -13,7 +13,7 @@ class PyCoreApplicationWrapper : public PyCoreApplication virtual ~PyCoreApplicationWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_PYCOREAPPLICATIONWRAPPER_H diff --git a/Engine/NatronEngine/rectd_wrapper.h b/Engine/NatronEngine/rectd_wrapper.h index 38aa7478b2..331e9f144a 100644 --- a/Engine/NatronEngine/rectd_wrapper.h +++ b/Engine/NatronEngine/rectd_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class RectDWrapper : public RectD { public: @@ -18,7 +18,7 @@ class RectDWrapper : public RectD virtual ~RectDWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_RECTDWRAPPER_H diff --git a/Engine/NatronEngine/recti_wrapper.h b/Engine/NatronEngine/recti_wrapper.h index 46f323f27b..ce4199c572 100644 --- a/Engine/NatronEngine/recti_wrapper.h +++ b/Engine/NatronEngine/recti_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class RectIWrapper : public RectI { public: @@ -18,7 +18,7 @@ class RectIWrapper : public RectI virtual ~RectIWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_RECTIWRAPPER_H diff --git a/Engine/NatronEngine/separatorparam_wrapper.h b/Engine/NatronEngine/separatorparam_wrapper.h index d7337c5fcb..b1967e36d6 100644 --- a/Engine/NatronEngine/separatorparam_wrapper.h +++ b/Engine/NatronEngine/separatorparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class SeparatorParamWrapper : public SeparatorParam { public: @@ -13,7 +13,7 @@ class SeparatorParamWrapper : public SeparatorParam virtual ~SeparatorParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_SEPARATORPARAMWRAPPER_H diff --git a/Engine/NatronEngine/stringnodecreationproperty_wrapper.h b/Engine/NatronEngine/stringnodecreationproperty_wrapper.h index da9360b749..d4bbbd7f77 100644 --- a/Engine/NatronEngine/stringnodecreationproperty_wrapper.h +++ b/Engine/NatronEngine/stringnodecreationproperty_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class StringNodeCreationPropertyWrapper : public StringNodeCreationProperty { public: @@ -14,7 +14,7 @@ class StringNodeCreationPropertyWrapper : public StringNodeCreationProperty virtual ~StringNodeCreationPropertyWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_STRINGNODECREATIONPROPERTYWRAPPER_H diff --git a/Engine/NatronEngine/stringparam_wrapper.h b/Engine/NatronEngine/stringparam_wrapper.h index 021925bcb0..9a6670fbdc 100644 --- a/Engine/NatronEngine/stringparam_wrapper.h +++ b/Engine/NatronEngine/stringparam_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class StringParamWrapper : public StringParam { public: @@ -13,7 +13,7 @@ class StringParamWrapper : public StringParam virtual ~StringParamWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_STRINGPARAMWRAPPER_H diff --git a/Engine/NatronEngine/stringparambase_wrapper.h b/Engine/NatronEngine/stringparambase_wrapper.h index 29bc46d9ae..7763e7cc6d 100644 --- a/Engine/NatronEngine/stringparambase_wrapper.h +++ b/Engine/NatronEngine/stringparambase_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class StringParamBaseWrapper : public StringParamBase { public: @@ -13,7 +13,7 @@ class StringParamBaseWrapper : public StringParamBase virtual ~StringParamBaseWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_STRINGPARAMBASEWRAPPER_H diff --git a/Engine/NatronEngine/userparamholder_wrapper.h b/Engine/NatronEngine/userparamholder_wrapper.h index 5b54844742..c7b1be40ae 100644 --- a/Engine/NatronEngine/userparamholder_wrapper.h +++ b/Engine/NatronEngine/userparamholder_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class UserParamHolderWrapper : public UserParamHolder { public: @@ -13,7 +13,7 @@ class UserParamHolderWrapper : public UserParamHolder virtual ~UserParamHolderWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_USERPARAMHOLDERWRAPPER_H diff --git a/Engine/NoOpBase.cpp b/Engine/NoOpBase.cpp index 6dc7d951ae..e78ee34b87 100644 --- a/Engine/NoOpBase.cpp +++ b/Engine/NoOpBase.cpp @@ -30,7 +30,7 @@ #include "Engine/Transform.h" // Matrix3x3 #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NoOpBase::NoOpBase(NodePtr n) : OutputEffectInstance(n) @@ -107,4 +107,4 @@ NoOpBase::getInputsHoldingTransform(std::list* inputs) const return true; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/NoOpBase.h b/Engine/NoOpBase.h index 950ba456d6..a058c66dc8 100644 --- a/Engine/NoOpBase.h +++ b/Engine/NoOpBase.h @@ -35,7 +35,7 @@ #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief A NoOp is an effect that doesn't do anything. It is useful for scripting (adding custom parameters) @@ -117,6 +117,6 @@ class NoOpBase int* inputNb) OVERRIDE FINAL WARN_UNUSED_RETURN; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_NoOpBase_h diff --git a/Engine/Node.cpp b/Engine/Node.cpp index a6419c5e34..5788a32eb2 100644 --- a/Engine/Node.cpp +++ b/Engine/Node.cpp @@ -107,7 +107,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON ///at most every... #define NATRON_RENDER_GRAPHS_HINTS_REFRESH_RATE_SECONDS 1 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; using std::cout; using std::endl; @@ -12118,7 +12118,7 @@ InspectorNode::setInputB(int inputNb) Q_EMIT refreshOptionalState(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_Node.cpp" diff --git a/Engine/Node.h b/Engine/Node.h index f7fa7e17c0..29706ab319 100644 --- a/Engine/Node.h +++ b/Engine/Node.h @@ -73,7 +73,7 @@ CLANG_DIAG_ON(deprecated) #define kWriteOIIOParamViewsSelector "viewsSelector" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class Node : public QObject @@ -1585,6 +1585,6 @@ class RenderingFlagSetter ~RenderingFlagSetter(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_NODE_H diff --git a/Engine/NodeGraphI.h b/Engine/NodeGraphI.h index 13bb1a8835..7a91fca959 100644 --- a/Engine/NodeGraphI.h +++ b/Engine/NodeGraphI.h @@ -29,7 +29,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class NodeGraphI { @@ -42,6 +42,6 @@ class NodeGraphI virtual void onNodesCleared() = 0; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NODEGRAPHI_H diff --git a/Engine/NodeGroup.cpp b/Engine/NodeGroup.cpp index 576009b1e0..f83f3fa98f 100644 --- a/Engine/NodeGroup.cpp +++ b/Engine/NodeGroup.cpp @@ -60,7 +60,7 @@ #define NATRON_PYPLUG_EXPORTER_VERSION 10 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct NodeCollectionPrivate { @@ -2855,7 +2855,7 @@ NodeCollection::exportGroupToPython(const QString& pluginID, WRITE_INDENT(2); WRITE_STRING("extModule.createInstanceExt(app,group)"); } // NodeCollection::exportGroupToPython -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_NodeGroup.cpp" diff --git a/Engine/NodeGroup.h b/Engine/NodeGroup.h index 934393193f..e88f83bdfe 100644 --- a/Engine/NodeGroup.h +++ b/Engine/NodeGroup.h @@ -49,7 +49,7 @@ CLANG_DIAG_ON(uninitialized) #define kNatronGroupInputIsMaskParamName "isMask" #define kNatronGroupInputIsOptionalParamName "optional" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct NodeCollectionPrivate; @@ -408,6 +408,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NODEGROUP_H diff --git a/Engine/NodeGroupSerialization.cpp b/Engine/NodeGroupSerialization.cpp index 2b543d1a75..54cd9afb47 100644 --- a/Engine/NodeGroupSerialization.cpp +++ b/Engine/NodeGroupSerialization.cpp @@ -40,7 +40,7 @@ #include // for removePath -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void NodeCollectionSerialization::initialize(const NodeCollection& group) @@ -452,4 +452,4 @@ NodeCollectionSerialization::restoreFromSerialization(const std::list< boost::sh return !mustShowErrorsLog; } // NodeCollectionSerialization::restoreFromSerialization -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/NodeGroupSerialization.h b/Engine/NodeGroupSerialization.h index 4f19e2befb..07ed8d8fcc 100644 --- a/Engine/NodeGroupSerialization.h +++ b/Engine/NodeGroupSerialization.h @@ -57,7 +57,7 @@ CLANG_DIAG_ON(uninitialized) #define NODE_GROUP_SERIALIZATION_VERSION 1 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class NodeCollectionSerialization { @@ -128,7 +128,7 @@ class NodeCollectionSerialization BOOST_SERIALIZATION_SPLIT_MEMBER() }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::NodeCollectionSerialization, NODE_COLLECTION_SERIALIZATION_VERSION) diff --git a/Engine/NodeGuiI.h b/Engine/NodeGuiI.h index 6ffa017638..46c77bff3e 100644 --- a/Engine/NodeGuiI.h +++ b/Engine/NodeGuiI.h @@ -35,7 +35,7 @@ #include "Engine/EngineFwd.h" #include "Engine/UndoCommand.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class NodeGuiI { @@ -173,6 +173,6 @@ class NodeGuiI virtual void showGroupKnobAsDialog(KnobGroup* group) = 0; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NODEGUII_H diff --git a/Engine/NodeMetadata.cpp b/Engine/NodeMetadata.cpp index 27e0b72d2d..f3fe0693a9 100644 --- a/Engine/NodeMetadata.cpp +++ b/Engine/NodeMetadata.cpp @@ -27,7 +27,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PerInputData { @@ -328,4 +328,4 @@ NodeMetadata::getOutputFormat() const return _imp->outputFormat; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/NodeMetadata.h b/Engine/NodeMetadata.h index eaf18f55ea..d3a2e459ba 100644 --- a/Engine/NodeMetadata.h +++ b/Engine/NodeMetadata.h @@ -36,7 +36,7 @@ #include "Engine/ImageComponents.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief These meta-data are represents what's flowing through a node. They change diff --git a/Engine/NodeSerialization.cpp b/Engine/NodeSerialization.cpp index 6b68726568..380471d6d8 100644 --- a/Engine/NodeSerialization.cpp +++ b/Engine/NodeSerialization.cpp @@ -35,7 +35,7 @@ #include "Engine/NodeGroupSerialization.h" #include "Engine/RotoContext.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NodeSerialization::NodeSerialization(const NodePtr & n, bool serializeInputs) @@ -200,4 +200,4 @@ NodeSerialization::NodeSerialization(const NodePtr & n, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/NodeSerialization.h b/Engine/NodeSerialization.h index 2d605a41c3..937508cf33 100644 --- a/Engine/NodeSerialization.h +++ b/Engine/NodeSerialization.h @@ -69,7 +69,7 @@ GCC_DIAG_ON(unused-parameter) #define NODE_SERIALIZATION_INTRODUCES_TRACKER_CONTEXT 15 #define NODE_SERIALIZATION_CURRENT_VERSION NODE_SERIALIZATION_INTRODUCES_TRACKER_CONTEXT -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class NodeSerialization { @@ -434,7 +434,7 @@ class NodeSerialization BOOST_SERIALIZATION_SPLIT_MEMBER() }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::NodeSerialization, NODE_SERIALIZATION_CURRENT_VERSION) diff --git a/Engine/Noise.cpp b/Engine/Noise.cpp index f47fbe56ac..278ad7b9c7 100644 --- a/Engine/Noise.cpp +++ b/Engine/Noise.cpp @@ -125,7 +125,7 @@ T noiseHelper(const T* X, const int* period = 0) { } // compute function values propagated from zero from each node int num = 1 << d; - T vals[num]; + T vals[1 << d]; for (int dummy = 0; dummy < num; dummy++) { int latticeIndex[d]; int offset[d]; diff --git a/Engine/NonKeyParams.cpp b/Engine/NonKeyParams.cpp index f7a41a5b7e..f1b88ff6b7 100644 --- a/Engine/NonKeyParams.cpp +++ b/Engine/NonKeyParams.cpp @@ -27,7 +27,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NonKeyParams::NonKeyParams() : _storageInfo() @@ -56,4 +56,4 @@ NonKeyParams::getStorageInfo() const return _storageInfo; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/NonKeyParams.h b/Engine/NonKeyParams.h index bf65ad1c77..f3f0845127 100644 --- a/Engine/NonKeyParams.h +++ b/Engine/NonKeyParams.h @@ -34,7 +34,7 @@ #include "Engine/RectI.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER inline int getSizeOfForBitDepth(ImageBitDepthEnum bitdepth) @@ -121,6 +121,6 @@ class NonKeyParams CacheEntryStorageInfo _storageInfo; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NONKEYPARAMS_H diff --git a/Engine/NonKeyParamsSerialization.cpp b/Engine/NonKeyParamsSerialization.cpp index 0f4fdc72fb..497f97bb2d 100644 --- a/Engine/NonKeyParamsSerialization.cpp +++ b/Engine/NonKeyParamsSerialization.cpp @@ -27,7 +27,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // explicit template instantiations @@ -44,4 +44,4 @@ template void NonKeyParams::serialize( boost::ar template void NonKeyParams::serialize( boost::archive::xml_oarchive & ar, const unsigned int file_version); -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/NonKeyParamsSerialization.h b/Engine/NonKeyParamsSerialization.h index 4865c96e4c..7f210cf73d 100644 --- a/Engine/NonKeyParamsSerialization.h +++ b/Engine/NonKeyParamsSerialization.h @@ -45,7 +45,7 @@ GCC_DIAG_ON(unused-parameter) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void @@ -59,7 +59,7 @@ NonKeyParams::serialize(Archive & ar, ar & ::boost::serialization::make_nvp("TexTarget", _storageInfo.textureTarget); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_SERIALIZATION_ASSUME_ABSTRACT(NATRON_NAMESPACE::NonKeyParams); diff --git a/Engine/OSGLContext.cpp b/Engine/OSGLContext.cpp index 2843e6b451..f51066d960 100644 --- a/Engine/OSGLContext.cpp +++ b/Engine/OSGLContext.cpp @@ -44,7 +44,7 @@ #include "Engine/GPUContextPool.h" #include "Engine/GLShader.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER FramebufferConfig::FramebufferConfig() : redBits(8) @@ -604,4 +604,4 @@ OSGLContext::getGPUInfos(std::list& renderers) #endif } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/OSGLContext.h b/Engine/OSGLContext.h index d457a0bca2..7ccf96f89e 100644 --- a/Engine/OSGLContext.h +++ b/Engine/OSGLContext.h @@ -72,7 +72,7 @@ #include "Engine/EngineFwd.h" #include "Global/GLIncludes.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /* @brief Framebuffer configuration. @@ -280,6 +280,6 @@ class OSGLContextAttacher } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // OSGLCONTEXT_H diff --git a/Engine/OSGLContext_mac.cpp b/Engine/OSGLContext_mac.cpp index 34402390fb..f76b4d64b6 100644 --- a/Engine/OSGLContext_mac.cpp +++ b/Engine/OSGLContext_mac.cpp @@ -151,7 +151,7 @@ #endif // __MAC_OS_X_VERSION_MIN_REQUIRED -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class OSGLContext_mac::Implementation { @@ -663,6 +663,6 @@ OSGLContext_mac::~OSGLContext_mac() _object = nil;*/ } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // __NATRON_OSX__ diff --git a/Engine/OSGLContext_mac.h b/Engine/OSGLContext_mac.h index eceecf1f21..e772954aea 100644 --- a/Engine/OSGLContext_mac.h +++ b/Engine/OSGLContext_mac.h @@ -35,7 +35,7 @@ #ifdef __NATRON_OSX__ -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class OSGLContext_mac { @@ -62,7 +62,7 @@ class OSGLContext_mac boost::scoped_ptr _imp; // PIMPL: hide implementation details }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // __NATRON_OSX__ diff --git a/Engine/OSGLContext_win.cpp b/Engine/OSGLContext_win.cpp index aa76b9c7c9..d88f6f5b64 100644 --- a/Engine/OSGLContext_win.cpp +++ b/Engine/OSGLContext_win.cpp @@ -53,7 +53,7 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1; #define NATRON_WNDCLASSNAME L"NATRON30" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER bool OSGLContext_win::extensionSupported(const char* extension, @@ -884,6 +884,6 @@ OSGLContext_win::getGPUInfos(std::list& renderers) } } // OSGLContext_win::getGPUInfos -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // __NATRON_WIN32__ diff --git a/Engine/OSGLContext_win.h b/Engine/OSGLContext_win.h index 8731d9b5f2..69b5a62c51 100644 --- a/Engine/OSGLContext_win.h +++ b/Engine/OSGLContext_win.h @@ -146,7 +146,7 @@ typedef VOID (*PFNWGLBLITCONTEXTFRAMEBUFFERAMD)(HGLRC dstCtx, GLint srcX0, GLint #define GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A #define GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct OSGLContext_wgl_data { @@ -237,7 +237,7 @@ class OSGLContext_win }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // __NATRON_WIN32__ diff --git a/Engine/OSGLContext_x11.cpp b/Engine/OSGLContext_x11.cpp index 420fc2f380..d9590dcc5e 100644 --- a/Engine/OSGLContext_x11.cpp +++ b/Engine/OSGLContext_x11.cpp @@ -135,7 +135,7 @@ typedef const char* (*PFNGLXQUERYCURRENTRENDERERSTRINGMESA)(int); #define GLXBadProfileARB 13 #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // X11-specific global data // @@ -1016,6 +1016,6 @@ OSGLContext_x11::getGPUInfos(std::list& renderers) } } // OSGLContext_x11::getGPUInfos -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // __NATRON_LINUX__ diff --git a/Engine/OSGLContext_x11.h b/Engine/OSGLContext_x11.h index 8f974802fe..d6006441ba 100644 --- a/Engine/OSGLContext_x11.h +++ b/Engine/OSGLContext_x11.h @@ -38,7 +38,7 @@ #include "Global/GlobalDefines.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // GLX-specific global data @@ -83,7 +83,7 @@ class OSGLContext_x11 boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // __NATRON_LINUX__ diff --git a/Engine/OfxClipInstance.cpp b/Engine/OfxClipInstance.cpp index 5941f12386..6651ccda6c 100644 --- a/Engine/OfxClipInstance.cpp +++ b/Engine/OfxClipInstance.cpp @@ -57,7 +57,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct OfxClipInstancePrivate { @@ -1839,5 +1839,5 @@ OfxClipInstance::findSupportedComp(const std::string &s) const return none; } // OfxClipInstance::findSupportedComp -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/OfxClipInstance.h b/Engine/OfxClipInstance.h index 5bfe601acd..4acfa7223c 100644 --- a/Engine/OfxClipInstance.h +++ b/Engine/OfxClipInstance.h @@ -55,7 +55,7 @@ CLANG_DIAG_ON(unknown-pragmas) #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class OfxImageCommon; struct OfxClipInstancePrivate; @@ -390,6 +390,6 @@ class OfxTexture } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_OFXCLIPINSTANCE_H diff --git a/Engine/OfxEffectInstance.cpp b/Engine/OfxEffectInstance.cpp index 50d7bddeb0..391c829ca2 100644 --- a/Engine/OfxEffectInstance.cpp +++ b/Engine/OfxEffectInstance.cpp @@ -76,7 +76,7 @@ CLANG_DIAG_ON(unknown-pragmas) #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::cout; using std::endl; @@ -3183,7 +3183,7 @@ OfxEffectInstance::onInteractViewportSelectionUpdated(const RectD& rectangle, bo k->setValue(onRelease ? 2 : 1); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_OfxEffectInstance.cpp" diff --git a/Engine/OfxEffectInstance.h b/Engine/OfxEffectInstance.h index 0407c55d7b..24610fb9a3 100644 --- a/Engine/OfxEffectInstance.h +++ b/Engine/OfxEffectInstance.h @@ -46,7 +46,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class AbstractOfxEffectInstance : public OutputEffectInstance @@ -319,6 +319,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_OFXNODE_H diff --git a/Engine/OfxHost.cpp b/Engine/OfxHost.cpp index 223ebb5de0..dd7588ca85 100644 --- a/Engine/OfxHost.cpp +++ b/Engine/OfxHost.cpp @@ -110,7 +110,7 @@ CLANG_DIAG_ON(unknown-pragmas) //An effect may not use more than this amount of threads #define NATRON_MULTI_THREAD_SUITE_MAX_NUM_CPU 4 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // to disambiguate with the global-scope ::OfxHost // see second answer of http://stackoverflow.com/questions/2342162/stdstring-formatting-like-sprintf @@ -1702,5 +1702,5 @@ OfxHost::flushOpenGLResources() const #endif -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/OfxHost.h b/Engine/OfxHost.h index 87bdb68de5..2b6a2fadf8 100644 --- a/Engine/OfxHost.h +++ b/Engine/OfxHost.h @@ -54,7 +54,7 @@ CLANG_DIAG_ON(unknown-pragmas) //#define MULTI_THREAD_SUITE_USES_THREAD_SAFE_MUTEX_ALLOCATION -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct OfxHostPrivate; class OfxHost @@ -200,6 +200,6 @@ class OfxHost boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef NATRON_ENGINE_OFXHOST_H diff --git a/Engine/OfxImageEffectInstance.cpp b/Engine/OfxImageEffectInstance.cpp index 8f301f8863..fdd74c83f7 100644 --- a/Engine/OfxImageEffectInstance.cpp +++ b/Engine/OfxImageEffectInstance.cpp @@ -69,7 +69,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/ViewIdx.h" #include "Engine/ViewerInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // see second answer of http://stackoverflow.com/questions/2342162/stdstring-formatting-like-sprintf static @@ -1440,4 +1440,4 @@ OfxImageEffectInstance::ofxCursorToNatronCursor(const std::string &ofxCursor, return ret; } // OfxImageEffectInstance::ofxCursorToNatronCursor -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/OfxImageEffectInstance.h b/Engine/OfxImageEffectInstance.h index 85dad480ca..24a6c1981c 100644 --- a/Engine/OfxImageEffectInstance.h +++ b/Engine/OfxImageEffectInstance.h @@ -51,7 +51,7 @@ CLANG_DIAG_ON(unknown-pragmas) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class OfxImageEffectInstance : public OFX::Host::ImageEffect::Instance @@ -277,6 +277,6 @@ class OfxImageEffectDescriptor const char *name) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef NATRON_ENGINE_OFXIMAGEEFFECTINSTANCE_H diff --git a/Engine/OfxMemory.cpp b/Engine/OfxMemory.cpp index 78a8889a53..ec9e68a5de 100644 --- a/Engine/OfxMemory.cpp +++ b/Engine/OfxMemory.cpp @@ -34,7 +34,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/EffectInstance.h" #include "Engine/PluginMemory.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER OfxMemory::OfxMemory(const EffectInstPtr& effect) : OFX::Host::Memory::Instance() @@ -89,4 +89,4 @@ OfxMemory::unlock() _memory->unlock(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/OfxMemory.h b/Engine/OfxMemory.h index fc01953302..8a5a5935af 100644 --- a/Engine/OfxMemory.h +++ b/Engine/OfxMemory.h @@ -36,7 +36,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class OfxMemory : public OFX::Host::Memory::Instance @@ -58,6 +58,6 @@ class OfxMemory private: }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // OFXMEMORY_H diff --git a/Engine/OfxOverlayInteract.cpp b/Engine/OfxOverlayInteract.cpp index a1cf9baa29..689bbe3a93 100644 --- a/Engine/OfxOverlayInteract.cpp +++ b/Engine/OfxOverlayInteract.cpp @@ -38,7 +38,7 @@ #include "Engine/AppInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NatronOverlayInteractSupport::OGLContextSaver::OGLContextSaver(OverlaySupport* viewport) : _viewport(viewport) @@ -353,4 +353,4 @@ OfxParamOverlayInteract::redraw() return kOfxStatOK; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/OfxOverlayInteract.h b/Engine/OfxOverlayInteract.h index 7ffdf8d2ed..fa41805fbb 100644 --- a/Engine/OfxOverlayInteract.h +++ b/Engine/OfxOverlayInteract.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(tautological-undefined-compare) CLANG_DIAG_ON(unknown-pragmas) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class NatronOverlayInteractSupport { @@ -367,6 +367,6 @@ class OfxParamOverlayInteract }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_OFXOVERLAYINTERACT_H diff --git a/Engine/OfxParamInstance.cpp b/Engine/OfxParamInstance.cpp index 628e0a21d7..5fbd645e54 100644 --- a/Engine/OfxParamInstance.cpp +++ b/Engine/OfxParamInstance.cpp @@ -62,7 +62,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #include "Engine/ViewIdx.h" #include "Engine/WriteNode.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct OfxKeyFrames_compare @@ -4317,7 +4317,10 @@ OfxCustomInstance::OfxCustomInstance(const boost::shared_ptr& knob->blockValueChanges(); knob->setDefaultValue(properties.getStringProperty(kOfxParamPropDefault), 0); knob->unblockValueChanges(); + GCC_DIAG_PEDANTIC_OFF _imp->customParamInterpolationV1Entry = (customParamInterpolationV1Entry_t)properties.getPointerProperty(kOfxParamPropCustomInterpCallbackV1); + GCC_DIAG_PEDANTIC_ON + if (_imp->customParamInterpolationV1Entry) { knob->setCustomInterpolation( _imp->customParamInterpolationV1Entry, (void*)getHandle() ); } @@ -4550,7 +4553,9 @@ OfxPluginEntryPoint* OfxParametricInstance::getCustomOverlayInteractEntryPoint(const OFX::Host::Param::Instance* param) const { Q_UNUSED(param); + GCC_DIAG_PEDANTIC_OFF return (OfxPluginEntryPoint*)getProperties().getPointerProperty(kOfxParamPropParametricInteractBackground); + GCC_DIAG_PEDANTIC_ON } void @@ -4861,7 +4866,7 @@ OfxParametricInstance::copyFrom(const OFX::Host::Param::Instance &instance, return OfxKeyFrame::copyFrom(other.getKnob(), getKnob(), offset, range); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_OfxParamInstance.cpp" diff --git a/Engine/OfxParamInstance.h b/Engine/OfxParamInstance.h index f3974b71eb..8b3f7c1f70 100644 --- a/Engine/OfxParamInstance.h +++ b/Engine/OfxParamInstance.h @@ -55,7 +55,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/EffectInstance.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*This file contains the classes that connect the knobs to the OpenFX params. Note that all the get(...) and set(...) functions are called BY PLUGIN and you should @@ -108,7 +108,9 @@ class OfxParamToKnob virtual OfxPluginEntryPoint* getCustomOverlayInteractEntryPoint(const OFX::Host::Param::Instance* param) const { + GCC_DIAG_PEDANTIC_OFF return (OfxPluginEntryPoint*)param->getProperties().getPointerProperty(kOfxParamPropInteractV1); + GCC_DIAG_PEDANTIC_ON } virtual KnobPtr getKnob() const = 0; @@ -978,7 +980,7 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON boost::weak_ptr _knob; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_OFXPARAMINSTANCE_H diff --git a/Engine/OneViewNode.cpp b/Engine/OneViewNode.cpp index 0e1052150d..1017281a2d 100644 --- a/Engine/OneViewNode.cpp +++ b/Engine/OneViewNode.cpp @@ -30,7 +30,7 @@ #include "Engine/Node.h" #include "Engine/Project.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct OneViewNodePrivate { @@ -181,8 +181,8 @@ OneViewNode::onProjectViewsChanged() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_OneViewNode.cpp" diff --git a/Engine/OneViewNode.h b/Engine/OneViewNode.h index fb633c7f0d..dc81950f54 100644 --- a/Engine/OneViewNode.h +++ b/Engine/OneViewNode.h @@ -29,7 +29,7 @@ #include "Engine/EffectInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct OneViewNodePrivate; class OneViewNode @@ -137,6 +137,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ENGINE_ONEVIEWNODE_H diff --git a/Engine/OpenGLViewerI.h b/Engine/OpenGLViewerI.h index 4ac7384866..b5e5e79869 100644 --- a/Engine/OpenGLViewerI.h +++ b/Engine/OpenGLViewerI.h @@ -38,7 +38,7 @@ #include "Engine/Texture.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class OpenGLViewerI @@ -234,6 +234,6 @@ class OpenGLViewerI virtual int getStringWidthForCurrentFont(const std::string& string) const OVERRIDE = 0; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // OPENGLVIEWERI_H diff --git a/Engine/OutputEffectInstance.cpp b/Engine/OutputEffectInstance.cpp index 8bd7799c10..ab3c7b3fb4 100644 --- a/Engine/OutputEffectInstance.cpp +++ b/Engine/OutputEffectInstance.cpp @@ -79,7 +79,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON //#define NATRON_ALWAYS_ALLOCATE_FULL_IMAGE_BOUNDS -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER OutputEffectInstance::OutputEffectInstance(NodePtr node) @@ -529,7 +529,7 @@ OutputEffectInstance::reportStats(int time, } } // OutputEffectInstance::reportStats -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_OutputEffectInstance.cpp" diff --git a/Engine/OutputEffectInstance.h b/Engine/OutputEffectInstance.h index b676aa8a42..829ad0fb89 100644 --- a/Engine/OutputEffectInstance.h +++ b/Engine/OutputEffectInstance.h @@ -43,7 +43,7 @@ class QThread; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class OutputEffectInstance : public EffectInstance @@ -128,6 +128,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON virtual RenderEngine* createRenderEngine(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_OutputEffectInstance_h diff --git a/Engine/OutputSchedulerThread.cpp b/Engine/OutputSchedulerThread.cpp index b7d544aee4..b8f2be0d73 100644 --- a/Engine/OutputSchedulerThread.cpp +++ b/Engine/OutputSchedulerThread.cpp @@ -87,7 +87,7 @@ #define NATRON_SCHEDULER_ABORT_AFTER_X_UNSUCCESSFUL_ITERATIONS 5000 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ///Sort the frames by time and then by view @@ -3993,7 +3993,7 @@ ViewerCurrentFrameRequestRendererBackup::threadLoopOnce(const ThreadStartArgsPtr return eThreadStateActive; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_OutputSchedulerThread.cpp" diff --git a/Engine/OutputSchedulerThread.h b/Engine/OutputSchedulerThread.h index f07ee902f2..b89385dc62 100644 --- a/Engine/OutputSchedulerThread.h +++ b/Engine/OutputSchedulerThread.h @@ -49,7 +49,7 @@ //#define NATRON_PLAYBACK_USES_THREAD_POOL -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef boost::shared_ptr RenderStatsPtr; @@ -879,6 +879,6 @@ class ViewerRenderEngine virtual OutputSchedulerThread* createScheduler(const boost::shared_ptr& effect) OVERRIDE FINAL WARN_UNUSED_RETURN; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_OutputSchedulerThread_h diff --git a/Engine/OverlaySupport.h b/Engine/OverlaySupport.h index 21a849f472..832a800ddd 100644 --- a/Engine/OverlaySupport.h +++ b/Engine/OverlaySupport.h @@ -36,7 +36,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/EngineFwd.h" #include "Engine/RectD.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @class An abstract interface for overlay holders. Any OpenGL widget capable of drawing overlays should @@ -182,6 +182,6 @@ class OverlaySupport virtual int getStringWidthForCurrentFont(const std::string& string) const = 0; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_OverlaySupport_h diff --git a/Engine/ParallelRenderArgs.cpp b/Engine/ParallelRenderArgs.cpp index 213878133c..d70e99f07b 100644 --- a/Engine/ParallelRenderArgs.cpp +++ b/Engine/ParallelRenderArgs.cpp @@ -42,7 +42,7 @@ #include "Engine/RotoDrawableItem.h" #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER EffectInstance::RenderRoIRetCode EffectInstance::treeRecurseFunctor(bool isRenderFunctor, @@ -917,4 +917,4 @@ ParallelRenderArgs::isCurrentFrameRenderNotAbortable() const return isRenderResponseToUserInteraction && ( !info || !info->canAbort() ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ParallelRenderArgs.h b/Engine/ParallelRenderArgs.h index bc3d792af2..5071ad44f4 100644 --- a/Engine/ParallelRenderArgs.h +++ b/Engine/ParallelRenderArgs.h @@ -48,7 +48,7 @@ //do not all stick altogether in memory #define NATRON_MAX_FRAMES_NEEDED_PRE_FETCHING 4 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef std::map RoIMap; // RoIs are in canonical coordinates typedef std::map > FrameRangesMap; @@ -279,6 +279,6 @@ class ParallelRenderArgsSetter virtual ~ParallelRenderArgsSetter(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PARALLELRENDERARGS_H diff --git a/Engine/Plugin.cpp b/Engine/Plugin.cpp index 65d1358bee..db8f2f8cd1 100644 --- a/Engine/Plugin.cpp +++ b/Engine/Plugin.cpp @@ -37,7 +37,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #include "Engine/LibraryBinary.h" #include "Engine/Settings.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER Plugin::~Plugin() { @@ -366,4 +366,4 @@ FormatExtensionCompareCaseInsensitive::operator() (const std::string& lhs, return boost::algorithm::lexicographical_compare( lhs, rhs, boost::algorithm::is_iless() ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Plugin.h b/Engine/Plugin.h index 0b9d0896eb..fcb803ae33 100644 --- a/Engine/Plugin.h +++ b/Engine/Plugin.h @@ -43,7 +43,7 @@ #include "Engine/EngineFwd.h" #include "Engine/PluginActionShortcut.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class PluginGroupNode { @@ -425,6 +425,6 @@ typedef std::set IOPluginSet // The best plug-in for a format is the set.rbegin() typedef std::map IOPluginsMap; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PLUGIN_H diff --git a/Engine/PluginActionShortcut.h b/Engine/PluginActionShortcut.h index 1d2f3c18d1..38e5841ef1 100644 --- a/Engine/PluginActionShortcut.h +++ b/Engine/PluginActionShortcut.h @@ -30,7 +30,7 @@ #include "Global/GlobalDefines.h" #include "Global/KeySymbols.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PluginActionShortcut { @@ -58,6 +58,6 @@ struct PluginActionShortcut {} }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PLUGINACTIONSHORTCUT_H diff --git a/Engine/PluginMemory.cpp b/Engine/PluginMemory.cpp index 715b35f67f..74f5bf22e2 100644 --- a/Engine/PluginMemory.cpp +++ b/Engine/PluginMemory.cpp @@ -34,7 +34,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/EffectInstance.h" #include "Engine/CacheEntry.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PluginMemory::Implementation { @@ -138,4 +138,4 @@ PluginMemory::unlock() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/PluginMemory.h b/Engine/PluginMemory.h index adb5359cf1..1fc9fd7c93 100644 --- a/Engine/PluginMemory.h +++ b/Engine/PluginMemory.h @@ -34,7 +34,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class PluginMemory { @@ -73,6 +73,6 @@ class PluginMemory boost::scoped_ptr _imp; //!< PImpl }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PLUGINMEMORY_H diff --git a/Engine/PrecompNode.cpp b/Engine/PrecompNode.cpp index 4b92aa031e..c06eefc374 100644 --- a/Engine/PrecompNode.cpp +++ b/Engine/PrecompNode.cpp @@ -55,7 +55,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PrecompNodePrivate { @@ -743,7 +743,7 @@ PrecompNode::getPrecompApp() const return _imp->app.lock(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_PrecompNode.cpp" diff --git a/Engine/PrecompNode.h b/Engine/PrecompNode.h index cd8245a62c..099ccbb5ef 100644 --- a/Engine/PrecompNode.h +++ b/Engine/PrecompNode.h @@ -35,7 +35,7 @@ #include "Engine/OutputEffectInstance.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PrecompNodePrivate; class PrecompNode @@ -127,6 +127,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PRECOMPNODE_H diff --git a/Engine/ProcessHandler.cpp b/Engine/ProcessHandler.cpp index 2d4098f7f4..633fe63f25 100644 --- a/Engine/ProcessHandler.cpp +++ b/Engine/ProcessHandler.cpp @@ -42,7 +42,7 @@ #include "Engine/Node.h" #include "Engine/OutputEffectInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ProcessHandler::ProcessHandler(const QString & projectPath, OutputEffectInstance* writer) @@ -424,7 +424,7 @@ ProcessInputChannel::onOutputPipeConnectionMade() qDebug() << "The output channel was successfully created and connected."; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ProcessHandler.cpp" diff --git a/Engine/ProcessHandler.h b/Engine/ProcessHandler.h index 799b051e67..5d16db0a97 100644 --- a/Engine/ProcessHandler.h +++ b/Engine/ProcessHandler.h @@ -40,7 +40,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief This class represents a background render process. It starts a render and reports progress via a @@ -256,6 +256,6 @@ public Q_SLOTS: bool _mustQuit; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PROCESSHANDLER_H diff --git a/Engine/Project.cpp b/Engine/Project.cpp index 50fc115310..19a62996bc 100644 --- a/Engine/Project.cpp +++ b/Engine/Project.cpp @@ -84,7 +84,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #include "Engine/ViewerInstance.h" #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::cout; using std::endl; using std::make_pair; @@ -2698,7 +2698,7 @@ Project::setTimeLine(const boost::shared_ptr& timeline) _imp->timeline = timeline; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_Project.cpp" diff --git a/Engine/Project.h b/Engine/Project.h index dfbbea6a62..d3688fb812 100644 --- a/Engine/Project.h +++ b/Engine/Project.h @@ -55,7 +55,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ProjectPrivate; @@ -431,6 +431,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_PROJECT_H diff --git a/Engine/ProjectPrivate.cpp b/Engine/ProjectPrivate.cpp index c0d6c26a7f..a55398caf9 100644 --- a/Engine/ProjectPrivate.cpp +++ b/Engine/ProjectPrivate.cpp @@ -50,7 +50,7 @@ #include "Engine/ViewerInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ProjectPrivate::ProjectPrivate(Project* project) : _publicInterface(project) @@ -511,4 +511,4 @@ ProjectPrivate::getProjectPath() const return projectPath->getValue(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ProjectPrivate.h b/Engine/ProjectPrivate.h index 1a847dc5f7..42bb070503 100644 --- a/Engine/ProjectPrivate.h +++ b/Engine/ProjectPrivate.h @@ -51,7 +51,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/GenericSchedulerThreadWatcher.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ProjectPrivate { @@ -227,6 +227,6 @@ struct ProjectPrivate } // generateFormatFromString }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PROJECTPRIVATE_H diff --git a/Engine/ProjectSerialization.cpp b/Engine/ProjectSerialization.cpp index 82797fc312..47403784c9 100644 --- a/Engine/ProjectSerialization.cpp +++ b/Engine/ProjectSerialization.cpp @@ -32,7 +32,7 @@ #include "Engine/RotoLayer.h" #include "Engine/TimeLine.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void ProjectSerialization::initialize(const Project* project) @@ -61,4 +61,4 @@ ProjectSerialization::initialize(const Project* project) _creationDate = project->getProjectCreationTime(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ProjectSerialization.h b/Engine/ProjectSerialization.h index ebfde0069c..19d2e830cb 100644 --- a/Engine/ProjectSerialization.h +++ b/Engine/ProjectSerialization.h @@ -68,7 +68,7 @@ GCC_DIAG_ON(unused-parameter) #define PROJECT_SERIALIZATION_CHANGE_VERSION_SERIALIZATION 6 #define PROJECT_SERIALIZATION_VERSION PROJECT_SERIALIZATION_CHANGE_VERSION_SERIALIZATION -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ProjectBeingLoadedInfo { @@ -284,7 +284,7 @@ class ProjectSerialization BOOST_SERIALIZATION_SPLIT_MEMBER() }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::ProjectSerialization, PROJECT_SERIALIZATION_VERSION) diff --git a/Engine/PyAppInstance.cpp b/Engine/PyAppInstance.cpp index 399cfd11f9..18c5ba0be4 100644 --- a/Engine/PyAppInstance.cpp +++ b/Engine/PyAppInstance.cpp @@ -40,8 +40,8 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER App::App(const AppInstPtr& instance) : Group() @@ -482,5 +482,5 @@ App::addProjectLayer(const ImageLayer& layer) getInternalApp()->getProject()->addProjectDefaultLayer( layer.getInternalComps() ); } -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT diff --git a/Engine/PyAppInstance.h b/Engine/PyAppInstance.h index a74ff1b2ca..11f5a5383f 100644 --- a/Engine/PyAppInstance.h +++ b/Engine/PyAppInstance.h @@ -44,8 +44,8 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/PyNode.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER class AppSettings { @@ -332,7 +332,7 @@ class App boost::shared_ptr getCollectionFromGroup(Group* group) const; }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #endif // Engine_AppInstanceWrapper_h diff --git a/Engine/PyExprUtils.h b/Engine/PyExprUtils.h index 440442afe5..ab11db2180 100644 --- a/Engine/PyExprUtils.h +++ b/Engine/PyExprUtils.h @@ -31,8 +31,8 @@ #include "Engine/PyParameter.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER class ExprUtils @@ -121,8 +121,8 @@ class ExprUtils static double pnoise(const Double3DTuple& p, const Double3DTuple& period); }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #endif // PYNOISE_H diff --git a/Engine/PyGlobalFunctions.h b/Engine/PyGlobalFunctions.h index 769609adc2..95a7be9b14 100644 --- a/Engine/PyGlobalFunctions.h +++ b/Engine/PyGlobalFunctions.h @@ -38,8 +38,8 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER class PyCoreApplication { @@ -227,8 +227,8 @@ class PyCoreApplication } }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #if defined(PYSIDE_H) && defined(PYSIDE_OLD) namespace PySide { diff --git a/Engine/PyNode.cpp b/Engine/PyNode.cpp index ab473ce7eb..cef7d6438d 100644 --- a/Engine/PyNode.cpp +++ b/Engine/PyNode.cpp @@ -37,8 +37,8 @@ #include "Engine/PyTracker.h" #include "Engine/Hash64.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER ImageLayer::ImageLayer(const QString& layerName, const QString& componentsPrettyName, @@ -1066,5 +1066,5 @@ Effect::setPagesOrder(const QStringList& pages) getInternalNode()->setPagesOrder(order); } -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT diff --git a/Engine/PyNode.h b/Engine/PyNode.h index bd59380bbe..505565cbed 100644 --- a/Engine/PyNode.h +++ b/Engine/PyNode.h @@ -43,8 +43,8 @@ #include "Engine/RectD.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER class ImageLayer { @@ -387,7 +387,7 @@ class Effect void setPagesOrder(const QStringList& pages); }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #endif // NODEWRAPPER_H diff --git a/Engine/PyNodeGroup.cpp b/Engine/PyNodeGroup.cpp index df19f91021..2b054775f1 100644 --- a/Engine/PyNodeGroup.cpp +++ b/Engine/PyNodeGroup.cpp @@ -31,8 +31,8 @@ #include "Engine/NodeGroup.h" #include "Engine/PyNode.h" #include "Engine/ReadNode.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER Group::Group() : _collection() @@ -93,5 +93,5 @@ Group::getChildren() const return ret; } -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT diff --git a/Engine/PyNodeGroup.h b/Engine/PyNodeGroup.h index 01e7660fd9..d48912b291 100644 --- a/Engine/PyNodeGroup.h +++ b/Engine/PyNodeGroup.h @@ -35,8 +35,8 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER class Group { @@ -69,7 +69,7 @@ class Group std::list getChildren() const; }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #endif // Engine_NodeGroupWrapper_h diff --git a/Engine/PyParameter.cpp b/Engine/PyParameter.cpp index 177de80304..ab3e03365d 100644 --- a/Engine/PyParameter.cpp +++ b/Engine/PyParameter.cpp @@ -32,8 +32,8 @@ #include "Engine/Curve.h" #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER Param::Param(const KnobPtr& knob) : _knob(knob) @@ -2597,6 +2597,6 @@ ParametricParam::setDefaultCurvesFromCurrentCurves() param->setDefaultCurvesFromCurves(); } -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT diff --git a/Engine/PyParameter.h b/Engine/PyParameter.h index 9f6b65de0b..6d671a2fad 100644 --- a/Engine/PyParameter.h +++ b/Engine/PyParameter.h @@ -41,8 +41,8 @@ #include "Engine/KnobFile.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER class Param { @@ -1192,7 +1192,7 @@ class ParametricParam void setDefaultCurvesFromCurrentCurves(); }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #endif // Engine_ParameterWrapper_h diff --git a/Engine/PyRoto.cpp b/Engine/PyRoto.cpp index 74d8ebbdd8..9a187930a1 100644 --- a/Engine/PyRoto.cpp +++ b/Engine/PyRoto.cpp @@ -37,8 +37,8 @@ #include "Engine/RotoLayer.h" #include "Engine/RotoStrokeItem.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER ItemBase::ItemBase(const boost::shared_ptr& item) : _item(item) @@ -630,5 +630,5 @@ Roto::createRectangle(double x, return 0; } -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT diff --git a/Engine/PyRoto.h b/Engine/PyRoto.h index 14e906ab96..8d7b4e1b78 100644 --- a/Engine/PyRoto.h +++ b/Engine/PyRoto.h @@ -38,8 +38,8 @@ #include "Engine/PyParameter.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER class Layer; // defined below @@ -191,7 +191,7 @@ class Roto boost::shared_ptr _ctx; }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #endif // ROTOWRAPPER_H diff --git a/Engine/PyTracker.cpp b/Engine/PyTracker.cpp index 72aba0e30b..f324b8a61c 100644 --- a/Engine/PyTracker.cpp +++ b/Engine/PyTracker.cpp @@ -29,8 +29,8 @@ #include "Engine/TrackerContext.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER Track::Track(const boost::shared_ptr& marker) : _marker(marker) @@ -206,5 +206,5 @@ Tracker::createTrack() return new Track(track); } -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT diff --git a/Engine/PyTracker.h b/Engine/PyTracker.h index e916cc386e..d560d18146 100644 --- a/Engine/PyTracker.h +++ b/Engine/PyTracker.h @@ -37,8 +37,8 @@ #include "Engine/PyParameter.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER class Track { @@ -100,7 +100,7 @@ class Tracker boost::weak_ptr _ctx; }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #endif // Engine_PyTracker_H diff --git a/Engine/ReadNode.cpp b/Engine/ReadNode.cpp index 5d6bbc9da2..02af67a42f 100644 --- a/Engine/ReadNode.cpp +++ b/Engine/ReadNode.cpp @@ -72,7 +72,7 @@ CLANG_DIAG_ON(uninitialized) #define READ_NODE_DEFAULT_READER PLUGINID_OFX_READOIIO #define kPluginSelectorParamEntryDefault "Default" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //Generic Reader #define kParamFilename kOfxImageEffectFileParamName @@ -1421,7 +1421,7 @@ ReadNode::getFramesNeeded(double time, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ReadNode.cpp" diff --git a/Engine/ReadNode.h b/Engine/ReadNode.h index ddd3bc9068..9b630fc778 100644 --- a/Engine/ReadNode.h +++ b/Engine/ReadNode.h @@ -41,7 +41,7 @@ #define kNatronReadNodeOCIOParamInputSpace "ocioInputSpace" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief A wrapper around all OpenFX Readers nodes so that to the user they all appear under a single Read node that has a dynamic @@ -163,6 +163,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // READNODE_H diff --git a/Engine/RectD.cpp b/Engine/RectD.cpp index 72f362da52..1478d824a7 100644 --- a/Engine/RectD.cpp +++ b/Engine/RectD.cpp @@ -30,7 +30,7 @@ #include "Engine/RectI.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void RectD::toPixelEnclosing(const RenderScale & scale, @@ -56,4 +56,4 @@ RectD::toPixelEnclosing(unsigned int mipMapLevel, rect->y2 = std::ceil(y2 * scale); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/RectD.h b/Engine/RectD.h index a5d7d246c3..5ec27fed54 100644 --- a/Engine/RectD.h +++ b/Engine/RectD.h @@ -44,7 +44,7 @@ GCC_DIAG_OFF(strict-overflow) #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class RectD { @@ -344,7 +344,7 @@ operator!=(const RectD & b1, b1.top() != b2.top(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT Q_DECLARE_METATYPE(NATRON_NAMESPACE::RectD) diff --git a/Engine/RectDSerialization.h b/Engine/RectDSerialization.h index f41bcad986..4ec7a2a63d 100644 --- a/Engine/RectDSerialization.h +++ b/Engine/RectDSerialization.h @@ -41,7 +41,7 @@ GCC_DIAG_ON(unused-parameter) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void @@ -57,6 +57,6 @@ RectD::serialize(Archive & ar, BOOST_SERIALIZATION_ASSUME_ABSTRACT(RectD); -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_RectDSerialization_h diff --git a/Engine/RectI.cpp b/Engine/RectI.cpp index d49a211e66..e6a3c3fba4 100644 --- a/Engine/RectI.cpp +++ b/Engine/RectI.cpp @@ -35,7 +35,7 @@ #define MINAREA256 65536 #define MINAREA MINAREA128 // minimum rectangle area -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /// if splitCount is zero, this function returns a set of less than area()/MINAREA rects which are no smaller than MINAREA std::vector RectI::splitIntoSmallerRects(int splitsCount) const @@ -134,4 +134,4 @@ RectI::toCanonical_noClipping(unsigned int thisLevel, rect->y2 = y2 << thisLevel; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/RectI.h b/Engine/RectI.h index 7f725d3566..f49572b252 100644 --- a/Engine/RectI.h +++ b/Engine/RectI.h @@ -44,7 +44,7 @@ GCC_DIAG_OFF(strict-overflow) #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief A rectangle where x1 < x2 and y1 < y2 such as width() == (x2 - x1) && height() == (y2 - y1) @@ -469,7 +469,7 @@ operator!=(const RectI & b1, return !(b1 == b2); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT Q_DECLARE_METATYPE(NATRON_NAMESPACE::RectI) diff --git a/Engine/RectISerialization.h b/Engine/RectISerialization.h index 1cf829480f..ec36652e6a 100644 --- a/Engine/RectISerialization.h +++ b/Engine/RectISerialization.h @@ -41,7 +41,7 @@ GCC_DIAG_ON(unused-parameter) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template void @@ -55,7 +55,7 @@ RectI::serialize(Archive & ar, ar & ::boost::serialization::make_nvp("Top", y2); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_SERIALIZATION_ASSUME_ABSTRACT(NATRON_NAMESPACE::RectI); diff --git a/Engine/RenderStats.cpp b/Engine/RenderStats.cpp index 19a0cf8cf6..65938d7c07 100644 --- a/Engine/RenderStats.cpp +++ b/Engine/RenderStats.cpp @@ -35,7 +35,7 @@ #include "Engine/RectI.h" #include "Engine/RectD.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct NodeRenderStatsPrivate { @@ -453,4 +453,4 @@ RenderStats::getStats(double *totalTimeSpent) const return ret; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/RenderStats.h b/Engine/RenderStats.h index ccb6f0443b..4340897a6a 100644 --- a/Engine/RenderStats.h +++ b/Engine/RenderStats.h @@ -45,7 +45,7 @@ #include "Engine/RectD.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief Holds render infos for one frame for one node. Not MT-safe: MT-safety is handled by RenderStats. @@ -149,7 +149,7 @@ class RenderStats boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // RENDERSTATS_H diff --git a/Engine/RotoContext.cpp b/Engine/RotoContext.cpp index fb906104ba..88c27682b2 100644 --- a/Engine/RotoContext.cpp +++ b/Engine/RotoContext.cpp @@ -106,7 +106,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #define M_PI 3.14159265358979323846264338327950288 /* pi */ #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ////////////////////////////////////RotoContext//////////////////////////////////// @@ -4781,7 +4781,7 @@ RotoContext::declarePythonFields() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_RotoContext.cpp" diff --git a/Engine/RotoContext.h b/Engine/RotoContext.h index dc81139603..bbe25c7012 100644 --- a/Engine/RotoContext.h +++ b/Engine/RotoContext.h @@ -55,7 +55,7 @@ CLANG_DIAG_ON(deprecated-declarations) //#define NATRON_ROTO_INVERTIBLE //#define NATRON_ROTO_ENABLE_MOTION_BLUR -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //Small RAII class that properly destroys the cairo image upon destruction class CairoImageWrapper @@ -464,6 +464,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_RotoContext_h diff --git a/Engine/RotoContextPrivate.h b/Engine/RotoContextPrivate.h index 0075c06466..a63444cd43 100644 --- a/Engine/RotoContextPrivate.h +++ b/Engine/RotoContextPrivate.h @@ -362,7 +362,7 @@ CLANG_DIAG_ON(uninitialized) "which the shutter opens. The value is an offset in frames to the current frame, e.g: -1 would open the shutter 1 frame before the current frame." -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct RotoFeatherVertex { @@ -2218,6 +2218,6 @@ struct RotoContextPrivate static void applyAndDestroyMask(cairo_t* cr, cairo_pattern_t* mesh); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ROTOCONTEXTPRIVATE_H diff --git a/Engine/RotoContextSerialization.h b/Engine/RotoContextSerialization.h index c096ebb944..9de711bc9a 100644 --- a/Engine/RotoContextSerialization.h +++ b/Engine/RotoContextSerialization.h @@ -53,7 +53,7 @@ GCC_DIAG_ON(unused-parameter) #define ROTO_CTX_REMOVE_COUNTERS 2 #define ROTO_CTX_VERSION ROTO_CTX_REMOVE_COUNTERS -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class RotoContextSerialization { @@ -116,7 +116,7 @@ class RotoContextSerialization bool _featherLink; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::RotoContextSerialization, ROTO_CTX_VERSION) diff --git a/Engine/RotoDrawableItem.cpp b/Engine/RotoDrawableItem.cpp index 961d9717a4..1af64f322f 100644 --- a/Engine/RotoDrawableItem.cpp +++ b/Engine/RotoDrawableItem.cpp @@ -95,7 +95,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #define ROTO_PRESSURE_LEVELS 512 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ////////////////////////////////////RotoDrawableItem//////////////////////////////////// @@ -1516,7 +1516,7 @@ RotoDrawableItem::resetTransformCenter() centerKnob->endChanges(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_RotoDrawableItem.cpp" diff --git a/Engine/RotoDrawableItem.h b/Engine/RotoDrawableItem.h index 6ee62f1d83..e6113b38ae 100644 --- a/Engine/RotoDrawableItem.h +++ b/Engine/RotoDrawableItem.h @@ -50,7 +50,7 @@ CLANG_DIAG_ON(deprecated-declarations) #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @class A base class for all items made by the roto context @@ -252,6 +252,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_RotoDrawableItem_h diff --git a/Engine/RotoDrawableItemSerialization.h b/Engine/RotoDrawableItemSerialization.h index 8ff4ba74b3..c75697742b 100644 --- a/Engine/RotoDrawableItemSerialization.h +++ b/Engine/RotoDrawableItemSerialization.h @@ -55,7 +55,7 @@ GCC_DIAG_ON(unused-parameter) #define ROTO_DRAWABLE_ITEM_CHANGES_TO_LIST 4 #define ROTO_DRAWABLE_ITEM_VERSION ROTO_DRAWABLE_ITEM_CHANGES_TO_LIST -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class RotoDrawableItemSerialization : public RotoItemSerialization @@ -156,7 +156,7 @@ class RotoDrawableItemSerialization double _overlayColor[4]; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::RotoDrawableItemSerialization, ROTO_DRAWABLE_ITEM_VERSION) diff --git a/Engine/RotoItem.cpp b/Engine/RotoItem.cpp index 41a42539d3..c3d7d2c4ad 100644 --- a/Engine/RotoItem.cpp +++ b/Engine/RotoItem.cpp @@ -89,7 +89,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #define M_PI 3.14159265358979323846264338327950288 /* pi */ #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ////////////////////////////////////RotoItem//////////////////////////////////// @@ -580,4 +580,4 @@ RotoItem::getPreviousItemInLayer() const return getPreviousInLayer( layer, shared_from_this() ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/RotoItem.h b/Engine/RotoItem.h index c9661a8c54..395caf12de 100644 --- a/Engine/RotoItem.h +++ b/Engine/RotoItem.h @@ -63,7 +63,7 @@ CLANG_DIAG_ON(deprecated-declarations) #define kRotoPaintDodgeBaseName "Dodge" #define kRotoPaintBurnBaseName "Burn" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct RotoItemPrivate; class RotoItem @@ -190,7 +190,7 @@ class RotoItem boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT Q_DECLARE_METATYPE(NATRON_NAMESPACE::RotoItem*); diff --git a/Engine/RotoItemSerialization.h b/Engine/RotoItemSerialization.h index 12f08a1d83..aa6d071e5c 100644 --- a/Engine/RotoItemSerialization.h +++ b/Engine/RotoItemSerialization.h @@ -52,7 +52,7 @@ GCC_DIAG_ON(unused-parameter) #define ROTO_ITEM_INTRODUCES_LABEL 2 #define ROTO_ITEM_VERSION ROTO_ITEM_INTRODUCES_LABEL -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class RotoItemSerialization { @@ -110,7 +110,7 @@ class RotoItemSerialization bool locked; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::RotoItemSerialization, ROTO_ITEM_VERSION) diff --git a/Engine/RotoLayer.cpp b/Engine/RotoLayer.cpp index 2c4fe2ab2c..f337e7db70 100644 --- a/Engine/RotoLayer.cpp +++ b/Engine/RotoLayer.cpp @@ -90,7 +90,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #define M_PI 3.14159265358979323846264338327950288 /* pi */ #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ////////////////////////////////////Layer//////////////////////////////////// @@ -362,4 +362,4 @@ RotoLayer::getItems_mt_safe() const return _imp->items; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/RotoLayer.h b/Engine/RotoLayer.h index f7031dad90..ae9bf43ce6 100644 --- a/Engine/RotoLayer.h +++ b/Engine/RotoLayer.h @@ -47,7 +47,7 @@ CLANG_DIAG_ON(deprecated-declarations) #include "Engine/RotoItem.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @class A base class for all items made by the roto context @@ -116,6 +116,6 @@ class RotoLayer boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_RotoLayer_h diff --git a/Engine/RotoLayerSerialization.h b/Engine/RotoLayerSerialization.h index c10bbe4b2f..77e0e323c8 100644 --- a/Engine/RotoLayerSerialization.h +++ b/Engine/RotoLayerSerialization.h @@ -55,7 +55,7 @@ GCC_DIAG_ON(unused-parameter) #define ROTO_LAYER_SERIALIZATION_REMOVES_IS_BEZIER 2 #define ROTO_LAYER_SERIALIZATION_VERSION ROTO_LAYER_SERIALIZATION_REMOVES_IS_BEZIER -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class RotoLayerSerialization : public RotoItemSerialization @@ -156,7 +156,7 @@ class RotoLayerSerialization std::list < boost::shared_ptr > children; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::RotoLayerSerialization, ROTO_LAYER_SERIALIZATION_VERSION) diff --git a/Engine/RotoPaint.cpp b/Engine/RotoPaint.cpp index 08cdc71796..2813d02bfb 100644 --- a/Engine/RotoPaint.cpp +++ b/Engine/RotoPaint.cpp @@ -57,7 +57,7 @@ #define ROTOPAINT_VIEWER_UI_SECTIONS_SPACING_PX 5 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER std::string @@ -3307,7 +3307,7 @@ RotoPaint::onSelectionChanged(int reason) } } -NATRON_NAMESPACE_EXIT; -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_EXIT +NATRON_NAMESPACE_USING #include "moc_RotoPaint.cpp" diff --git a/Engine/RotoPaint.h b/Engine/RotoPaint.h index e6abbaa421..d2edc4d353 100644 --- a/Engine/RotoPaint.h +++ b/Engine/RotoPaint.h @@ -35,7 +35,7 @@ #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct RotoPaintPrivate; class RotoPaint @@ -212,6 +212,6 @@ class RotoNode virtual bool isHostChannelSelectorSupported(bool* defaultR, bool* defaultG, bool* defaultB, bool* defaultA) const OVERRIDE WARN_UNUSED_RETURN; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ROTOPAINT_H diff --git a/Engine/RotoPaintInteract.cpp b/Engine/RotoPaintInteract.cpp index 692847a801..1ae93df294 100644 --- a/Engine/RotoPaintInteract.cpp +++ b/Engine/RotoPaintInteract.cpp @@ -42,7 +42,7 @@ #include "Engine/AppInstance.h" #include "Engine/ViewerInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER RotoPaintPrivate::RotoPaintPrivate(RotoPaint* publicInterface, bool isPaintByDefault) @@ -1868,4 +1868,4 @@ RotoPaintInteract::removeCurve(const boost::shared_ptr& curve) getContext()->removeItem(curve); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/RotoPaintInteract.h b/Engine/RotoPaintInteract.h index 04e1057e68..141e3ae723 100644 --- a/Engine/RotoPaintInteract.h +++ b/Engine/RotoPaintInteract.h @@ -41,7 +41,7 @@ #include "Engine/BezierCP.h" #include "Engine/Bezier.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #define kControlPointMidSize 3 @@ -767,6 +767,6 @@ struct RotoPaintInteract void removeCurve(const boost::shared_ptr& curve); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ROTOPAINTINTERACT_H diff --git a/Engine/RotoPoint.h b/Engine/RotoPoint.h index 594fa27dfd..ea1c81b9cc 100644 --- a/Engine/RotoPoint.h +++ b/Engine/RotoPoint.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(deprecated-declarations) #include "Engine/FitCurve.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class RotoPoint { @@ -71,6 +71,6 @@ class RotoPoint double timestamp() const { return _timestamp; } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_RotoPoint_h diff --git a/Engine/RotoSmear.cpp b/Engine/RotoSmear.cpp index 33b3f9dce9..c1c967219b 100644 --- a/Engine/RotoSmear.cpp +++ b/Engine/RotoSmear.cpp @@ -40,7 +40,7 @@ #include "Engine/RotoContext.h" #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct RotoSmearPrivate { @@ -426,4 +426,4 @@ RotoSmear::render(const RenderActionArgs& args) return eStatusOK; } // RotoSmear::render -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/RotoSmear.h b/Engine/RotoSmear.h index 4445e8afb0..7f83d7b425 100644 --- a/Engine/RotoSmear.h +++ b/Engine/RotoSmear.h @@ -35,7 +35,7 @@ #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct RotoSmearPrivate; class RotoSmear @@ -140,6 +140,6 @@ class RotoSmear boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ROTOSMEAR_H diff --git a/Engine/RotoStrokeItem.cpp b/Engine/RotoStrokeItem.cpp index a79b57398c..df99aa6074 100644 --- a/Engine/RotoStrokeItem.cpp +++ b/Engine/RotoStrokeItem.cpp @@ -92,7 +92,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #define M_PI 3.14159265358979323846264338327950288 /* pi */ #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ////////////////////////////////////Stroke////////////////////////////////// @@ -932,5 +932,5 @@ RotoStrokeItem::evaluateStroke(unsigned int mipMapLevel, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/RotoStrokeItem.h b/Engine/RotoStrokeItem.h index ee2de99276..606f3d56f2 100644 --- a/Engine/RotoStrokeItem.h +++ b/Engine/RotoStrokeItem.h @@ -47,7 +47,7 @@ CLANG_DIAG_ON(deprecated-declarations) #include "Engine/RotoDrawableItem.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @class A base class for all items made by the roto context @@ -154,6 +154,6 @@ class RotoStrokeItem boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_RotoStrokeItem_h diff --git a/Engine/RotoStrokeItemSerialization.h b/Engine/RotoStrokeItemSerialization.h index 04aaa165e2..e5705080b9 100644 --- a/Engine/RotoStrokeItemSerialization.h +++ b/Engine/RotoStrokeItemSerialization.h @@ -52,7 +52,7 @@ GCC_DIAG_ON(unused-parameter) #define ROTO_STROKE_INTRODUCES_MULTIPLE_STROKES 2 #define ROTO_STROKE_SERIALIZATION_VERSION ROTO_STROKE_INTRODUCES_MULTIPLE_STROKES -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct StrokePoint { double x, y, pressure; @@ -163,7 +163,7 @@ class RotoStrokeItemSerialization std::list > _xCurves, _yCurves, _pressureCurves; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::RotoStrokeItemSerialization, ROTO_STROKE_SERIALIZATION_VERSION) diff --git a/Engine/RotoUndoCommand.cpp b/Engine/RotoUndoCommand.cpp index dc39a7ad88..ed6825b412 100644 --- a/Engine/RotoUndoCommand.cpp +++ b/Engine/RotoUndoCommand.cpp @@ -50,7 +50,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef boost::shared_ptr CpPtr; typedef std::pair SelectedCp; @@ -1802,4 +1802,4 @@ MakeRectangleUndoCommand::mergeWith(const UndoCommandPtr &other) return true; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/RotoUndoCommand.h b/Engine/RotoUndoCommand.h index 6b84c906a0..9b3aa81cec 100644 --- a/Engine/RotoUndoCommand.h +++ b/Engine/RotoUndoCommand.h @@ -45,7 +45,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/UndoCommand.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct RotoPaintInteract; @@ -558,6 +558,6 @@ class MakeRectangleUndoCommand }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ROTOUNDOCOMMAND_H diff --git a/Engine/ScriptObject.cpp b/Engine/ScriptObject.cpp index 005f7b7818..cbef3c09c0 100644 --- a/Engine/ScriptObject.cpp +++ b/Engine/ScriptObject.cpp @@ -30,7 +30,7 @@ #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ScriptObjectPrivate { @@ -86,4 +86,4 @@ ScriptObject::getScriptName() const return _imp->name; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ScriptObject.h b/Engine/ScriptObject.h index 8f9e99ab4d..0377c4ff43 100644 --- a/Engine/ScriptObject.h +++ b/Engine/ScriptObject.h @@ -35,7 +35,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ScriptObjectPrivate; class ScriptObject @@ -59,6 +59,6 @@ class ScriptObject boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // SCRIPTOBJECT_H diff --git a/Engine/Settings.cpp b/Engine/Settings.cpp index 2f8bf39b95..a17203097f 100644 --- a/Engine/Settings.cpp +++ b/Engine/Settings.cpp @@ -74,7 +74,7 @@ #define NATRON_CUSTOM_HOST_NAME_ENTRY "Custom..." -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER Settings::Settings() : KnobHolder( AppInstPtr() ) // < Settings are process wide and do not belong to a single AppInstance @@ -3702,7 +3702,7 @@ Settings::isDriveLetterToUNCPathConversionEnabled() const return !_enableMappingFromDriveLettersToUNCShareNames->getValue(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_Settings.cpp" diff --git a/Engine/Settings.h b/Engine/Settings.h index 1f35d7b9a5..cc3cd4856a 100644 --- a/Engine/Settings.h +++ b/Engine/Settings.h @@ -40,7 +40,7 @@ #define kQSettingsSoftwareMajorVersionSettingName "SoftwareVersionMajor" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*The current settings in the preferences menu.*/ class Settings @@ -633,6 +633,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON bool _defaultAppearanceOutdated; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_SETTINGS_H diff --git a/Engine/StandardPaths.cpp b/Engine/StandardPaths.cpp index 3a1aea826c..3476950789 100644 --- a/Engine/StandardPaths.cpp +++ b/Engine/StandardPaths.cpp @@ -63,7 +63,7 @@ CLANG_DIAG_ON(deprecated) #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER StandardPaths::StandardPaths() { @@ -661,4 +661,4 @@ StandardPaths::writableLocation(StandardLocationEnum type) #endif // QT_VERSION >= 0x050000 } // writableLocation -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/StandardPaths.h b/Engine/StandardPaths.h index 24dc7d8261..95939f1324 100644 --- a/Engine/StandardPaths.h +++ b/Engine/StandardPaths.h @@ -32,7 +32,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class StandardPaths { @@ -74,6 +74,6 @@ class StandardPaths StandardPaths(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // STANDARDPATHS_H diff --git a/Engine/StringAnimationManager.cpp b/Engine/StringAnimationManager.cpp index b83ca9d94e..67ff4d3f67 100644 --- a/Engine/StringAnimationManager.cpp +++ b/Engine/StringAnimationManager.cpp @@ -36,7 +36,7 @@ #include "Engine/Knob.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -345,4 +345,4 @@ StringAnimationManager::save(std::map* keyframes) const } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/StringAnimationManager.h b/Engine/StringAnimationManager.h index d0844fbe98..ddd58d24ca 100644 --- a/Engine/StringAnimationManager.h +++ b/Engine/StringAnimationManager.h @@ -37,7 +37,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct StringAnimationManagerPrivate; @@ -83,6 +83,6 @@ class StringAnimationManager boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // STRINGANIMATIONMANAGER_H diff --git a/Engine/TLSHolder.cpp b/Engine/TLSHolder.cpp index 8609ab2b4a..7af2f4eb46 100644 --- a/Engine/TLSHolder.cpp +++ b/Engine/TLSHolder.cpp @@ -38,7 +38,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER AppTLS::AppTLS() @@ -195,5 +195,5 @@ template class TLSHolder; template class TLSHolder; template class TLSHolder; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/TLSHolder.h b/Engine/TLSHolder.h index 76f0d25796..366ef537d9 100644 --- a/Engine/TLSHolder.h +++ b/Engine/TLSHolder.h @@ -46,7 +46,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ///This must be stored as a shared_ptr class TLSHolderBase @@ -210,6 +210,6 @@ class TLSHolder mutable ThreadDataMap perThreadData; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TLSHOLDER_H diff --git a/Engine/TLSHolderImpl.h b/Engine/TLSHolderImpl.h index e248d91cf0..7abd2ebe86 100644 --- a/Engine/TLSHolderImpl.h +++ b/Engine/TLSHolderImpl.h @@ -32,7 +32,7 @@ #include "Engine/AppManager.h" #include "Engine/EffectInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //Template specialization for EffectInstance::EffectTLSData: //We do this for the following reasons: @@ -283,6 +283,6 @@ AppTLS::copyTLSFromSpawnerThreadInternal(const TLSHolderBase* holder, return tls; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_TLSHolderImpl_h diff --git a/Engine/Texture.cpp b/Engine/Texture.cpp index c25c55a74b..35569a16c5 100644 --- a/Engine/Texture.cpp +++ b/Engine/Texture.cpp @@ -26,7 +26,7 @@ #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER Texture::Texture(U32 target, int minFilter, @@ -148,4 +148,4 @@ Texture::~Texture() glDeleteTextures(1, &_texID); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Texture.h b/Engine/Texture.h index 7633862a58..c075ac72da 100644 --- a/Engine/Texture.h +++ b/Engine/Texture.h @@ -33,7 +33,7 @@ #include "Engine/EngineFwd.h" #include "Global/GLIncludes.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class Texture { @@ -169,6 +169,6 @@ class Texture DataTypeEnum _type; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif /* defined(NATRON_GUI_TEXTURE_H_) */ diff --git a/Engine/TextureRect.cpp b/Engine/TextureRect.cpp index 1d30d14785..cbd994c944 100644 --- a/Engine/TextureRect.cpp +++ b/Engine/TextureRect.cpp @@ -30,7 +30,7 @@ #include "Engine/RectI.h" #include "Engine/RectD.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER TextureRect::TextureRect() : RectI() @@ -60,4 +60,4 @@ TextureRect::reset() } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/TextureRect.h b/Engine/TextureRect.h index 9fa0cd077d..8696845ce5 100644 --- a/Engine/TextureRect.h +++ b/Engine/TextureRect.h @@ -32,7 +32,7 @@ #include "Engine/RectI.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** @class This class describes the rectangle (or portion) of an image that is contained * into a texture. x1,y1,x2,y2 are respectivly the image coordinates of the left,bottom,right,top @@ -79,6 +79,6 @@ operator!=(const TextureRect & first, return !(first == second); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_TEXTURERECT_H diff --git a/Engine/ThreadPool.cpp b/Engine/ThreadPool.cpp index 06c9b5eb15..6642004987 100644 --- a/Engine/ThreadPool.cpp +++ b/Engine/ThreadPool.cpp @@ -35,7 +35,7 @@ #include "Engine/AbortableRenderInfo.h" #include "Engine/Node.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct AbortableThreadPrivate @@ -220,5 +220,5 @@ ThreadPool::createThreadPoolThread() const #endif // ifdef QT_CUSTOM_THREADPOOL -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/ThreadPool.h b/Engine/ThreadPool.h index bd3f7c81d5..9875d2edf7 100644 --- a/Engine/ThreadPool.h +++ b/Engine/ThreadPool.h @@ -36,7 +36,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** @@ -134,6 +134,6 @@ class ThreadPool #endif // QT_CUSTOM_THREADPOOL -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Natron_Engine_ThreadPool_h diff --git a/Engine/ThreadStorage.h b/Engine/ThreadStorage.h index 9796819b1e..6bca6a3c7a 100644 --- a/Engine/ThreadStorage.h +++ b/Engine/ThreadStorage.h @@ -39,7 +39,7 @@ // // Of course, as a consequence the main thread always has "local data", which is just a global variable. -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template class ThreadStorage : public QThreadStorage @@ -89,7 +89,7 @@ class ThreadStorage T mainData; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef Natron_Engine_ThreadStorage_h diff --git a/Engine/TimeLine.cpp b/Engine/TimeLine.cpp index b049d56fe8..53e0cdb1ea 100644 --- a/Engine/TimeLine.cpp +++ b/Engine/TimeLine.cpp @@ -37,7 +37,7 @@ #include "Engine/Node.h" #include "Engine/EffectInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER TimeLine::TimeLine(Project* project) : _project(project) @@ -123,7 +123,7 @@ TimeLine::onFrameChanged(SequenceTime frame) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_TimeLine.cpp" diff --git a/Engine/TimeLine.h b/Engine/TimeLine.h index 12d7a291fd..140417868e 100644 --- a/Engine/TimeLine.h +++ b/Engine/TimeLine.h @@ -38,7 +38,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief A simple TimeLine representing the time for image sequences. @@ -91,6 +91,6 @@ public Q_SLOTS: SequenceTime _currentFrame; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif /* defined(NATRON_ENGINE_TIMELINE_H_) */ diff --git a/Engine/TimeLineKeyFrames.h b/Engine/TimeLineKeyFrames.h index ff03d1c9d5..5a20a24410 100644 --- a/Engine/TimeLineKeyFrames.h +++ b/Engine/TimeLineKeyFrames.h @@ -30,7 +30,7 @@ #include "Global/GlobalDefines.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief An interface to implement to manage keyframes that are to be displayed on the timeline @@ -44,6 +44,10 @@ class TimeLineKeyFrames { } + virtual ~TimeLineKeyFrames() + { + } + /* * @brief Clear all indicators */ @@ -132,6 +136,6 @@ class TimeLineKeyFrames virtual void getUserKeyframes(std::list* /*keys*/) const { } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TIMELINEKEYFRAMES_H diff --git a/Engine/Timer.cpp b/Engine/Timer.cpp index 494ba9d93d..237a90e8cb 100644 --- a/Engine/Timer.cpp +++ b/Engine/Timer.cpp @@ -37,7 +37,7 @@ #define NATRON_FPS_REFRESH_RATE_SECONDS 1.5 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #if defined(__NATRON_WIN32__) && !defined(__NATRON_MINGW__) int @@ -337,7 +337,7 @@ TimeLapseReporter::~TimeLapseReporter() std::cout << message << ' ' << dt << std::endl; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_Timer.cpp" diff --git a/Engine/Timer.h b/Engine/Timer.h index f366a79409..4f156b21b0 100644 --- a/Engine/Timer.h +++ b/Engine/Timer.h @@ -45,7 +45,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #if defined(__NATRON_WIN32__) && !defined(__NATRON_MINGW__) int gettimeofday (struct timeval *tv, void *tz); @@ -162,6 +162,6 @@ class TimeLapseReporter ~TimeLapseReporter(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef NATRON_ENGINE_TIMER_H diff --git a/Engine/TrackMarker.cpp b/Engine/TrackMarker.cpp index b74288979d..3bda09c286 100644 --- a/Engine/TrackMarker.cpp +++ b/Engine/TrackMarker.cpp @@ -57,7 +57,7 @@ #define kTrackerPMParamTrackingCenterPoint "center" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -1396,7 +1396,7 @@ TrackMarkerPM::initializeKnobs() } // TrackMarkerPM::initializeKnobs -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_TrackMarker.cpp" diff --git a/Engine/TrackMarker.h b/Engine/TrackMarker.h index d95984a740..702af9b6ec 100644 --- a/Engine/TrackMarker.h +++ b/Engine/TrackMarker.h @@ -96,7 +96,7 @@ #define kTrackerParamEnabledHint "When checked, this track data will be used to generate the resulting Transform/CornerPin out of the tracker. You can animate this parameter to control the lifetime of the track." //#define NATRON_TRACK_MARKER_USE_WEIGHT -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct TrackMarkerPrivate; class TrackMarker @@ -285,7 +285,7 @@ public Q_SLOTS: virtual void initializeKnobs() OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_TrackMarker_h diff --git a/Engine/TrackerContext.cpp b/Engine/TrackerContext.cpp index 64c45ea8c2..6762a9409e 100644 --- a/Engine/TrackerContext.cpp +++ b/Engine/TrackerContext.cpp @@ -53,7 +53,7 @@ CLANG_DIAG_ON(uninitialized) #define NATRON_TRACKER_REPORT_PROGRESS_DELTA_MS 200 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -2002,7 +2002,7 @@ TrackScheduler::doRenderCurrentFrameForViewer(ViewerInstance* viewer) viewer->renderCurrentFrame(true); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_TrackerContext.cpp" diff --git a/Engine/TrackerContext.h b/Engine/TrackerContext.h index 48374e5864..7f4ab25c28 100644 --- a/Engine/TrackerContext.h +++ b/Engine/TrackerContext.h @@ -55,7 +55,7 @@ class AutoTrack; } -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class TrackerParamsProvider { @@ -546,6 +546,6 @@ private Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TRACKERCONTEXT_H diff --git a/Engine/TrackerContextPrivate.cpp b/Engine/TrackerContextPrivate.cpp index b9d7f18b4d..2445bce2de 100644 --- a/Engine/TrackerContextPrivate.cpp +++ b/Engine/TrackerContextPrivate.cpp @@ -46,7 +46,7 @@ #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief Creates a duplicate of the knob identified by knobName which is a knob in the internalNode onto the effect and add it to the given page. @@ -2649,6 +2649,6 @@ TrackerContextPrivate::setTransformOutOfDate(bool outdated) transformOutOfDateLabel.lock()->setSecret(!outdated); } -NATRON_NAMESPACE_EXIT; -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_EXIT +NATRON_NAMESPACE_USING #include "moc_TrackerContextPrivate.cpp" diff --git a/Engine/TrackerContextPrivate.h b/Engine/TrackerContextPrivate.h index 8140f1cc99..7b6a303c7f 100644 --- a/Engine/TrackerContextPrivate.h +++ b/Engine/TrackerContextPrivate.h @@ -322,7 +322,7 @@ GCC_DIAG_ON(maybe-uninitialized) #define kCornerPinParamMatrix "transform" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER enum TrackerMotionTypeEnum @@ -687,6 +687,6 @@ public Q_SLOTS: void onTransformSolverWatcherProgress(int progress); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TRACKERCONTEXTPRIVATE_H diff --git a/Engine/TrackerFrameAccessor.cpp b/Engine/TrackerFrameAccessor.cpp index a79b0dd496..73ea3dd099 100644 --- a/Engine/TrackerFrameAccessor.cpp +++ b/Engine/TrackerFrameAccessor.cpp @@ -43,7 +43,7 @@ GCC_DIAG_ON(unused-parameter) #include "Engine/Node.h" #include "Engine/TrackerContext.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace { struct FrameAccessorCacheKey @@ -481,4 +481,4 @@ TrackerFrameAccessor::NumFrames(int /*clip*/) return 0; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/TrackerFrameAccessor.h b/Engine/TrackerFrameAccessor.h index 1565f570fb..aa4228baf7 100644 --- a/Engine/TrackerFrameAccessor.h +++ b/Engine/TrackerFrameAccessor.h @@ -36,7 +36,7 @@ #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct TrackerFrameAccessorPrivate; class TrackerFrameAccessor @@ -83,5 +83,5 @@ class TrackerFrameAccessor boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TRACKERFRAMEACCESSOR_H diff --git a/Engine/TrackerNode.cpp b/Engine/TrackerNode.cpp index 83a139c77e..be272d62ab 100644 --- a/Engine/TrackerNode.cpp +++ b/Engine/TrackerNode.cpp @@ -41,7 +41,7 @@ #define NATRON_TRACKER_UI_BUTTONS_CATEGORIES_SPACING 10 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER TrackerNode::TrackerNode(boost::shared_ptr node) @@ -2462,7 +2462,7 @@ TrackerNode::refreshExtraStateAfterTimeChanged(bool isPlayback, } } -NATRON_NAMESPACE_EXIT; -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_EXIT +NATRON_NAMESPACE_USING #include "moc_TrackerNode.cpp" diff --git a/Engine/TrackerNode.h b/Engine/TrackerNode.h index c2f7ade2df..8680f35823 100644 --- a/Engine/TrackerNode.h +++ b/Engine/TrackerNode.h @@ -30,7 +30,7 @@ #include "Engine/NodeGroup.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct TrackerNodePrivate; class TrackerNode @@ -166,6 +166,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TRACKERNODE_H diff --git a/Engine/TrackerNodeInteract.cpp b/Engine/TrackerNodeInteract.cpp index 98f65a145d..322fbc6dcd 100644 --- a/Engine/TrackerNodeInteract.cpp +++ b/Engine/TrackerNodeInteract.cpp @@ -42,7 +42,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #include "Engine/TrackMarker.h" #include "Engine/ViewerInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER TrackerNodePrivate::TrackerNodePrivate(TrackerNode* publicInterface) : publicInterface(publicInterface) @@ -1810,6 +1810,6 @@ TrackerNodeInteract::onAllKeyframesRemovedOnTrack(const TrackMarkerPtr& marker) _p->publicInterface->redrawOverlayInteract(); } -NATRON_NAMESPACE_EXIT; -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_EXIT +NATRON_NAMESPACE_USING #include "moc_TrackerNodeInteract.cpp" diff --git a/Engine/TrackerNodeInteract.h b/Engine/TrackerNodeInteract.h index 236a14f867..808176a397 100644 --- a/Engine/TrackerNodeInteract.h +++ b/Engine/TrackerNodeInteract.h @@ -188,7 +188,7 @@ #define kTrackerUIParamTrackRangeDialogCancelButtonLabel "Cancel" #define kTrackerUIParamTrackRangeDialogCancelButtonHint "Close this window and do not start tracking" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER enum TrackerMouseStateEnum @@ -510,6 +510,6 @@ public Q_SLOTS: void onKeyFrameImageRenderingFinished(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TRACKERNODEINTERACT_H diff --git a/Engine/TrackerSerialization.h b/Engine/TrackerSerialization.h index 232d757fc9..9ca2914848 100644 --- a/Engine/TrackerSerialization.h +++ b/Engine/TrackerSerialization.h @@ -47,7 +47,7 @@ GCC_DIAG_ON(unused-parameter) #define TRACK_SERIALIZATION_VERSION TRACK_SERIALIZATION_ADD_TRACKER_PM #define TRACKER_CONTEXT_SERIALIZATION_VERSION 1 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class TrackSerialization { @@ -180,7 +180,7 @@ class TrackerContextSerialization std::list _tracks; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::TrackSerialization, TRACK_SERIALIZATION_VERSION) BOOST_CLASS_VERSION(NATRON_NAMESPACE::TrackerContextSerialization, TRACKER_CONTEXT_SERIALIZATION_VERSION) diff --git a/Engine/TrackerUndoCommand.cpp b/Engine/TrackerUndoCommand.cpp index c6755bd7dc..cc04a235ca 100644 --- a/Engine/TrackerUndoCommand.cpp +++ b/Engine/TrackerUndoCommand.cpp @@ -29,7 +29,7 @@ #include "Engine/AppInstance.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER AddTrackCommand::AddTrackCommand(const TrackMarkerPtr &marker, const boost::shared_ptr& context) @@ -149,4 +149,4 @@ RemoveTracksCommand::redo() context->getNode()->getApp()->triggerAutoSave(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/TrackerUndoCommand.h b/Engine/TrackerUndoCommand.h index 9a5d176f43..786fe58307 100644 --- a/Engine/TrackerUndoCommand.h +++ b/Engine/TrackerUndoCommand.h @@ -45,7 +45,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/UndoCommand.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class AddTrackCommand : public UndoCommand @@ -95,7 +95,7 @@ class RemoveTracksCommand boost::weak_ptr _context; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TRACKERUNDOCOMMAND_H diff --git a/Engine/Transform.cpp b/Engine/Transform.cpp index 1acb9fce33..49e4814082 100644 --- a/Engine/Transform.cpp +++ b/Engine/Transform.cpp @@ -38,7 +38,7 @@ #include "Engine/RectD.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace Transform { Point3D::Point3D() : x(0), y(0), z(0) @@ -777,6 +777,6 @@ transformRegionFromRoD(const RectD &srcRect, transformRegionFromPoints(p, dstRect); } } //namespace Transform -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Transform.h b/Engine/Transform.h index af0951fa67..d5039f117c 100644 --- a/Engine/Transform.h +++ b/Engine/Transform.h @@ -36,7 +36,7 @@ #define M_PI 3.14159265358979323846264338327950288 /* pi */ #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace Transform { inline double toDegrees(double rad) @@ -284,6 +284,6 @@ void transformRegionFromRoD(const RectD &srcRect, const Matrix3x3 &transform, Re // Matrix4x4 matrix4x4FromMatrix3x3(const Matrix3x3& m); } // namespace Transform -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TRANSFORM_H diff --git a/Engine/UndoCommand.h b/Engine/UndoCommand.h index e6c7984d87..f8df0cbd21 100644 --- a/Engine/UndoCommand.h +++ b/Engine/UndoCommand.h @@ -32,7 +32,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class UndoCommand { @@ -76,6 +76,6 @@ class UndoCommand } }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // UNDOCOMMAND_H diff --git a/Engine/UpdateViewerParams.h b/Engine/UpdateViewerParams.h index c1a8dd3925..05deb192e8 100644 --- a/Engine/UpdateViewerParams.h +++ b/Engine/UpdateViewerParams.h @@ -41,7 +41,7 @@ #include "Engine/TextureRect.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /// parameters send from the scheduler thread to updateViewer() (which runs in the main thread) class UpdateViewerParams @@ -162,7 +162,7 @@ class UpdateViewerParams }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef Natron_Engine_UpdateViewerParams_h diff --git a/Engine/Utils.cpp b/Engine/Utils.cpp index fa24566004..ca25a3f3d2 100644 --- a/Engine/Utils.cpp +++ b/Engine/Utils.cpp @@ -30,7 +30,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*! \fn QString NATRON_NAMESPACE::convertFromPlainText(const QString &plain, WhiteSpaceMode mode) @@ -202,4 +202,4 @@ convertFromPlainTextToMarkdown(const QString &plain_, bool genHTML, bool isTable return escaped; } // convertFromPlainText -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Engine/Utils.h b/Engine/Utils.h index f2d475e57e..1cfcd6c0f3 100644 --- a/Engine/Utils.h +++ b/Engine/Utils.h @@ -30,7 +30,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // same as Qt::WhiteSpaceMode enum WhiteSpaceMode { @@ -45,6 +45,6 @@ QString convertFromPlainText(const QString &plain, NATRON_NAMESPACE::WhiteSpaceM // use genHTML=true when generating markdown for hoedown. false for pandoc QString convertFromPlainTextToMarkdown(const QString &plain, bool genHTML, bool isTableElement); -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Natron_Gui_Utils_h diff --git a/Engine/Variant.h b/Engine/Variant.h index f5adcc334e..fa774347b9 100644 --- a/Engine/Variant.h +++ b/Engine/Variant.h @@ -38,7 +38,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class Variant : public QVariant @@ -213,7 +213,7 @@ Variant::setValue(const char* const & str) QVariant::setValue( QString::fromUtf8(str) ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT Q_DECLARE_METATYPE(NATRON_NAMESPACE::Variant); diff --git a/Engine/ViewIdx.h b/Engine/ViewIdx.h index 3f1bb13f55..4ab46b8a68 100644 --- a/Engine/ViewIdx.h +++ b/Engine/ViewIdx.h @@ -31,7 +31,7 @@ #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class ViewSpec { @@ -107,6 +107,6 @@ class ViewIdx static ViewIdx current(); // overload with no implementation }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_ViewIdx_h diff --git a/Engine/ViewerInstance.cpp b/Engine/ViewerInstance.cpp index ed7734cbc5..b7856237fd 100644 --- a/Engine/ViewerInstance.cpp +++ b/Engine/ViewerInstance.cpp @@ -78,7 +78,7 @@ CLANG_DIAG_ON(deprecated) #define NATRON_TIME_ELASPED_BEFORE_PROGRESS_REPORT 4. //!< do not display the progress report if estimated total time is less than this (in seconds) -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; using boost::shared_ptr; @@ -3516,8 +3516,8 @@ ViewerInstance::reportStats(int time, Q_EMIT renderStatsAvailable(time, view, wallTime, stats); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ViewerInstance.cpp" #include "moc_ViewerInstancePrivate.cpp" diff --git a/Engine/ViewerInstance.h b/Engine/ViewerInstance.h index a03ab84683..923985f715 100644 --- a/Engine/ViewerInstance.h +++ b/Engine/ViewerInstance.h @@ -38,7 +38,7 @@ #include "Engine/ViewIdx.h" #include "Engine/EngineFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class UpdateViewerParams; // ViewerInstancePrivate @@ -445,6 +445,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_ENGINE_VIEWERNODE_H diff --git a/Engine/ViewerInstancePrivate.h b/Engine/ViewerInstancePrivate.h index 55fa48be23..fac4a006af 100644 --- a/Engine/ViewerInstancePrivate.h +++ b/Engine/ViewerInstancePrivate.h @@ -53,7 +53,7 @@ #define GAMMA_LUT_NB_VALUES 1023 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct AbortableRenderInfo_CompareAge @@ -425,7 +425,7 @@ public Q_SLOTS: OnGoingRenders currentRenderAges[2]; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef Natron_Engine_ViewerInstancePrivate_h diff --git a/Engine/WriteNode.cpp b/Engine/WriteNode.cpp index 06661d1161..dff87edcb1 100644 --- a/Engine/WriteNode.cpp +++ b/Engine/WriteNode.cpp @@ -73,7 +73,7 @@ CLANG_DIAG_ON(uninitialized) #define WRITE_NODE_DEFAULT_WRITER PLUGINID_OFX_WRITEOIIO #define kPluginSelectorParamEntryDefault "Default" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //Generic Writer #define kParamFilename kOfxImageEffectFileParamName @@ -1289,7 +1289,7 @@ WriteNode::onSequenceRenderFinished() } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_WriteNode.cpp" diff --git a/Engine/WriteNode.h b/Engine/WriteNode.h index 73fe11e979..0a5877c4fd 100644 --- a/Engine/WriteNode.h +++ b/Engine/WriteNode.h @@ -48,7 +48,7 @@ #define kNatronWriteParamReadBackLabel "Read back file" #define kNatronWriteParamReadBackHint "When checked, the output of this node comes from reading the written file instead of the input node" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief A wrapper around all OpenFX Writers nodes so that to the user they all appear under a single Write node that has a dynamic @@ -128,6 +128,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Engine_WriteNode_h diff --git a/Engine/fstream_mingw.h b/Engine/fstream_mingw.h index 6b5d1884b1..bdc632a7b3 100644 --- a/Engine/fstream_mingw.h +++ b/Engine/fstream_mingw.h @@ -39,7 +39,7 @@ #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER template > @@ -337,7 +337,7 @@ basic_ofstream<_CharT, _Traits>::close() // basic_fstream -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // #if defined(_WIN32) && defined(__GLIBCXX__) diff --git a/Global/Enums.h b/Global/Enums.h index c6b20e4847..45cccfc1ea 100644 --- a/Global/Enums.h +++ b/Global/Enums.h @@ -26,10 +26,10 @@ CLANG_DIAG_OFF(deprecated) #include CLANG_DIAG_ON(deprecated) -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #ifdef SBK_RUN // shiboken doesn't generate SbkNatronEngine_StandardButtonEnum_as_number unless it is put in a class or namespace -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT namespace NATRON_NAMESPACE { #endif @@ -685,11 +685,11 @@ Q_DECLARE_FLAGS(StandardButtons, StandardButtonEnum) #ifdef SBK_RUN } -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #endif -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT Q_DECLARE_METATYPE(NATRON_NAMESPACE::StandardButtons) diff --git a/Global/GlobalDefines.h b/Global/GlobalDefines.h index da34c51825..18a0c7c8ab 100644 --- a/Global/GlobalDefines.h +++ b/Global/GlobalDefines.h @@ -68,7 +68,7 @@ typedef boost::uint8_t U8; typedef boost::uint16_t U16; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef int SequenceTime; @@ -150,7 +150,7 @@ typedef OfxRangeD RangeD; #define NATRON_PY_VERSION_STRING_NO_DOT PY_VERSION_STRINGIZE_NO_DOT(PY_MAJOR_VERSION, PY_MINOR_VERSION) -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT Q_DECLARE_METATYPE(NATRON_NAMESPACE::SequenceTime) diff --git a/Global/KeySymbols.h b/Global/KeySymbols.h index 0011b4651d..479c4db07a 100644 --- a/Global/KeySymbols.h +++ b/Global/KeySymbols.h @@ -21,7 +21,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER enum Key { Key_Unknown = kOfxKey_Unknown, @@ -421,6 +421,6 @@ enum KeyboardModifierEnum typedef QFlags KeyboardModifiers; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // KEYSYMBOLS_H diff --git a/Global/Macros.h b/Global/Macros.h index 99297563fd..9b19ab4804 100644 --- a/Global/Macros.h +++ b/Global/Macros.h @@ -303,7 +303,126 @@ NATRON_VERSION_STRINGIZE__(major, minor) # define WARN(exp) ("WARNING: " exp) #endif +#if defined(__clang__) +#define CLANG_PRAGMA(PRAGMA) _Pragma(PRAGMA) +#else +#define CLANG_PRAGMA(PRAGMA) +#endif + +// Warning control from https://svn.boost.org/trac/boost/wiki/Guidelines/WarningsGuidelines +#if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 402 +#define GCC_DIAG_STR(s) # s +#define GCC_DIAG_JOINSTR(x, y) GCC_DIAG_STR(x ## y) +# define GCC_DIAG_DO_PRAGMA(x) _Pragma ( # x) +# define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x) +# if defined(__clang__) || ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 406 +# define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \ +GCC_DIAG_PRAGMA( ignored GCC_DIAG_JOINSTR(-W, x) ) +# define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop) +# define GCC_DIAG_PEDANTIC_OFF GCC_DIAG_PRAGMA(push) \ +GCC_DIAG_PRAGMA( ignored GCC_DIAG_PEDANTIC ) +# define GCC_DIAG_PEDANTIC_ON GCC_DIAG_PRAGMA(pop) +# else +# define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA( ignored GCC_DIAG_JOINSTR(-W, x) ) +# define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA( warning GCC_DIAG_JOINSTR(-W, x) ) +# define GCC_DIAG_PEDANTIC_OFF GCC_DIAG_PRAGMA( ignored GCC_DIAG_PEDANTIC ) +# define GCC_DIAG_PEDANTIC_ON GCC_DIAG_PRAGMA( warning GCC_DIAG_PEDANTIC ) +# endif +#else +# define GCC_DIAG_OFF(x) +# define GCC_DIAG_ON(x) +# define GCC_DIAG_PEDANTIC_OFF +# define GCC_DIAG_PEDANTIC_ON +#endif + +#ifdef __clang__ +# define CLANG_DIAG_STR(s) # s +// stringize s to "no-unused-variable" +# define CLANG_DIAG_JOINSTR(x, y) CLANG_DIAG_STR(x ## y) +// join -W with no-unused-variable to "-Wno-unused-variable" +# define CLANG_DIAG_DO_PRAGMA(x) _Pragma ( # x) +// _Pragma is unary operator #pragma ("") +# define CLANG_DIAG_PRAGMA(x) CLANG_DIAG_DO_PRAGMA(clang diagnostic x) +# define CLANG_DIAG_OFF(x) CLANG_DIAG_PRAGMA(push) \ +CLANG_DIAG_PRAGMA( ignored CLANG_DIAG_JOINSTR(-W, x) ) +// For example: #pragma clang diagnostic ignored "-Wno-unused-variable" +# define CLANG_DIAG_ON(x) CLANG_DIAG_PRAGMA(pop) +// For example: #pragma clang diagnostic warning "-Wno-unused-variable" +# define GCC_DIAG_PEDANTIC "-Wpedantic" +#else // Ensure these macros so nothing for other compilers. +# define CLANG_DIAG_OFF(x) +# define CLANG_DIAG_ON(x) +# define CLANG_DIAG_PRAGMA(x) +# define GCC_DIAG_PEDANTIC "-pedantic" +#endif + + +/* Usage: + CLANG_DIAG_OFF(unused-variable) + CLANG_DIAG_OFF(unused-parameter) + CLANG_DIAG_OFF(uninitialized) + */ + + +#ifndef __has_warning // Optional of course. +#define __has_warning(x) 0 // Compatibility with non-clang compilers. +#endif + +#if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 408 +// -Wunused-local-typedefs appeared with GCC 4.8 +# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF GCC_DIAG_OFF(unused-local-typedefs) +# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-local-typedefs) +#else +#if __has_warning("-Wunused-local-typedef") // both unused-local-typedefs and unused-local-typedef should be available +# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF CLANG_DIAG_OFF(unused-local-typedef) +# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON CLANG_DIAG_ON(unused-local-typedef) +#elif __has_warning("-Wunused-local-typedefs") +# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF CLANG_DIAG_OFF(unused-local-typedefs) +# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON CLANG_DIAG_ON(unused-local-typedefs) +#else +# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF +# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON +#endif +#endif + +//#if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 408 +//// -Wunused-private-field appeared with GCC 4.8 +//# define GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF GCC_DIAG_OFF(unused-private-field) +//# define GCC_DIAG_UNUSED_PRIVATE_FIELD_ON GCC_DIAG_ON(unused-private-field) +//#else +#if __has_warning("-Wunused-private-field") +# define GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF CLANG_DIAG_OFF(unused-private-field) +# define GCC_DIAG_UNUSED_PRIVATE_FIELD_ON CLANG_DIAG_ON(unused-private-field) +#else +# define GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF +# define GCC_DIAG_UNUSED_PRIVATE_FIELD_ON +#endif +//#endif + +#if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 510 +// -Wsuggest-override appeared with GCC 5.1 +# define GCC_DIAG_SUGGEST_OVERRIDE_OFF GCC_DIAG_OFF(suggest-override) +# define GCC_DIAG_SUGGEST_OVERRIDE_ON GCC_DIAG_ON(suggest-override) +#else +#if __has_warning("-Winconsistent-missing-override") +# define GCC_DIAG_SUGGEST_OVERRIDE_OFF CLANG_DIAG_OFF(inconsistent-missing-override) +# define GCC_DIAG_SUGGEST_OVERRIDE_ON CLANG_DIAG_ON(inconsistent-missing-override) +#else +# define GCC_DIAG_SUGGEST_OVERRIDE_OFF +# define GCC_DIAG_SUGGEST_OVERRIDE_ON +#endif +#endif + +// silence warnings from the COMPILER() COMPILER_SUPPORTS() and COMPILER_QUIRK() macros below +#if __has_warning("-Wexpansion-to-defined") +CLANG_DIAG_OFF(expansion-to-defined) +#endif + + +///////////////////////////////////////////////////////////////////////////////////////////// // The following was grabbed from WTF/wtf/Compiler.h (where WTF was replaced by NATRON) +// see https://trac.webkit.org/browser/webkit/trunk/Source/WTF/wtf/Compiler.h?format=txt +///////////////////////////////////////////////////////////////////////////////////////////// /* COMPILER() - the compiler being used to build the project */ #define COMPILER(NATRON_FEATURE) (defined NATRON_COMPILER_ ## NATRON_FEATURE && NATRON_COMPILER_ ## NATRON_FEATURE) @@ -314,375 +433,428 @@ NATRON_VERSION_STRINGIZE__(major, minor) /* COMPILER_QUIRK() - whether the compiler being used to build the project requires a given quirk. */ #define COMPILER_QUIRK(NATRON_COMPILER_QUIRK) (defined NATRON_COMPILER_QUIRK_ ## NATRON_COMPILER_QUIRK && NATRON_COMPILER_QUIRK_ ## NATRON_COMPILER_QUIRK) -/* ==== COMPILER() - the compiler being used to build the project ==== */ +/* COMPILER_HAS_CLANG_HEATURE() - whether the compiler supports a particular language or library feature. */ +/* http://clang.llvm.org/docs/LanguageExtensions.html#has-feature-and-has-extension */ +#ifdef __has_feature +#define COMPILER_HAS_CLANG_FEATURE(x) __has_feature(x) +#else +#define COMPILER_HAS_CLANG_FEATURE(x) 0 +#endif + +/* COMPILER_HAS_CLANG_DECLSPEC() - whether the compiler supports a Microsoft style __declspec attribute. */ +/* https://clang.llvm.org/docs/LanguageExtensions.html#has-declspec-attribute */ +#ifdef __has_declspec_attribute +#define COMPILER_HAS_CLANG_DECLSPEC(x) __has_declspec_attribute(x) +#else +#define COMPILER_HAS_CLANG_DECLSPEC(x) 0 +#endif + +/* ==== COMPILER() - primary detection of the compiler being used to build the project, in alphabetical order ==== */ /* COMPILER(CLANG) - Clang */ + #if defined(__clang__) #define NATRON_COMPILER_CLANG 1 +#define NATRON_COMPILER_SUPPORTS_BLOCKS COMPILER_HAS_CLANG_FEATURE(blocks) +#define NATRON_COMPILER_SUPPORTS_C_STATIC_ASSERT COMPILER_HAS_CLANG_FEATURE(c_static_assert) +#define NATRON_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS COMPILER_HAS_CLANG_FEATURE(cxx_reference_qualified_functions) +#define NATRON_COMPILER_SUPPORTS_CXX_EXCEPTIONS COMPILER_HAS_CLANG_FEATURE(cxx_exceptions) +#define NATRON_COMPILER_SUPPORTS_BUILTIN_IS_TRIVIALLY_COPYABLE COMPILER_HAS_CLANG_FEATURE(is_trivially_copyable) -#ifndef __has_extension -#define __has_extension __has_feature /* Compatibility with older versions of clang */ +#ifdef __cplusplus +#if __cplusplus <= 201103L +#define NATRON_CPP_STD_VER 11 +#elif __cplusplus <= 201402L +#define NATRON_CPP_STD_VER 14 +#endif #endif -#define CLANG_PRAGMA(PRAGMA) _Pragma(PRAGMA) +#endif // defined(__clang__) -/* Specific compiler features */ -#define NATRON_COMPILER_SUPPORTS_CXX_VARIADIC_TEMPLATES __has_extension(cxx_variadic_templates) +/* COMPILER(GCC_OR_CLANG) - GNU Compiler Collection or Clang */ +#if defined(__GNUC__) +#define NATRON_COMPILER_GCC_OR_CLANG 1 +#endif -/* There is a bug in clang that comes with Xcode 4.2 where AtomicStrings can't be implicitly converted to Strings - in the presence of move constructors and/or move assignment operators. This bug has been fixed in Xcode 4.3 clang, so we - check for both cxx_rvalue_references as well as the unrelated cxx_nonstatic_member_init feature which we know was added in 4.3 */ -#define NATRON_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES __has_extension(cxx_rvalue_references) && __has_extension(cxx_nonstatic_member_init) +/* COMPILER(GCC) - GNU Compiler Collection */ +/* Note: This section must come after the Clang section since we check !COMPILER(CLANG) here. */ +#if COMPILER(GCC_OR_CLANG) && !COMPILER(CLANG) +#define NATRON_COMPILER_GCC 1 +#define NATRON_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS 1 -#define NATRON_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS __has_extension(cxx_deleted_functions) -#define NATRON_SUPPORTS_CXX_NULLPTR __has_feature(cxx_nullptr) -#define NATRON_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS __has_feature(cxx_explicit_conversions) -#define NATRON_COMPILER_SUPPORTS_BLOCKS __has_feature(blocks) -#define NATRON_COMPILER_SUPPORTS_C_STATIC_ASSERT __has_extension(c_static_assert) -#define NATRON_COMPILER_SUPPORTS_CXX_OVERRIDE_CONTROL __has_extension(cxx_override_control) -#define NATRON_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_extension(has_trivial_destructor) +#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) +#define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch)) +#if !GCC_VERSION_AT_LEAST(4, 9, 0) +//#error "Please use a newer version of GCC. WebKit requires GCC 4.9.0 or newer to compile." #endif -#ifndef CLANG_PRAGMA -#define CLANG_PRAGMA(PRAGMA) +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L +#define NATRON_COMPILER_SUPPORTS_C_STATIC_ASSERT 1 #endif -/* COMPILER(MSVC) - Microsoft Visual C++ */ -/* COMPILER(MSVC7_OR_LOWER) - Microsoft Visual C++ 2003 or lower*/ -/* COMPILER(MSVC9_OR_LOWER) - Microsoft Visual C++ 2008 or lower*/ -#if defined(_MSC_VER) -#define NATRON_COMPILER_MSVC 1 -#if _MSC_VER < 1400 -#define NATRON_COMPILER_MSVC7_OR_LOWER 1 -#elif _MSC_VER < 1600 -#define NATRON_COMPILER_MSVC9_OR_LOWER 1 -#endif +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" -/* Specific compiler features */ -#if !COMPILER(CLANG) && _MSC_VER >= 1600 -#define NATRON_SUPPORTS_CXX_NULLPTR 1 -#endif +#endif /* COMPILER(GCC) */ -#if !COMPILER(CLANG) -#define NATRON_COMPILER_SUPPORTS_CXX_OVERRIDE_CONTROL 1 -#define NATRON_COMPILER_QUIRK_FINAL_IS_CALLED_SEALED 1 -#endif +/* COMPILER(MINGW) - MinGW GCC */ +#if defined(__MINGW32__) +#define NATRON_COMPILER_MINGW 1 +#include <_mingw.h> #endif -/* COMPILER(RVCT) - ARM RealView Compilation Tools */ -/* COMPILER(RVCT4_OR_GREATER) - ARM RealView Compilation Tools 4.0 or greater */ -#if defined(__CC_ARM) || defined(__ARMCC__) -#define NATRON_COMPILER_RVCT 1 -#define RVCT_VERSION_AT_LEAST(major, minor, patch, build) ( __ARMCC_VERSION >= (major * 100000 + minor * 10000 + patch * 1000 + build) ) -#else -/* Define this for !RVCT compilers, just so we can write things like RVCT_VERSION_AT_LEAST(3, 0, 0, 0). */ -#define RVCT_VERSION_AT_LEAST(major, minor, patch, build) 0 -#endif +/* COMPILER(MINGW64) - mingw-w64 GCC - used as additional check to exclude mingw.org specific functions */ -/* COMPILER(GCCE) - GNU Compiler Collection for Embedded */ -#if defined(__GCCE__) -#define NATRON_COMPILER_GCCE 1 -#define GCCE_VERSION (__GCCE__ * 10000 + __GCCE_MINOR__ * 100 + __GCCE_PATCHLEVEL__) -#define GCCE_VERSION_AT_LEAST(major, minor, patch) ( GCCE_VERSION >= (major * 10000 + minor * 100 + patch) ) -#endif +/* Note: This section must come after the MinGW section since we check COMPILER(MINGW) here. */ -/* COMPILER(GCC) - GNU Compiler Collection */ -/* --gnu option of the RVCT compiler also defines __GNUC__ */ -#if defined(__GNUC__) && !COMPILER(RVCT) -#define NATRON_COMPILER_GCC 1 -#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) -#define GCC_VERSION_AT_LEAST(major, minor, patch) ( GCC_VERSION >= (major * 10000 + minor * 100 + patch) ) -#else -/* Define this for !GCC compilers, just so we can write things like GCC_VERSION_AT_LEAST(4, 1, 0). */ -#define GCC_VERSION_AT_LEAST(major, minor, patch) 0 +#if COMPILER(MINGW) && defined(__MINGW64_VERSION_MAJOR) /* best way to check for mingw-w64 vs mingw.org */ +#define NATRON_COMPILER_MINGW64 1 #endif -/* Specific compiler features */ -#if COMPILER(GCC) && !COMPILER(CLANG) -#if GCC_VERSION_AT_LEAST(4, 7, 0) && defined(__cplusplus) && __cplusplus >= 201103L -#define NATRON_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1 -#define NATRON_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 -#define NATRON_SUPPORTS_CXX_NULLPTR 1 -#define NATRON_COMPILER_SUPPORTS_CXX_OVERRIDE_CONTROL 1 -#define NATRON_COMPILER_QUIRK_GCC11_GLOBAL_ISINF_ISNAN 1 +/* COMPILER(MSVC) - Microsoft Visual C++ */ -#elif GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__) -#define NATRON_SUPPORTS_CXX_NULLPTR 1 -#define NATRON_COMPILER_QUIRK_GCC11_GLOBAL_ISINF_ISNAN 1 -#endif +#if defined(_MSC_VER) -#endif +#define NATRON_COMPILER_MSVC 1 +#define NATRON_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS 1 -/* COMPILER(MINGW) - MinGW GCC */ -/* COMPILER(MINGW64) - mingw-w64 GCC - only used as additional check to exclude mingw.org specific functions */ -#if defined(__MINGW32__) -#define NATRON_COMPILER_MINGW 1 -#include <_mingw.h> /* private MinGW header */ -#if defined(__MINGW64_VERSION_MAJOR) /* best way to check for mingw-w64 vs mingw.org */ -#define NATRON_COMPILER_MINGW64 1 -#endif /* __MINGW64_VERSION_MAJOR */ -#endif /* __MINGW32__ */ +#if _MSC_VER < 1900 +//#error "Please use a newer version of Visual Studio. WebKit requires VS2015 or newer to compile." +#endif -/* COMPILER(INTEL) - Intel C++ Compiler */ -#if defined(__INTEL_COMPILER) -#define NATRON_COMPILER_INTEL 1 #endif /* COMPILER(SUNCC) */ + #if defined(__SUNPRO_CC) || defined(__SUNPRO_C) #define NATRON_COMPILER_SUNCC 1 #endif -/* ==== Compiler features ==== */ +#if !COMPILER(CLANG) && !COMPILER(MSVC) +#define NATRON_COMPILER_QUIRK_CONSIDERS_UNREACHABLE_CODE 1 +#endif +/* ==== COMPILER_SUPPORTS - additional compiler feature detection, in alphabetical order ==== */ -/* ALWAYS_INLINE */ +/* COMPILER_SUPPORTS(EABI) */ -#ifndef ALWAYS_INLINE -#if COMPILER(GCC) && defined(NDEBUG) && !COMPILER(MINGW) -#define ALWAYS_INLINE inline __attribute__( (__always_inline__) ) -#elif (COMPILER(MSVC) || COMPILER(RVCT ) ) && defined(NDEBUG) -#define ALWAYS_INLINE __forceinline -#else -#define ALWAYS_INLINE inline +#if defined(__ARM_EABI__) || defined(__EABI__) +#define NATRON_COMPILER_SUPPORTS_EABI 1 #endif + +/* RELAXED_CONSTEXPR */ + +#if defined(__cpp_constexpr) && __cpp_constexpr >= 201304 +#define NATRON_COMPILER_SUPPORTS_RELAXED_CONSTEXPR 1 #endif +#if !defined(RELAXED_CONSTEXPR) +#if COMPILER_SUPPORTS(RELAXED_CONSTEXPR) +#define RELAXED_CONSTEXPR constexpr +#else +#define RELAXED_CONSTEXPR +#endif +#endif -/* NEVER_INLINE */ +#define ASAN_ENABLED COMPILER_HAS_CLANG_FEATURE(address_sanitizer) -#ifndef NEVER_INLINE -#if COMPILER(GCC) -#define NEVER_INLINE __attribute__( (__noinline__) ) -#elif COMPILER(RVCT) -#define NEVER_INLINE __declspec(noinline) +#if ASAN_ENABLED +#define SUPPRESS_ASAN __attribute__((no_sanitize_address)) #else -#define NEVER_INLINE +#define SUPPRESS_ASAN #endif + +/* ==== Compiler-independent macros for various compiler features, in alphabetical order ==== */ + +/* ALWAYS_INLINE */ + +#if !defined(ALWAYS_INLINE) && COMPILER(GCC_OR_CLANG) && defined(NDEBUG) && !COMPILER(MINGW) +#define ALWAYS_INLINE inline __attribute__((__always_inline__)) #endif +#if !defined(ALWAYS_INLINE) && COMPILER(MSVC) && defined(NDEBUG) +#define ALWAYS_INLINE __forceinline +#endif -/* UNLIKELY */ +#if !defined(ALWAYS_INLINE) +#define ALWAYS_INLINE inline +#endif -#ifndef UNLIKELY -#if COMPILER(GCC) || (RVCT_VERSION_AT_LEAST(3, 0, 0, 0) && defined(__GNUC__ ) ) -#define UNLIKELY(x) __builtin_expect( (x), 0 ) +/* NATRON_EXTERN_C_{BEGIN, END} */ + +#ifdef __cplusplus +#define NATRON_EXTERN_C_BEGIN extern "C" { +#define NATRON_EXTERN_C_END } #else -#define UNLIKELY(x) (x) +#define NATRON_EXTERN_C_BEGIN +#define NATRON_EXTERN_C_END #endif + +/* FALLTHROUGH */ + +#if !defined(FALLTHROUGH) && defined(__cplusplus) && defined(__has_cpp_attribute) + +#if __has_cpp_attribute(fallthrough) +#define FALLTHROUGH [[fallthrough]] +#elif __has_cpp_attribute(clang::fallthrough) +#define FALLTHROUGH [[clang::fallthrough]] +#elif __has_cpp_attribute(gnu::fallthrough) +#define FALLTHROUGH [[gnu::fallthrough]] #endif +#endif // !defined(FALLTHROUGH) && defined(__cplusplus) && defined(__has_cpp_attribute) + +#if !defined(FALLTHROUGH) +#define FALLTHROUGH +#endif /* LIKELY */ -#ifndef LIKELY -#if COMPILER(GCC) || (RVCT_VERSION_AT_LEAST(3, 0, 0, 0) && defined(__GNUC__ ) ) -#define LIKELY(x) __builtin_expect( (x), 1 ) -#else +#if !defined(LIKELY) && COMPILER(GCC_OR_CLANG) +#define LIKELY(x) __builtin_expect(!!(x), 1) +#endif + +#if !defined(LIKELY) #define LIKELY(x) (x) #endif + +/* NEVER_INLINE */ + +#if !defined(NEVER_INLINE) && COMPILER(GCC_OR_CLANG) +#define NEVER_INLINE __attribute__((__noinline__)) +#endif + +#if !defined(NEVER_INLINE) && COMPILER(MSVC) +#define NEVER_INLINE __declspec(noinline) #endif +#if !defined(NEVER_INLINE) +#define NEVER_INLINE +#endif /* NO_RETURN */ +#if !defined(NO_RETURN) && COMPILER(GCC_OR_CLANG) +#define NO_RETURN __attribute((__noreturn__)) +#endif -#ifndef NO_RETURN -#if COMPILER(GCC) -#define NO_RETURN __attribute( (__noreturn__) ) -#elif COMPILER(MSVC) || COMPILER(RVCT) +#if !defined(NO_RETURN) && COMPILER(MSVC) #define NO_RETURN __declspec(noreturn) -#else +#endif + +#if !defined(NO_RETURN) #define NO_RETURN #endif + +/* RETURNS_NONNULL */ +#if !defined(RETURNS_NONNULL) && COMPILER(GCC_OR_CLANG) +#define RETURNS_NONNULL __attribute__((returns_nonnull)) #endif +#if !defined(RETURNS_NONNULL) +#define RETURNS_NONNULL +#endif /* NO_RETURN_WITH_VALUE */ -#ifndef NO_RETURN_WITH_VALUE -#if !COMPILER(MSVC) +#if !defined(NO_RETURN_WITH_VALUE) && !COMPILER(MSVC) #define NO_RETURN_WITH_VALUE NO_RETURN -#else +#endif + +#if !defined(NO_RETURN_WITH_VALUE) #define NO_RETURN_WITH_VALUE #endif + +/* OBJC_CLASS */ + +#if !defined(OBJC_CLASS) && defined(__OBJC__) +#define OBJC_CLASS @class #endif +#if !defined(OBJC_CLASS) +#define OBJC_CLASS class +#endif -/* WARN_UNUSED_RETURN */ +/* PURE_FUNCTION */ -#if COMPILER(GCC) +#if !defined(PURE_FUNCTION) && COMPILER(GCC_OR_CLANG) +#define PURE_FUNCTION __attribute__((__pure__)) +#endif -#define WARN_UNUSED_RETURN __attribute__ ( (warn_unused_result) ) -#ifdef __cplusplus -// a very simple template function to actually ignore the return value of functions define with WARN_UNUSED_RETURN -template -inline T -ignore_result( T x __attribute__( (unused) ) ) -{ - return x; -} +#if !defined(PURE_FUNCTION) +#define PURE_FUNCTION +#endif + +/* UNUSED_FUNCTION */ +#if !defined(UNUSED_FUNCTION) && COMPILER(GCC_OR_CLANG) +#define UNUSED_FUNCTION __attribute__((unused)) #endif -#else // !GCC +#if !defined(UNUSED_FUNCTION) +#define UNUSED_FUNCTION +#endif -#define WARN_UNUSED_RETURN -#ifdef __cplusplus -template -inline T -ignore_result(T x) -{ - return x; -} +/* REFERENCED_FROM_ASM */ +#if !defined(REFERENCED_FROM_ASM) && COMPILER(GCC_OR_CLANG) +#define REFERENCED_FROM_ASM __attribute__((__used__)) #endif -#endif // !GCC +#if !defined(REFERENCED_FROM_ASM) +#define REFERENCED_FROM_ASM +#endif -/* OVERRIDE and FINAL */ +/* UNLIKELY */ -#if COMPILER_SUPPORTS(CXX_OVERRIDE_CONTROL) && !COMPILER(MSVC) //< patch so msvc 2010 ignores the override and final keywords. -#define OVERRIDE override +#if !defined(UNLIKELY) && COMPILER(GCC_OR_CLANG) +#define UNLIKELY(x) __builtin_expect(!!(x), 0) +#endif -#if COMPILER_QUIRK(FINAL_IS_CALLED_SEALED) -#define FINAL sealed -#else -#define FINAL final +#if !defined(UNLIKELY) +#define UNLIKELY(x) (x) #endif -#else -#define OVERRIDE -#define FINAL +/* UNUSED_LABEL */ + +/* Keep the compiler from complaining for a local label that is defined but not referenced. */ +/* Helpful when mixing hand-written and autogenerated code. */ + +#if !defined(UNUSED_LABEL) && COMPILER(MSVC) +#define UNUSED_LABEL(label) if (false) goto label #endif -/* REFERENCED_FROM_ASM */ +#if !defined(UNUSED_LABEL) +#define UNUSED_LABEL(label) UNUSED_PARAM(&& label) +#endif -#ifndef REFERENCED_FROM_ASM -#if COMPILER(GCC) -#define REFERENCED_FROM_ASM __attribute__( (used) ) -#else -#define REFERENCED_FROM_ASM +/* UNUSED_PARAM */ + +#if !defined(UNUSED_PARAM) && COMPILER(MSVC) +#define UNUSED_PARAM(variable) (void)&variable #endif + +#if !defined(UNUSED_PARAM) +#define UNUSED_PARAM(variable) (void)variable #endif -/* OBJC_CLASS */ +/* WARN_UNUSED_RETURN */ -#ifndef OBJC_CLASS -#ifdef __OBJC__ -#define OBJC_CLASS @class -#else -#define OBJC_CLASS class +#if !defined(WARN_UNUSED_RETURN) && COMPILER(GCC_OR_CLANG) +#define WARN_UNUSED_RETURN __attribute__((__warn_unused_result__)) #endif + +#if !defined(WARN_UNUSED_RETURN) +#define WARN_UNUSED_RETURN #endif -/* https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer#Turning_off_instrumentation */ -#if defined(__clang__) || defined (__GNUC__) -# define ATTRIBUTE_NO_SANITIZE_ADDRESS __attribute__( (no_sanitize_address) ) +#if !defined(__has_include) && COMPILER(MSVC) +#define __has_include(path) 0 +#endif + +// End of https://trac.webkit.org/browser/webkit/trunk/Source/WTF/wtf/Compiler.h?format=txt +///////////////////////////////////////////////////////////////////////////////////////////// + +// Bonus definitions and stuff from older WTF versions + +#if defined(__clang__) + +#ifdef __has_extension +#define COMPILER_HAS_CLANG_EXTENSION(x) __has_extension(x) #else -# define ATTRIBUTE_NO_SANITIZE_ADDRESS +#define COMPILER_HAS_CLANG_FEATURE(x) COMPILER_HAS_CLANG_FEATURE(x) /* Compatibility with older versions of clang */ #endif -/* ABI */ -#if defined(__ARM_EABI__) || defined(__EABI__) -#define NATRON_COMPILER_SUPPORTS_EABI 1 +/* Specific compiler features */ +#define NATRON_COMPILER_SUPPORTS_CXX_VARIADIC_TEMPLATES __has_extension(cxx_variadic_templates) + +/* There is a bug in clang that comes with Xcode 4.2 where AtomicStrings can't be implicitly converted to Strings + in the presence of move constructors and/or move assignment operators. This bug has been fixed in Xcode 4.3 clang, so we + check for both cxx_rvalue_references as well as the unrelated cxx_nonstatic_member_init feature which we know was added in 4.3 */ +#define NATRON_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES COMPILER_HAS_CLANG_EXTENSION(cxx_rvalue_references) && COMPILER_HAS_CLANG_EXTENSION(cxx_nonstatic_member_init) + +#define NATRON_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS COMPILER_HAS_CLANG_EXTENSION(cxx_deleted_functions) +#define NATRON_SUPPORTS_CXX_NULLPTR COMPILER_HAS_CLANG_FEATURE(cxx_nullptr) +#define NATRON_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS COMPILER_HAS_CLANG_FEATURE(cxx_explicit_conversions) +#define NATRON_COMPILER_SUPPORTS_CXX_OVERRIDE_CONTROL COMPILER_HAS_CLANG_EXTENSION(cxx_override_control) +#define NATRON_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR COMPILER_HAS_CLANG_EXTENSION(has_trivial_destructor) #endif -// Warning control from https://svn.boost.org/trac/boost/wiki/Guidelines/WarningsGuidelines -#if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 402 -#define GCC_DIAG_STR(s) # s -#define GCC_DIAG_JOINSTR(x, y) GCC_DIAG_STR(x ## y) -# define GCC_DIAG_DO_PRAGMA(x) _Pragma ( # x) -# define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x) -# if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 406 -# define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \ -GCC_DIAG_PRAGMA( ignored GCC_DIAG_JOINSTR(-W, x) ) -# define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop) -# else -# define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA( ignored GCC_DIAG_JOINSTR(-W, x) ) -# define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA( warning GCC_DIAG_JOINSTR(-W, x) ) -# endif -#else -# define GCC_DIAG_OFF(x) -# define GCC_DIAG_ON(x) +/* COMPILER(MSVC7_OR_LOWER) - Microsoft Visual C++ 2003 or lower*/ +/* COMPILER(MSVC9_OR_LOWER) - Microsoft Visual C++ 2008 or lower*/ +#if defined(_MSC_VER) +#if _MSC_VER < 1400 +#define NATRON_COMPILER_MSVC7_OR_LOWER 1 +#elif _MSC_VER < 1600 +#define NATRON_COMPILER_MSVC9_OR_LOWER 1 #endif -#ifdef __clang__ -# define CLANG_DIAG_STR(s) # s -// stringize s to "no-unused-variable" -# define CLANG_DIAG_JOINSTR(x, y) CLANG_DIAG_STR(x ## y) -// join -W with no-unused-variable to "-Wno-unused-variable" -# define CLANG_DIAG_DO_PRAGMA(x) _Pragma ( # x) -// _Pragma is unary operator #pragma ("") -# define CLANG_DIAG_PRAGMA(x) CLANG_DIAG_DO_PRAGMA(clang diagnostic x) -# define CLANG_DIAG_OFF(x) CLANG_DIAG_PRAGMA(push) \ -CLANG_DIAG_PRAGMA( ignored CLANG_DIAG_JOINSTR(-W, x) ) -// For example: #pragma clang diagnostic ignored "-Wno-unused-variable" -# define CLANG_DIAG_ON(x) CLANG_DIAG_PRAGMA(pop) -// For example: #pragma clang diagnostic warning "-Wno-unused-variable" -#else // Ensure these macros so nothing for other compilers. -# define CLANG_DIAG_OFF(x) -# define CLANG_DIAG_ON(x) -# define CLANG_DIAG_PRAGMA(x) +/* Specific compiler features */ +#if !COMPILER(CLANG) && _MSC_VER >= 1600 +#define NATRON_SUPPORTS_CXX_NULLPTR 1 #endif +#if !COMPILER(CLANG) +#define NATRON_COMPILER_SUPPORTS_CXX_OVERRIDE_CONTROL 1 +#define NATRON_COMPILER_QUIRK_FINAL_IS_CALLED_SEALED 1 +#endif -/* Usage: -CLANG_DIAG_OFF(unused-variable) -CLANG_DIAG_OFF(unused-parameter) -CLANG_DIAG_OFF(uninitialized) - */ +#endif // defined(_MSC_VER) -#ifndef __has_warning // Optional of course. -#define __has_warning(x) 0 // Compatibility with non-clang compilers. +/* Specific compiler features */ +#if COMPILER(GCC) && !COMPILER(CLANG) +#if GCC_VERSION_AT_LEAST(4, 7, 0) && defined(__cplusplus) && __cplusplus >= 201103L +#define NATRON_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1 +#define NATRON_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 +#define NATRON_SUPPORTS_CXX_NULLPTR 1 +#define NATRON_COMPILER_SUPPORTS_CXX_OVERRIDE_CONTROL 1 +#define NATRON_COMPILER_QUIRK_GCC11_GLOBAL_ISINF_ISNAN 1 + +#elif GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__) +#define NATRON_SUPPORTS_CXX_NULLPTR 1 +#define NATRON_COMPILER_QUIRK_GCC11_GLOBAL_ISINF_ISNAN 1 #endif -#if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 408 -// -Wunused-local-typedefs appeared with GCC 4.8 -# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF GCC_DIAG_OFF(unused-local-typedefs) -# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON GCC_DIAG_ON(unused-local-typedefs) -#else -#if __has_warning("-Wunused-local-typedef") // both unused-local-typedefs and unused-local-typedef should be available -# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF CLANG_DIAG_OFF(unused-local-typedef) -# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON CLANG_DIAG_ON(unused-local-typedef) -#elif __has_warning("-Wunused-local-typedefs") -# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF CLANG_DIAG_OFF(unused-local-typedefs) -# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON CLANG_DIAG_ON(unused-local-typedefs) -#else -# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_OFF -# define GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON +#endif // COMPILER(GCC) && !COMPILER(CLANG) + +/* ignore_result */ +// a very simple template function to actually ignore the return value of functions define with WARN_UNUSED_RETURN +#if COMPILER(GCC) +#ifdef __cplusplus +template +inline T +ignore_result( T x __attribute__( (unused) ) ) +{ + return x; +} #endif +#else // !GCC +#ifdef __cplusplus +template +inline T +ignore_result(T x) +{ + return x; +} #endif +#endif // !GCC -//#if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 408 -//// -Wunused-private-field appeared with GCC 4.8 -//# define GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF GCC_DIAG_OFF(unused-private-field) -//# define GCC_DIAG_UNUSED_PRIVATE_FIELD_ON GCC_DIAG_ON(unused-private-field) -//#else -#if __has_warning("-Wunused-private-field") -# define GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF CLANG_DIAG_OFF(unused-private-field) -# define GCC_DIAG_UNUSED_PRIVATE_FIELD_ON CLANG_DIAG_ON(unused-private-field) +/* OVERRIDE and FINAL */ + +#if COMPILER_SUPPORTS(CXX_OVERRIDE_CONTROL) && !COMPILER(MSVC) //< patch so msvc 2010 ignores the override and final keywords. +#define OVERRIDE override + +#if COMPILER_QUIRK(FINAL_IS_CALLED_SEALED) +#define FINAL sealed #else -# define GCC_DIAG_UNUSED_PRIVATE_FIELD_OFF -# define GCC_DIAG_UNUSED_PRIVATE_FIELD_ON +#define FINAL final #endif -//#endif -#if ( ( __GNUC__ * 100) + __GNUC_MINOR__) >= 510 -// -Wsuggest-override appeared with GCC 5.1 -# define GCC_DIAG_SUGGEST_OVERRIDE_OFF GCC_DIAG_OFF(suggest-override) -# define GCC_DIAG_SUGGEST_OVERRIDE_ON GCC_DIAG_ON(suggest-override) -#else -#if __has_warning("-Winconsistent-missing-override") -# define GCC_DIAG_SUGGEST_OVERRIDE_OFF CLANG_DIAG_OFF(inconsistent-missing-override) -# define GCC_DIAG_SUGGEST_OVERRIDE_ON CLANG_DIAG_ON(inconsistent-missing-override) #else -# define GCC_DIAG_SUGGEST_OVERRIDE_OFF -# define GCC_DIAG_SUGGEST_OVERRIDE_ON -#endif +#define OVERRIDE +#define FINAL #endif #if COMPILER_SUPPORTS(CXX_OVERRIDE_CONTROL) @@ -691,4 +863,5 @@ CLANG_DIAG_OFF(c++11-extensions) GCC_DIAG_OFF(c++11-extensions) #endif + #endif // ifndef NATRON_GLOBAL_MACROS_H diff --git a/Global/ProcInfo.cpp b/Global/ProcInfo.cpp index 5000569a10..a0a107fe41 100644 --- a/Global/ProcInfo.cpp +++ b/Global/ProcInfo.cpp @@ -41,7 +41,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -543,4 +543,4 @@ ProcInfo::checkIfProcessIsRunning(const char* /*processAbsoluteFilePath*/, #endif // if 0 } // ProcInfo::checkIfProcessIsRunning -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Global/ProcInfo.h b/Global/ProcInfo.h index 9ba44abe8e..9e63fe91fb 100644 --- a/Global/ProcInfo.h +++ b/Global/ProcInfo.h @@ -27,7 +27,7 @@ #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace ProcInfo { /** @@ -55,6 +55,6 @@ QString applicationFileName_mac(); #endif } // namespace ProcInfo -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GLOBAL_PROCINFO_H diff --git a/Global/QtCompat.h b/Global/QtCompat.h index 7653837387..2bf309a438 100644 --- a/Global/QtCompat.h +++ b/Global/QtCompat.h @@ -24,7 +24,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace QtCompat { inline bool @@ -52,7 +52,7 @@ removeRecursively(const QString & dirName) } } // namespace QtCompat -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif @@ -60,7 +60,7 @@ NATRON_NAMESPACE_EXIT; #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace QtCompat { /*Removes the . and the extension from the filename and also @@ -92,6 +92,6 @@ toLocalFileUrlFixed(const QUrl& url) { return url; } #endif // #if defined(Q_OS_MAC) && QT_VERSION < 0x050000 } // namespace QtCompat -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GLOBAL_QTCOMPAT_H diff --git a/Global/StrUtils.h b/Global/StrUtils.h index ec1d6dc8aa..d191793e2f 100755 --- a/Global/StrUtils.h +++ b/Global/StrUtils.h @@ -25,7 +25,7 @@ #include "Global/Macros.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER namespace StrUtils { @@ -47,6 +47,6 @@ void ensureLastPathSeparator(QString& path); } // namespace StrUtils -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef NATRON_GLOBAL_STRUTILS_H diff --git a/Gui/AboutWindow.cpp b/Gui/AboutWindow.cpp index 0e3fb25a39..597b613f33 100644 --- a/Gui/AboutWindow.cpp +++ b/Gui/AboutWindow.cpp @@ -57,7 +57,7 @@ CLANG_DIAG_ON(deprecated) #define THIRD_PARTY_LICENSE_DIR_PATH ":" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER AboutWindow::AboutWindow(QWidget* parent) : QDialog(parent) @@ -585,7 +585,7 @@ AboutWindow::updateLibrariesVersions() _libsText->setText(libsText); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_AboutWindow.cpp" diff --git a/Gui/AboutWindow.h b/Gui/AboutWindow.h index 706b5b002f..eacf1d7334 100644 --- a/Gui/AboutWindow.h +++ b/Gui/AboutWindow.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class AboutWindow : public QDialog @@ -73,6 +73,6 @@ public Q_SLOTS: const QItemSelection & oldSelection); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ABOUTWINDOW_H diff --git a/Gui/ActionShortcuts.cpp b/Gui/ActionShortcuts.cpp index b9c31cd99c..57e5a6f076 100644 --- a/Gui/ActionShortcuts.cpp +++ b/Gui/ActionShortcuts.cpp @@ -30,7 +30,7 @@ #include "Gui/GuiApplicationManager.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ActionWithShortcut::ActionWithShortcut(const std::string & group, const std::string & actionID, @@ -333,7 +333,7 @@ ToolTipActionShortcut::setShortcutWrapper(const QString& actionID, setToolTipFromOriginalToolTip(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ActionShortcuts.cpp" diff --git a/Gui/ActionShortcuts.h b/Gui/ActionShortcuts.h index ddbfec6e77..39cc8c61e8 100644 --- a/Gui/ActionShortcuts.h +++ b/Gui/ActionShortcuts.h @@ -583,7 +583,7 @@ CLANG_DIAG_ON(uninitialized) #define kShortcutIDActionScriptShowOutput "showHideOutput" #define kShortcutDescActionScriptShowOutput "Show/Hide Output Window" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER inline QKeySequence @@ -825,6 +825,6 @@ typedef std::map GroupShortcuts; ///All groups shortcuts mapped against the name of the group typedef std::map AppShortcuts; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ACTIONSHORTCUTS_H diff --git a/Gui/AddKnobDialog.cpp b/Gui/AddKnobDialog.cpp index 945aad5444..7881f6614a 100644 --- a/Gui/AddKnobDialog.cpp +++ b/Gui/AddKnobDialog.cpp @@ -53,7 +53,7 @@ #include "Gui/SpinBox.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct AddKnobDialogPrivate @@ -2148,7 +2148,7 @@ AddKnobDialogPrivate::setVisibleDefaultValues(bool visible, } } // AddKnobDialogPrivate::setVisibleDefaultValues -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_AddKnobDialog.cpp" diff --git a/Gui/AddKnobDialog.h b/Gui/AddKnobDialog.h index 5606016bda..75061cbab7 100644 --- a/Gui/AddKnobDialog.h +++ b/Gui/AddKnobDialog.h @@ -38,7 +38,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct AddKnobDialogPrivate; class AddKnobDialog @@ -105,6 +105,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_AddKnobDialog_h diff --git a/Gui/AnimatedCheckBox.cpp b/Gui/AnimatedCheckBox.cpp index 313513ff1c..f8ac73d829 100644 --- a/Gui/AnimatedCheckBox.cpp +++ b/Gui/AnimatedCheckBox.cpp @@ -40,7 +40,7 @@ CLANG_DIAG_ON(deprecated-register) #include "Gui/GuiApplicationManager.h" #include "Engine/Settings.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER AnimatedCheckBox::AnimatedCheckBox(QWidget *parent) : QFrame(parent), animation(0), readOnly(false), dirty(false), altered(false), checked(false) { @@ -205,7 +205,7 @@ AnimatedCheckBox::paintEvent(QPaintEvent* e) } } // AnimatedCheckBox::paintEvent -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_AnimatedCheckBox.cpp" diff --git a/Gui/AnimatedCheckBox.h b/Gui/AnimatedCheckBox.h index 838aa87ac0..06b68fc6bf 100644 --- a/Gui/AnimatedCheckBox.h +++ b/Gui/AnimatedCheckBox.h @@ -37,7 +37,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class AnimatedCheckBox : public QFrame @@ -108,6 +108,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON virtual void paintEvent(QPaintEvent* e) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_ANIMATEDCHECKBOX_H diff --git a/Gui/AutoHideToolBar.cpp b/Gui/AutoHideToolBar.cpp index ead00052e0..8d1249d24e 100644 --- a/Gui/AutoHideToolBar.cpp +++ b/Gui/AutoHideToolBar.cpp @@ -28,7 +28,7 @@ #include "Gui/Gui.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER AutoHideToolBar::AutoHideToolBar(Gui* gui, QWidget* parent) @@ -46,4 +46,4 @@ AutoHideToolBar::leaveEvent(QEvent* e) QToolBar::leaveEvent(e); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/AutoHideToolBar.h b/Gui/AutoHideToolBar.h index 780ec8bacb..761da2636b 100644 --- a/Gui/AutoHideToolBar.h +++ b/Gui/AutoHideToolBar.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class AutoHideToolBar : public QToolBar @@ -50,6 +50,6 @@ class AutoHideToolBar virtual void leaveEvent(QEvent* e) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_AutoHideToolBar_h diff --git a/Gui/BackdropGui.cpp b/Gui/BackdropGui.cpp index ea0f084696..c828894a8f 100644 --- a/Gui/BackdropGui.cpp +++ b/Gui/BackdropGui.cpp @@ -48,7 +48,7 @@ CLANG_DIAG_ON(uninitialized) #define NATRON_BACKDROP_DEFAULT_WIDTH 80 #define NATRON_BACKDROP_DEFAULT_HEIGHT 80 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct BackdropGuiPrivate { @@ -191,7 +191,7 @@ BackdropGuiPrivate::refreshLabelText(int nameHeight, _publicInterface->update(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_BackdropGui.cpp" diff --git a/Gui/BackdropGui.h b/Gui/BackdropGui.h index c64cb2748e..e15137bf34 100644 --- a/Gui/BackdropGui.h +++ b/Gui/BackdropGui.h @@ -34,7 +34,7 @@ #include "Gui/NodeGui.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct BackdropGuiPrivate; class BackdropGui @@ -84,6 +84,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_BackdropGui_h diff --git a/Gui/Button.cpp b/Gui/Button.cpp index 3514a18426..f82990bd5f 100644 --- a/Gui/Button.cpp +++ b/Gui/Button.cpp @@ -30,7 +30,7 @@ #include "Gui/GuiApplicationManager.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER Button::Button(QWidget* parent) : QPushButton(parent) @@ -63,5 +63,5 @@ Button::initInternal() //setFont( QFont(appFont,appFontSize) ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/Button.h b/Gui/Button.h index b68c9742d5..5203e16ba0 100644 --- a/Gui/Button.h +++ b/Gui/Button.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class Button : public QPushButton @@ -56,6 +56,6 @@ class Button void initInternal(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif diff --git a/Gui/ChannelsComboBox.cpp b/Gui/ChannelsComboBox.cpp index 3a20f940bb..4f9468231a 100644 --- a/Gui/ChannelsComboBox.cpp +++ b/Gui/ChannelsComboBox.cpp @@ -36,7 +36,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void ChannelsComboBox::paintEvent(QPaintEvent* event) @@ -85,4 +85,4 @@ ChannelsComboBox::paintEvent(QPaintEvent* event) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/ChannelsComboBox.h b/Gui/ChannelsComboBox.h index 1ccb1408c1..6746ccaf0a 100644 --- a/Gui/ChannelsComboBox.h +++ b/Gui/ChannelsComboBox.h @@ -30,7 +30,7 @@ #include "Gui/ComboBox.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class ChannelsComboBox : public ComboBox @@ -45,6 +45,6 @@ class ChannelsComboBox virtual void paintEvent(QPaintEvent* event) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_ChannelsComboBox_h diff --git a/Gui/ClickableLabel.cpp b/Gui/ClickableLabel.cpp index 40d2eef245..12fda49f7b 100644 --- a/Gui/ClickableLabel.cpp +++ b/Gui/ClickableLabel.cpp @@ -37,7 +37,7 @@ #include "Gui/GuiMacros.h" #include "Gui/KnobWidgetDnD.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ClickableLabel::ClickableLabel(const QString &text, QWidget *parent) @@ -267,7 +267,7 @@ KnobClickableLabel::focusOutEvent(QFocusEvent* e) ClickableLabel::focusOutEvent(e); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ClickableLabel.cpp" diff --git a/Gui/ClickableLabel.h b/Gui/ClickableLabel.h index 0aedb8a677..20795f4803 100644 --- a/Gui/ClickableLabel.h +++ b/Gui/ClickableLabel.h @@ -42,7 +42,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/Label.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class ClickableLabel : public Label @@ -162,6 +162,6 @@ class KnobClickableLabel boost::shared_ptr _dnd; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_CLICKABLELABEL_H diff --git a/Gui/ColoredFrame.cpp b/Gui/ColoredFrame.cpp index f2d5a1571c..966e4c0614 100644 --- a/Gui/ColoredFrame.cpp +++ b/Gui/ColoredFrame.cpp @@ -24,7 +24,7 @@ #include "ColoredFrame.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ColoredFrame::ColoredFrame(QWidget* parent) : QFrame(parent) @@ -50,6 +50,6 @@ ColoredFrame::setFrameColor(const QColor& color) setStyleSheet( QString::fromUtf8("ColoredFrame { border:1px solid rgb(%1, %2, %3); border-radius: 2px; }").arg( color.red() ).arg( color.green() ).arg( color.blue() ) ); } -NATRON_NAMESPACE_EXIT; -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_EXIT +NATRON_NAMESPACE_USING #include "moc_ColoredFrame.cpp" diff --git a/Gui/ColoredFrame.h b/Gui/ColoredFrame.h index 6bb0671127..68fa587199 100644 --- a/Gui/ColoredFrame.h +++ b/Gui/ColoredFrame.h @@ -32,7 +32,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class ColoredFrame : public QFrame @@ -58,6 +58,6 @@ public Q_SLOTS: QColor _frameColor; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // COLOREDFRAME_H diff --git a/Gui/ComboBox.cpp b/Gui/ComboBox.cpp index c4d2697b7c..ada2c1a3bd 100644 --- a/Gui/ComboBox.cpp +++ b/Gui/ComboBox.cpp @@ -55,7 +55,7 @@ CLANG_DIAG_ON(deprecated-register) #include "Gui/Menu.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /* @@ -1098,7 +1098,7 @@ ComboBox::getAltered() const return _altered; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ComboBox.cpp" diff --git a/Gui/ComboBox.h b/Gui/ComboBox.h index 067827676e..8d5fc1815d 100644 --- a/Gui/ComboBox.h +++ b/Gui/ComboBox.h @@ -47,7 +47,7 @@ CLANG_DIAG_ON(uninitialized) #define DROP_DOWN_ICON_SIZE 6 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ComboBoxMenuNode @@ -232,6 +232,6 @@ public Q_SLOTS: void updateLabel(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef NATRON_GUI_COMBOBOX_H diff --git a/Gui/CurveEditor.cpp b/Gui/CurveEditor.cpp index a2c146c1f1..27769c26fd 100644 --- a/Gui/CurveEditor.cpp +++ b/Gui/CurveEditor.cpp @@ -77,7 +77,7 @@ using std::make_pair; using std::cout; using std::endl; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class CurveEditorTreeWidget : public QTreeWidget @@ -1700,7 +1700,7 @@ CurveEditor::onExprLineEditFinished() setSelectedCurveExpression( _imp->knobLineEdit->text() ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_CurveEditor.cpp" diff --git a/Gui/CurveEditor.h b/Gui/CurveEditor.h index c658c81ca2..c25f63d1b1 100644 --- a/Gui/CurveEditor.h +++ b/Gui/CurveEditor.h @@ -48,7 +48,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * All nodes are tracked in the CurveEditor and they all have a NodeCurveEditorContext. @@ -394,6 +394,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // CURVEEDITOR_H diff --git a/Gui/CurveEditorUndoRedo.cpp b/Gui/CurveEditorUndoRedo.cpp index 7ab09aadf0..b46db06b81 100644 --- a/Gui/CurveEditorUndoRedo.cpp +++ b/Gui/CurveEditorUndoRedo.cpp @@ -44,7 +44,7 @@ #include "Engine/Transform.h" #include "Engine/ViewIdx.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //////////////////////////////ADD MULTIPLE KEYS COMMAND////////////////////////////////////////////// AddKeysCommand::AddKeysCommand(CurveWidget *editor, @@ -1013,4 +1013,4 @@ TransformKeysCommand::mergeWith(const QUndoCommand * command) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/CurveEditorUndoRedo.h b/Gui/CurveEditorUndoRedo.h index 51fbabcb43..4ceb4618ef 100644 --- a/Gui/CurveEditorUndoRedo.h +++ b/Gui/CurveEditorUndoRedo.h @@ -47,7 +47,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct SelectedKey { @@ -381,6 +381,6 @@ class TransformKeysCommand Transform::Matrix3x3 _matrix, _invMatrix; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // CURVEEDITORUNDOREDO_H diff --git a/Gui/CurveGui.cpp b/Gui/CurveGui.cpp index e97178ac97..188bb2c7ac 100644 --- a/Gui/CurveGui.cpp +++ b/Gui/CurveGui.cpp @@ -43,7 +43,7 @@ #include "Gui/CurveWidgetPrivate.h" #include "Gui/KnobGui.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER CurveGui::CurveGui(CurveWidget *curveWidget, boost::shared_ptr curve, @@ -809,7 +809,7 @@ BezierCPCurveGui::setKeyFrameInterpolation(KeyframeTypeEnum interp, return KeyFrame(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_CurveGui.cpp" diff --git a/Gui/CurveGui.h b/Gui/CurveGui.h index 0fe0d9a59f..221f1d67ed 100644 --- a/Gui/CurveGui.h +++ b/Gui/CurveGui.h @@ -44,7 +44,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/CurveGui.h" // Curves #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class CurveGui : public QObject @@ -263,6 +263,6 @@ class BezierCPCurveGui boost::shared_ptr _rotoContext; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_CurveGui_h diff --git a/Gui/CurveSelection.h b/Gui/CurveSelection.h index d97a5b5ad9..b28fefa7ea 100644 --- a/Gui/CurveSelection.h +++ b/Gui/CurveSelection.h @@ -35,7 +35,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class CurveSelection { @@ -43,9 +43,11 @@ class CurveSelection CurveSelection() {} + virtual ~CurveSelection() {} + virtual void getSelectedCurves(std::vector >* selection) = 0; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // CURVESELECTION_H diff --git a/Gui/CurveWidget.cpp b/Gui/CurveWidget.cpp index 3e4729daee..f7c3e5ac81 100644 --- a/Gui/CurveWidget.cpp +++ b/Gui/CurveWidget.cpp @@ -61,7 +61,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/TabWidget.h" #include "Gui/ViewerGL.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*****************************CURVE WIDGET***********************************************/ @@ -2409,7 +2409,7 @@ CurveWidget::addKey(const boost::shared_ptr& curve, double xCurve, dou _imp->insertSelectedKeyFrameConditionnaly(selected); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_CurveWidget.cpp" diff --git a/Gui/CurveWidget.h b/Gui/CurveWidget.h index 216719d0f8..82686aca76 100644 --- a/Gui/CurveWidget.h +++ b/Gui/CurveWidget.h @@ -53,7 +53,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/CurveEditorUndoRedo.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class CurveWidgetPrivate; @@ -259,7 +259,7 @@ public Q_SLOTS: }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT Q_DECLARE_METATYPE(NATRON_NAMESPACE::CurveWidget*) diff --git a/Gui/CurveWidgetDialogs.cpp b/Gui/CurveWidgetDialogs.cpp index d5905a5c9d..e906648597 100644 --- a/Gui/CurveWidgetDialogs.cpp +++ b/Gui/CurveWidgetDialogs.cpp @@ -52,7 +52,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/GuiApplicationManager.h" #include "Gui/Label.h" // Label -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ImportExportCurveDialog::ImportExportCurveDialog(bool isExportDialog, const std::vector > & curves, @@ -595,7 +595,7 @@ EditKeyFrameDialog::changeEvent(QEvent* e) QDialog::changeEvent(e); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_CurveWidgetDialogs.cpp" diff --git a/Gui/CurveWidgetDialogs.h b/Gui/CurveWidgetDialogs.h index 27db1a8025..9c0ac6024e 100644 --- a/Gui/CurveWidgetDialogs.h +++ b/Gui/CurveWidgetDialogs.h @@ -46,7 +46,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/CurveGui.h" // CurveGui #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class ImportExportCurveDialog : public QDialog @@ -174,6 +174,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_CurveGuiDialogs_h diff --git a/Gui/CurveWidgetPrivate.cpp b/Gui/CurveWidgetPrivate.cpp index 1ee1d0db11..fbe1427d24 100644 --- a/Gui/CurveWidgetPrivate.cpp +++ b/Gui/CurveWidgetPrivate.cpp @@ -60,7 +60,7 @@ #define AXIS_MAX 100000. #define AXIS_MIN -100000. -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER CurveWidgetPrivate::CurveWidgetPrivate(Gui* gui, @@ -1593,5 +1593,5 @@ CurveWidgetPrivate::updateDopeSheetViewFrameRange() _gui->getDopeSheetEditor()->centerOn( zoomCtx.left(), zoomCtx.right() ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/CurveWidgetPrivate.h b/Gui/CurveWidgetPrivate.h index 92adabaed8..6a790c226f 100644 --- a/Gui/CurveWidgetPrivate.h +++ b/Gui/CurveWidgetPrivate.h @@ -45,7 +45,7 @@ #define CURVEWIDGET_DERIVATIVE_ROUND_PRECISION 3. -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*****************************CURVE WIDGET***********************************************/ @@ -194,6 +194,6 @@ class CurveWidgetPrivate CurveSelection* _selectionModel; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_CurveWidgetPrivate_h diff --git a/Gui/CustomParamInteract.cpp b/Gui/CustomParamInteract.cpp index ea67a34793..0b696d2a38 100644 --- a/Gui/CustomParamInteract.cpp +++ b/Gui/CustomParamInteract.cpp @@ -41,7 +41,7 @@ #include "Engine/TimeLine.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct CustomParamInteractPrivate { @@ -415,4 +415,4 @@ CustomParamInteract::keyReleaseEvent(QKeyEvent* e) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/CustomParamInteract.h b/Gui/CustomParamInteract.h index 58ebd1bf7c..1f0b1110a1 100644 --- a/Gui/CustomParamInteract.h +++ b/Gui/CustomParamInteract.h @@ -45,7 +45,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct CustomParamInteractPrivate; class CustomParamInteract @@ -126,6 +126,6 @@ class CustomParamInteract boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // CUSTOMPARAMINTERACT_H diff --git a/Gui/DialogButtonBox.cpp b/Gui/DialogButtonBox.cpp index beac86b70b..6c485d971c 100644 --- a/Gui/DialogButtonBox.cpp +++ b/Gui/DialogButtonBox.cpp @@ -27,7 +27,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER DialogButtonBox::DialogButtonBox(StandardButtons buttons, Qt::Orientation orientation, @@ -78,5 +78,5 @@ DialogButtonBox::setStandardButtons(StandardButtons buttons) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/DialogButtonBox.h b/Gui/DialogButtonBox.h index 9991504afb..7944b59e6a 100644 --- a/Gui/DialogButtonBox.h +++ b/Gui/DialogButtonBox.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // a QDialogButtonBox that properly sets the button fonts (as in the Button class) class DialogButtonBox @@ -57,6 +57,6 @@ class DialogButtonBox private: }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_DialogButtonBox_h diff --git a/Gui/DockablePanel.cpp b/Gui/DockablePanel.cpp index 77d40946b9..17df61fcaf 100644 --- a/Gui/DockablePanel.cpp +++ b/Gui/DockablePanel.cpp @@ -90,7 +90,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON using std::make_pair; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // called by NodeSettingsPanel::NodeSettingsPanel() DockablePanel::DockablePanel(Gui* gui, @@ -1797,7 +1797,7 @@ struct ManageUserParamsDialogPrivate NATRON_NAMESPACE_ANONYMOUS_EXIT - NATRON_NAMESPACE_EXIT; + NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_DockablePanel.cpp" diff --git a/Gui/DockablePanel.h b/Gui/DockablePanel.h index 90c27de0d0..9b1fcf90e8 100644 --- a/Gui/DockablePanel.h +++ b/Gui/DockablePanel.h @@ -51,7 +51,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" #include "Gui/KnobGuiContainerHelper.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief An abstract class that defines a dockable properties panel that can be found in the Property bin pane. @@ -289,6 +289,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_DockablePanel_h diff --git a/Gui/DockablePanelPrivate.cpp b/Gui/DockablePanelPrivate.cpp index e95bbea663..3518968a7b 100644 --- a/Gui/DockablePanelPrivate.cpp +++ b/Gui/DockablePanelPrivate.cpp @@ -57,7 +57,7 @@ using std::make_pair; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER DockablePanelPrivate::DockablePanelPrivate(DockablePanel* publicI, @@ -139,7 +139,7 @@ OverlayColorButton::mousePressEvent(QMouseEvent* e) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_DockablePanelPrivate.cpp" diff --git a/Gui/DockablePanelPrivate.h b/Gui/DockablePanelPrivate.h index 1fa8b0ff7e..85538f3de8 100644 --- a/Gui/DockablePanelPrivate.h +++ b/Gui/DockablePanelPrivate.h @@ -51,7 +51,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/Button.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct DockablePanelPrivate @@ -142,6 +142,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON virtual void mousePressEvent(QMouseEvent* e) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_DockablePanelPrivate_h diff --git a/Gui/DockablePanelTabWidget.cpp b/Gui/DockablePanelTabWidget.cpp index cf128aee80..01a3a338c6 100644 --- a/Gui/DockablePanelTabWidget.cpp +++ b/Gui/DockablePanelTabWidget.cpp @@ -40,7 +40,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/NodeGraph.h" #include "Gui/ViewerTab.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -109,5 +109,5 @@ DockablePanelTabWidget::minimumSizeHint() const return currentWidget() ? currentWidget()->minimumSizeHint() + QSize(0, 20) : QSize(300, 100); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/DockablePanelTabWidget.h b/Gui/DockablePanelTabWidget.h index 96adfcb282..42709e7e9a 100644 --- a/Gui/DockablePanelTabWidget.h +++ b/Gui/DockablePanelTabWidget.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @class This is to overcome an issue in QTabWidget : switching tab does not resize the QTabWidget. @@ -63,6 +63,6 @@ class DockablePanelTabWidget virtual void keyPressEvent(QKeyEvent* event) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_DockablePanelTabWidget_h diff --git a/Gui/DocumentationManager.cpp b/Gui/DocumentationManager.cpp index ecb2c30276..cda0a4a57f 100644 --- a/Gui/DocumentationManager.cpp +++ b/Gui/DocumentationManager.cpp @@ -47,7 +47,7 @@ #include "Engine/WriteNode.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER DocumentationManager::DocumentationManager(QObject *parent) : QObject(parent) , server(NULL) @@ -652,7 +652,7 @@ DocumentationManager::serverPort() return server->serverPort(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_DocumentationManager.cpp" diff --git a/Gui/DocumentationManager.h b/Gui/DocumentationManager.h index fc7452048b..11be323ef5 100644 --- a/Gui/DocumentationManager.h +++ b/Gui/DocumentationManager.h @@ -39,7 +39,7 @@ class QHttpServer; class QHttpRequest; class QHttpResponse; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class DocumentationManager : public QObject @@ -63,6 +63,6 @@ private Q_SLOTS: QHttpServer *server; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_DocumentationManager_h diff --git a/Gui/DopeSheet.cpp b/Gui/DopeSheet.cpp index efbc61fe62..bcecffe6a5 100644 --- a/Gui/DopeSheet.cpp +++ b/Gui/DopeSheet.cpp @@ -64,7 +64,7 @@ #include "Gui/NodeGraph.h" #include "Gui/NodeGraphUndoRedo.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef std::map, KnobGui *> KnobsAndGuis; typedef std::pair > TreeItemAndDSNode; @@ -1626,7 +1626,7 @@ DSNode::containsNodeContext() const return false; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_DopeSheet.cpp" diff --git a/Gui/DopeSheet.h b/Gui/DopeSheet.h index 95df7c6183..dfd435e2fa 100644 --- a/Gui/DopeSheet.h +++ b/Gui/DopeSheet.h @@ -57,7 +57,7 @@ CLANG_DIAG_ON(uninitialized) #define kTimeOffsetParamNameTimeOffset "timeOffset" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class DopeSheetPrivate; class DopeSheetSelectionModel; @@ -471,7 +471,7 @@ class DopeSheetSelectionModel boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT Q_DECLARE_OPERATORS_FOR_FLAGS(NATRON_NAMESPACE::DopeSheetSelectionModel::SelectionTypeFlags) diff --git a/Gui/DopeSheetEditor.cpp b/Gui/DopeSheetEditor.cpp index 8798030ea7..8046ce8622 100644 --- a/Gui/DopeSheetEditor.cpp +++ b/Gui/DopeSheetEditor.cpp @@ -44,7 +44,7 @@ #include "Gui/GuiMacros.h" #include "Engine/TimeLine.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ////////////////////////// DopeSheetEditor ////////////////////////// @@ -288,4 +288,4 @@ DopeSheetEditor::getUndoStack() const return _imp->model ? _imp->model->getUndoStack() : 0; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/DopeSheetEditor.h b/Gui/DopeSheetEditor.h index 0ecc231307..0107e0460f 100644 --- a/Gui/DopeSheetEditor.h +++ b/Gui/DopeSheetEditor.h @@ -47,7 +47,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/PanelWidget.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class DopeSheetEditorPrivate; @@ -137,6 +137,6 @@ class DopeSheetEditor boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // DOPESHEETEDITOR_H diff --git a/Gui/DopeSheetEditorUndoRedo.cpp b/Gui/DopeSheetEditorUndoRedo.cpp index 70bd3e1794..caa27075ed 100644 --- a/Gui/DopeSheetEditorUndoRedo.cpp +++ b/Gui/DopeSheetEditorUndoRedo.cpp @@ -47,7 +47,7 @@ #include "Gui/DopeSheet.h" #include "Gui/DopeSheetView.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef std::map, KnobGui *> KnobsAndGuis; @@ -996,4 +996,4 @@ DSPasteKeysCommand::addOrRemoveKeyframe(bool add) _model->refreshSelectionBboxAndRedrawView(); } // DSPasteKeysCommand::addOrRemoveKeyframe -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/DopeSheetEditorUndoRedo.h b/Gui/DopeSheetEditorUndoRedo.h index 1fcddeb454..83e8ee4b4f 100644 --- a/Gui/DopeSheetEditorUndoRedo.h +++ b/Gui/DopeSheetEditorUndoRedo.h @@ -48,7 +48,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef boost::shared_ptr DSKeyPtr; typedef std::list DSKeyPtrList; @@ -412,6 +412,6 @@ class DSPasteKeysCommand DopeSheetEditor *_model; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // DOPESHEETEDITORUNDOREDO_H diff --git a/Gui/DopeSheetHierarchyView.cpp b/Gui/DopeSheetHierarchyView.cpp index a68aaccaad..f907d10713 100644 --- a/Gui/DopeSheetHierarchyView.cpp +++ b/Gui/DopeSheetHierarchyView.cpp @@ -46,7 +46,7 @@ #include "Gui/NodeGui.h" #include "Gui/NodeSettingsPanel.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef std::list > DSKnobPtrList; @@ -1115,7 +1115,7 @@ HierarchyView::onSelectionChanged() _imp->selectKeyframes( selectedItems() ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_DopeSheetHierarchyView.cpp" diff --git a/Gui/DopeSheetHierarchyView.h b/Gui/DopeSheetHierarchyView.h index fc0a28ad09..48acb0c878 100644 --- a/Gui/DopeSheetHierarchyView.h +++ b/Gui/DopeSheetHierarchyView.h @@ -50,7 +50,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class HierarchyViewPrivate; @@ -284,6 +284,6 @@ class HierarchyViewItemDelegate virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // DOPESHEETHIERARCHYVIEW_H diff --git a/Gui/DopeSheetView.cpp b/Gui/DopeSheetView.cpp index 326c199615..b6a005aa79 100644 --- a/Gui/DopeSheetView.cpp +++ b/Gui/DopeSheetView.cpp @@ -73,7 +73,7 @@ #define NATRON_DOPESHEET_MIN_RANGE_FIT 10 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -3669,7 +3669,7 @@ DopeSheetView::focusInEvent(QFocusEvent *e) QGLWidget::focusInEvent(e); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_DopeSheetView.cpp" diff --git a/Gui/DopeSheetView.h b/Gui/DopeSheetView.h index 5da2dc28d6..e4ad556211 100644 --- a/Gui/DopeSheetView.h +++ b/Gui/DopeSheetView.h @@ -53,7 +53,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class DopeSheetViewPrivate; @@ -342,6 +342,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // DOPESHEETVIEW_H diff --git a/Gui/DotGui.cpp b/Gui/DotGui.cpp index 56b765cf49..791da82ff2 100644 --- a/Gui/DotGui.cpp +++ b/Gui/DotGui.cpp @@ -100,7 +100,7 @@ CLANG_DIAG_ON(uninitialized) #define NATRON_PLUGIN_ICON_SIZE 20 #define PLUGIN_ICON_OFFSET 2 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; @@ -201,7 +201,7 @@ DotGui::shape() const return diskShape->shape(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -//NATRON_NAMESPACE_USING; +//NATRON_NAMESPACE_USING //#include "moc_DotGui.cpp" diff --git a/Gui/DotGui.h b/Gui/DotGui.h index 4ca21a5e37..faf76a62ac 100644 --- a/Gui/DotGui.h +++ b/Gui/DotGui.h @@ -44,7 +44,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/NodeGui.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class DotGui : public NodeGui @@ -73,6 +73,6 @@ class DotGui QGraphicsEllipseItem* ellipseIndicator; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_NODEGUI_H diff --git a/Gui/Edge.cpp b/Gui/Edge.cpp index 8f569e93fa..7237e22d49 100644 --- a/Gui/Edge.cpp +++ b/Gui/Edge.cpp @@ -60,7 +60,7 @@ // number of offset pixels from the arrow that determine if a click is contained in the arrow or not #define kGraphicalContainerOffset 10 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct EdgePrivate { @@ -943,7 +943,7 @@ LinkArrow::paint(QPainter *painter, painter->fillPath(headPath, _headColor); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_Edge.cpp" diff --git a/Gui/Edge.h b/Gui/Edge.h index 4c515deefb..c17b5cedc8 100644 --- a/Gui/Edge.h +++ b/Gui/Edge.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct EdgePrivate; class Edge @@ -169,6 +169,6 @@ public Q_SLOTS: int _lineWidth; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_EDGE_H diff --git a/Gui/EditExpressionDialog.cpp b/Gui/EditExpressionDialog.cpp index eb67969793..f986009cf5 100644 --- a/Gui/EditExpressionDialog.cpp +++ b/Gui/EditExpressionDialog.cpp @@ -89,7 +89,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/TimeLineGui.h" #include "Gui/ViewerTab.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER EditExpressionDialog::EditExpressionDialog(Gui* gui, int dimension, @@ -173,7 +173,7 @@ EditExpressionDialog::getDeclaredVariables(std::list variables.push_back( std::make_pair( QString::fromUtf8("frame"), tr("the current time on the timeline or the time passed to the get function") ) ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_EditExpressionDialog.cpp" diff --git a/Gui/EditExpressionDialog.h b/Gui/EditExpressionDialog.h index 1e6435b1ce..b39c922cbf 100644 --- a/Gui/EditExpressionDialog.h +++ b/Gui/EditExpressionDialog.h @@ -39,7 +39,7 @@ #include "Gui/EditScriptDialog.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class EditExpressionDialog : public EditScriptDialog @@ -75,6 +75,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON virtual QString getCustomHelp() OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_EditExpressionDialog_h diff --git a/Gui/EditScriptDialog.cpp b/Gui/EditScriptDialog.cpp index dbc7495ff8..df26995c34 100644 --- a/Gui/EditScriptDialog.cpp +++ b/Gui/EditScriptDialog.cpp @@ -92,7 +92,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/TimeLineGui.h" #include "Gui/ViewerTab.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct EditScriptDialogPrivate @@ -350,7 +350,7 @@ EditScriptDialog::keyPressEvent(QKeyEvent* e) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_EditScriptDialog.cpp" diff --git a/Gui/EditScriptDialog.h b/Gui/EditScriptDialog.h index 5eaa35bc62..3e30d7d2e4 100644 --- a/Gui/EditScriptDialog.h +++ b/Gui/EditScriptDialog.h @@ -44,7 +44,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct EditScriptDialogPrivate; class EditScriptDialog @@ -97,6 +97,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_EditScriptDialog_h diff --git a/Gui/ExportGroupTemplateDialog.cpp b/Gui/ExportGroupTemplateDialog.cpp index 28f09f742d..3befd5d336 100644 --- a/Gui/ExportGroupTemplateDialog.cpp +++ b/Gui/ExportGroupTemplateDialog.cpp @@ -53,7 +53,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/SpinBox.h" #include "Gui/GuiDefines.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class PlaceHolderTextEdit : public QTextEdit @@ -431,7 +431,7 @@ ExportGroupTemplateDialog::onOkClicked() accept(); } // ExportGroupTemplateDialog::onOkClicked -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ExportGroupTemplateDialog.cpp" diff --git a/Gui/ExportGroupTemplateDialog.h b/Gui/ExportGroupTemplateDialog.h index feef768b16..3714615669 100644 --- a/Gui/ExportGroupTemplateDialog.h +++ b/Gui/ExportGroupTemplateDialog.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ExportGroupTemplateDialogPrivate; class ExportGroupTemplateDialog @@ -70,6 +70,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Natron_Gui_ExportGroupTemplateDialog_h diff --git a/Gui/FileTypeMainWindow_win.cpp b/Gui/FileTypeMainWindow_win.cpp index e908dafbc9..49b98aabf6 100644 --- a/Gui/FileTypeMainWindow_win.cpp +++ b/Gui/FileTypeMainWindow_win.cpp @@ -52,7 +52,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // —— construction —————————————————————————— DocumentWindow::DocumentWindow(QWidget* parent, @@ -358,6 +358,6 @@ DocumentWindow::executeDdeCommand(const QString& command, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif //__NATRON_WIN32__ diff --git a/Gui/FileTypeMainWindow_win.h b/Gui/FileTypeMainWindow_win.h index e2d9bbb5a5..9babadf2d4 100644 --- a/Gui/FileTypeMainWindow_win.h +++ b/Gui/FileTypeMainWindow_win.h @@ -45,7 +45,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // —— local includes —————————————————————————- // —— pre defines ——————————————————————————- @@ -275,7 +275,7 @@ class DocumentWindow // —— not allowed members ——————————————————————- }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT Q_DECLARE_OPERATORS_FOR_FLAGS(NATRON_NAMESPACE::DocumentWindow::DdeCommands) diff --git a/Gui/FloatingWidget.cpp b/Gui/FloatingWidget.cpp index f18797d1de..070557d7c1 100644 --- a/Gui/FloatingWidget.cpp +++ b/Gui/FloatingWidget.cpp @@ -38,7 +38,7 @@ #include "Gui/Splitter.h" #include "Gui/TabWidget.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER FloatingWidget::FloatingWidget(Gui* gui, QWidget* parent) @@ -163,7 +163,7 @@ FloatingWidget::closeEvent(QCloseEvent* e) QWidget::closeEvent(e); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_FloatingWidget.cpp" diff --git a/Gui/FloatingWidget.h b/Gui/FloatingWidget.h index 5891950bc4..45edd76253 100644 --- a/Gui/FloatingWidget.h +++ b/Gui/FloatingWidget.h @@ -44,7 +44,7 @@ CLANG_DIAG_ON(uninitialized) #define kMainSplitterObjectName "ToolbarSplitter" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*This class represents a floating pane that embeds a widget*/ class FloatingWidget @@ -92,6 +92,6 @@ public Q_SLOTS: Gui* _gui; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_FloatingWidget_h diff --git a/Gui/GroupBoxLabel.cpp b/Gui/GroupBoxLabel.cpp index 54817df941..333d277feb 100644 --- a/Gui/GroupBoxLabel.cpp +++ b/Gui/GroupBoxLabel.cpp @@ -79,7 +79,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; @@ -105,7 +105,7 @@ GroupBoxLabel::setChecked(bool b) setPixmap(pix); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_GroupBoxLabel.cpp" diff --git a/Gui/GroupBoxLabel.h b/Gui/GroupBoxLabel.h index 107b954760..a5d117c334 100644 --- a/Gui/GroupBoxLabel.h +++ b/Gui/GroupBoxLabel.h @@ -31,7 +31,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class GroupBoxLabel : public Label @@ -72,6 +72,6 @@ public Q_SLOTS: bool _checked; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef NATRON_GUI_GROUPBOXLABEL_H diff --git a/Gui/Gui.cpp b/Gui/Gui.cpp index 7ea241eb81..f8cc6efbdb 100644 --- a/Gui/Gui.cpp +++ b/Gui/Gui.cpp @@ -56,7 +56,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/ToolButton.h" #include "Gui/RenderStatsDialog.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // Helper function: Get the icon with the given name from the icon theme. @@ -764,7 +764,7 @@ Gui::dockClicked() } #endif -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_Gui.cpp" diff --git a/Gui/Gui.h b/Gui/Gui.h index 38bad991ae..e7f938dc90 100644 --- a/Gui/Gui.h +++ b/Gui/Gui.h @@ -56,7 +56,7 @@ CLANG_DIAG_ON(uninitialized) #define kMainSplitterObjectName "ToolbarSplitter" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct GuiPrivate; @@ -720,6 +720,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_Gui_h diff --git a/Gui/Gui05.cpp b/Gui/Gui05.cpp index cb7f3bc7de..679e3a7b81 100644 --- a/Gui/Gui05.cpp +++ b/Gui/Gui05.cpp @@ -60,7 +60,7 @@ #include "Gui/ViewerTab.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -392,4 +392,4 @@ Gui::wipeLayout() } } // Gui::wipeLayout -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/Gui10.cpp b/Gui/Gui10.cpp index 1c288c2f49..9183921f63 100644 --- a/Gui/Gui10.cpp +++ b/Gui/Gui10.cpp @@ -63,7 +63,7 @@ #endif #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void Gui::createDefaultLayout1() @@ -376,5 +376,5 @@ Gui::setApplicationConsoleActionVisible(bool visible) #endif } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/Gui15.cpp b/Gui/Gui15.cpp index 0a541ed193..b86758f542 100644 --- a/Gui/Gui15.cpp +++ b/Gui/Gui15.cpp @@ -47,7 +47,7 @@ #include "Gui/SequenceFileDialog.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -439,4 +439,4 @@ Gui::setVisibleProjectSettingsPanel() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/Gui20.cpp b/Gui/Gui20.cpp index 2508abb648..ee256b5f5d 100644 --- a/Gui/Gui20.cpp +++ b/Gui/Gui20.cpp @@ -75,7 +75,7 @@ #define PLUGIN_GROUP_DEFAULT_ICON_PATH NATRON_IMAGES_PATH "GroupingIcons/Set" NATRON_ICON_SET_NUMBER "/other_grouping_" NATRON_ICON_SET_NUMBER ".png" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER static std::string namedGroupsOrdered[NAMED_PLUGIN_GROUP_NO] = { PLUGIN_GROUP_IMAGE, @@ -1461,5 +1461,5 @@ Gui::isAboutToClose() const return _imp->_aboutToClose; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/Gui30.cpp b/Gui/Gui30.cpp index c7a7e02ebb..785f3649f4 100644 --- a/Gui/Gui30.cpp +++ b/Gui/Gui30.cpp @@ -59,7 +59,7 @@ #include "Gui/TabWidget.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -696,4 +696,4 @@ Gui::onCurrentUndoStackChanged(QUndoStack* stack) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/Gui40.cpp b/Gui/Gui40.cpp index c1e56462bc..c51f28b6e5 100644 --- a/Gui/Gui40.cpp +++ b/Gui/Gui40.cpp @@ -72,7 +72,7 @@ #include "Gui/NodeSettingsPanel.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -960,4 +960,4 @@ Gui::renderViewersAndRefreshKnobsAfterTimelineTimeChange(SequenceTime time, } } // Gui::renderViewersAndRefreshKnobsAfterTimelineTimeChange -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/Gui50.cpp b/Gui/Gui50.cpp index f50284ebc7..a36ada8075 100644 --- a/Gui/Gui50.cpp +++ b/Gui/Gui50.cpp @@ -102,7 +102,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/PropertiesBinWrapper.h" #include "Gui/Histogram.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -1287,4 +1287,4 @@ Gui::dropEvent(QDropEvent* e) handleOpenFilesFromUrls( urls, mapToGlobal( e->pos() ) ); } // dropEvent -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/GuiAppInstance.cpp b/Gui/GuiAppInstance.cpp index 8abae6c001..a0299b334a 100644 --- a/Gui/GuiAppInstance.cpp +++ b/Gui/GuiAppInstance.cpp @@ -65,7 +65,7 @@ #include "Gui/ScriptEditor.h" #include "Gui/ViewerGL.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct RotoPaintData { @@ -1656,7 +1656,7 @@ GuiAppInstance::reloadScriptEditorFonts() _imp->_gui->getScriptEditor()->reloadFont(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_GuiAppInstance.cpp" diff --git a/Gui/GuiAppInstance.h b/Gui/GuiAppInstance.h index cebee5cbfa..8667b3aa47 100644 --- a/Gui/GuiAppInstance.h +++ b/Gui/GuiAppInstance.h @@ -41,7 +41,7 @@ class QDrag; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief This little struct contains what enables file dialogs to show previews. @@ -279,6 +279,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // GUIAPPINSTANCE_H diff --git a/Gui/GuiApplicationManager.cpp b/Gui/GuiApplicationManager.cpp index 718d0b14ab..9cc1317ffc 100644 --- a/Gui/GuiApplicationManager.cpp +++ b/Gui/GuiApplicationManager.cpp @@ -57,7 +57,7 @@ CLANG_DIAG_ON(uninitialized) #define NATRON_PIXELS_FOR_DPI_DEFAULT 72. #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER GuiApplicationManager::GuiApplicationManager() @@ -1153,7 +1153,7 @@ GuiApplicationManager::updateAboutWindowLibrariesVersion() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_GuiApplicationManager.cpp" diff --git a/Gui/GuiApplicationManager.h b/Gui/GuiApplicationManager.h index 1eac78558c..f4906bf0c9 100644 --- a/Gui/GuiApplicationManager.h +++ b/Gui/GuiApplicationManager.h @@ -65,7 +65,7 @@ #define getKeybind(group, action) ( appPTR->getKeySequenceForAction(group, action) ) -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PythonUserCommand { @@ -238,7 +238,7 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_GuiApplicationManager_h diff --git a/Gui/GuiApplicationManager10.cpp b/Gui/GuiApplicationManager10.cpp index 6163e6710e..c7bbc10930 100644 --- a/Gui/GuiApplicationManager10.cpp +++ b/Gui/GuiApplicationManager10.cpp @@ -104,7 +104,7 @@ Q_INIT_RESOURCE_EXTERN(GuiResources); //in a way. This way the user will get prompted to restore default shortcuts on next launch #define NATRON_SHORTCUTS_DEFAULT_VERSION 8 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -1207,4 +1207,4 @@ GuiApplicationManager::reloadScriptEditorFonts() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/GuiApplicationManagerPrivate.cpp b/Gui/GuiApplicationManagerPrivate.cpp index d796904c5a..c4ec44fcc8 100644 --- a/Gui/GuiApplicationManagerPrivate.cpp +++ b/Gui/GuiApplicationManagerPrivate.cpp @@ -40,7 +40,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/DocumentationManager.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER GuiApplicationManagerPrivate::GuiApplicationManagerPrivate(GuiApplicationManager* publicInterface) @@ -444,4 +444,4 @@ GuiApplicationManagerPrivate::updateFontConfigCache() qDebug() << "Fontconfig fonts built"; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/GuiApplicationManagerPrivate.h b/Gui/GuiApplicationManagerPrivate.h index b2066d7a5e..60c6030b9b 100644 --- a/Gui/GuiApplicationManagerPrivate.h +++ b/Gui/GuiApplicationManagerPrivate.h @@ -54,7 +54,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" #include "Gui/PreviewThread.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct KnobsClipBoard { @@ -146,6 +146,6 @@ struct GuiApplicationManagerPrivate void updateFontConfigCache(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef Gui_ApplicationManagerPrivate_h diff --git a/Gui/GuiFwd.h b/Gui/GuiFwd.h index 0ee2cf0d47..58d15aab27 100644 --- a/Gui/GuiFwd.h +++ b/Gui/GuiFwd.h @@ -94,7 +94,7 @@ class QWidget; // Natron Gui -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class AboutWindow; class ActionWithShortcut; class AnimatedCheckBox; @@ -200,12 +200,12 @@ namespace QtMac { bool isHighDPIInternal(const QWidget* w); } -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_PYTHON_NAMESPACE_ENTER class GuiApp; class PyModalDialog; class PyPanel; class PyTabWidget; -NATRON_PYTHON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT typedef boost::shared_ptr GuiAppInstPtr; typedef boost::shared_ptr NodeViewerContextPtr; @@ -216,7 +216,7 @@ typedef std::list NodesGuiList; typedef boost::shared_ptr ProgressTaskInfoPtr; typedef boost::shared_ptr KnobGuiPtr; typedef boost::weak_ptr KnobGuiWPtr; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Natron_Gui_GuiFwd_h diff --git a/Gui/GuiPrivate.cpp b/Gui/GuiPrivate.cpp index ba30385bb1..c6223b0692 100644 --- a/Gui/GuiPrivate.cpp +++ b/Gui/GuiPrivate.cpp @@ -127,7 +127,7 @@ GCC_DIAG_ON(unused-parameter) #include "Gui/ViewerTab.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER GuiPrivate::GuiPrivate(const GuiAppInstPtr& app, Gui* gui) : _gui(gui) @@ -769,4 +769,4 @@ GuiPrivate::findActionRecursive(int i, return 0; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/GuiPrivate.h b/Gui/GuiPrivate.h index b8197a2c81..8e799cb62a 100644 --- a/Gui/GuiPrivate.h +++ b/Gui/GuiPrivate.h @@ -55,7 +55,7 @@ CLANG_DIAG_ON(uninitialized) #define kPropertiesBinName "properties" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #define NATRON_CONNECT_INPUT_NB (2 * 10) @@ -297,6 +297,6 @@ struct GuiPrivate bool checkProjectLockAndWarn(const QString& projectPath, const QString& projectName); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_GuiPrivate_h diff --git a/Gui/Histogram.cpp b/Gui/Histogram.cpp index f8770065d8..f8b0836624 100644 --- a/Gui/Histogram.cpp +++ b/Gui/Histogram.cpp @@ -65,7 +65,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/ZoomContext.h" #include "Gui/ticks.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -2030,7 +2030,7 @@ Histogram::hideViewerCursor() update(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_Histogram.cpp" diff --git a/Gui/Histogram.h b/Gui/Histogram.h index 33d3c00fd9..d07f413fe4 100644 --- a/Gui/Histogram.h +++ b/Gui/Histogram.h @@ -43,7 +43,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/PanelWidget.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @class An histogram view in the histograms gui. @@ -119,6 +119,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // HISTOGRAM_H diff --git a/Gui/HostOverlay.cpp b/Gui/HostOverlay.cpp index a49e86ee87..295d11541e 100644 --- a/Gui/HostOverlay.cpp +++ b/Gui/HostOverlay.cpp @@ -61,7 +61,7 @@ CLANG_DIAG_ON(deprecated) #define M_PI 3.14159265358979323846264338327950288419717 #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER DefaultInteractI::DefaultInteractI(HostOverlay* overlay) : _overlay(overlay) @@ -2986,4 +2986,4 @@ HostOverlay::isEmpty() const return false; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/HostOverlay.h b/Gui/HostOverlay.h index 6387b5c457..816c72409b 100644 --- a/Gui/HostOverlay.h +++ b/Gui/HostOverlay.h @@ -38,7 +38,7 @@ #include "Engine/OfxOverlayInteract.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // defined below: struct HostOverlayPrivate; @@ -242,6 +242,6 @@ class HostOverlay boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_HostOverlay_h diff --git a/Gui/InfoViewerWidget.cpp b/Gui/InfoViewerWidget.cpp index 0f0288b83e..648f3ac828 100644 --- a/Gui/InfoViewerWidget.cpp +++ b/Gui/InfoViewerWidget.cpp @@ -42,7 +42,7 @@ #include "Gui/Label.h" using std::cout; using std::endl; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER InfoViewerWidget::InfoViewerWidget(const QString & description, QWidget* parent) @@ -440,7 +440,7 @@ InfoViewerWidget::setImageFormat(const ImageComponents& comp, _comp = comp; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_InfoViewerWidget.cpp" diff --git a/Gui/InfoViewerWidget.h b/Gui/InfoViewerWidget.h index 9437ed7c85..37b1fc54d7 100644 --- a/Gui/InfoViewerWidget.h +++ b/Gui/InfoViewerWidget.h @@ -40,7 +40,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class InfoViewerWidget : public QWidget @@ -107,6 +107,6 @@ public Q_SLOTS: double currentColor[4]; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif /* defined(NATRON_GUI_INFOVIEWERWIDGET_H_) */ diff --git a/Gui/KnobGui.cpp b/Gui/KnobGui.cpp index e6052ac420..de46e82cf7 100644 --- a/Gui/KnobGui.cpp +++ b/Gui/KnobGui.cpp @@ -42,7 +42,7 @@ #include "Gui/ClickableLabel.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /////////////// KnobGui @@ -865,7 +865,7 @@ KnobGui::createDuplicateOnNode(EffectInstance* effect, return ret; } // KnobGui::createDuplicateOnNode -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGui.cpp" diff --git a/Gui/KnobGui.h b/Gui/KnobGui.h index 1c87b6a76c..b9f2fd49b6 100644 --- a/Gui/KnobGui.h +++ b/Gui/KnobGui.h @@ -61,7 +61,7 @@ CLANG_DIAG_ON(uninitialized) //Define this if you want the spinbox to clamp to the plugin defined range //#define SPINBOX_TAKE_PLUGIN_RANGE_INTO_ACCOUNT -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct KnobGuiPrivate; @@ -512,6 +512,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_KNOBGUI_H diff --git a/Gui/KnobGui10.cpp b/Gui/KnobGui10.cpp index db7483f6ac..aa4ba4b8a2 100644 --- a/Gui/KnobGui10.cpp +++ b/Gui/KnobGui10.cpp @@ -38,7 +38,7 @@ #include "Gui/KnobGuiPrivate.h" #include "Gui/KnobUndoCommand.h" // SetExpressionCommand... -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -779,4 +779,4 @@ KnobGui::getFieldContainer() const return _imp->field; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/KnobGui20.cpp b/Gui/KnobGui20.cpp index b9390bd163..7ea8c1cad0 100644 --- a/Gui/KnobGui20.cpp +++ b/Gui/KnobGui20.cpp @@ -42,7 +42,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/KnobUndoCommand.h" // SetExpressionCommand... -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void KnobGui::onInternalValueChanged(ViewSpec /*view*/, @@ -945,4 +945,4 @@ KnobGui::onDimensionNameChanged(int dimension) refreshDimensionName(dimension); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/KnobGuiBool.cpp b/Gui/KnobGuiBool.cpp index 37108f2569..2b3b2d316f 100644 --- a/Gui/KnobGuiBool.cpp +++ b/Gui/KnobGuiBool.cpp @@ -78,7 +78,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; //==========================KnobBool_GUI====================================== @@ -392,7 +392,7 @@ KnobGuiBool::updateToolTip() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiBool.cpp" diff --git a/Gui/KnobGuiBool.h b/Gui/KnobGuiBool.h index 236451e372..54cc9f5b2a 100644 --- a/Gui/KnobGuiBool.h +++ b/Gui/KnobGuiBool.h @@ -55,7 +55,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/Label.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //================================ @@ -148,6 +148,6 @@ public Q_SLOTS: boost::weak_ptr _knob; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_KnobGuiBool_h diff --git a/Gui/KnobGuiButton.cpp b/Gui/KnobGuiButton.cpp index af4222b37c..2782173cfd 100644 --- a/Gui/KnobGuiButton.cpp +++ b/Gui/KnobGuiButton.cpp @@ -77,7 +77,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; //=============================BUTTON_KNOB_GUI=================================== @@ -247,7 +247,7 @@ KnobGuiButton::onLabelChangedInternal() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiButton.cpp" diff --git a/Gui/KnobGuiButton.h b/Gui/KnobGuiButton.h index 44740a1942..a6e1523080 100644 --- a/Gui/KnobGuiButton.h +++ b/Gui/KnobGuiButton.h @@ -51,7 +51,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/Label.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //================================ class KnobGuiButton @@ -104,6 +104,6 @@ public Q_SLOTS: boost::weak_ptr _knob; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_KnobGuiButton_h diff --git a/Gui/KnobGuiChoice.cpp b/Gui/KnobGuiChoice.cpp index 5b91f1eb69..1a1632b554 100644 --- a/Gui/KnobGuiChoice.cpp +++ b/Gui/KnobGuiChoice.cpp @@ -81,7 +81,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; @@ -516,7 +516,7 @@ KnobGuiChoice::reflectModificationsState() _comboBox->setAltered(!hasModif); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiChoice.cpp" diff --git a/Gui/KnobGuiChoice.h b/Gui/KnobGuiChoice.h index 55373738ae..f24e1a1e7a 100644 --- a/Gui/KnobGuiChoice.h +++ b/Gui/KnobGuiChoice.h @@ -56,7 +56,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/ComboBox.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class KnobComboBox : public ComboBox @@ -142,6 +142,6 @@ public Q_SLOTS: boost::weak_ptr _knob; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_KnobGuiChoice_h diff --git a/Gui/KnobGuiColor.cpp b/Gui/KnobGuiColor.cpp index bc312a79ed..0c976779ac 100644 --- a/Gui/KnobGuiColor.cpp +++ b/Gui/KnobGuiColor.cpp @@ -81,7 +81,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ColorPickerLabel::ColorPickerLabel(KnobGuiColor* knob, @@ -543,7 +543,7 @@ KnobGuiColor::isAutoFoldDimensionsEnabled() const return knob->getDimension() == 3; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiColor.cpp" diff --git a/Gui/KnobGuiColor.h b/Gui/KnobGuiColor.h index bb48ab3e0e..555b308a17 100644 --- a/Gui/KnobGuiColor.h +++ b/Gui/KnobGuiColor.h @@ -51,7 +51,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/Label.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //================================ @@ -189,6 +189,6 @@ public Q_SLOTS: bool _useSimplifiedUI; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_KnobGuiColor_h diff --git a/Gui/KnobGuiContainerHelper.cpp b/Gui/KnobGuiContainerHelper.cpp index c926c54fe9..a9f91254ba 100644 --- a/Gui/KnobGuiContainerHelper.cpp +++ b/Gui/KnobGuiContainerHelper.cpp @@ -49,7 +49,7 @@ CLANG_DIAG_ON(uninitialized) #define NATRON_SETTINGS_VERTICAL_SPACING_PIXELS 3 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct KnobGuiContainerHelperPrivate { @@ -1231,7 +1231,7 @@ KnobGuiContainerSignalsHandler::onPageLabelChangedInternally() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiContainerHelper.cpp" diff --git a/Gui/KnobGuiContainerHelper.h b/Gui/KnobGuiContainerHelper.h index d8be29dcb6..c3592d92c7 100644 --- a/Gui/KnobGuiContainerHelper.h +++ b/Gui/KnobGuiContainerHelper.h @@ -45,7 +45,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" #include "Gui/KnobGuiContainerI.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef std::list, KnobGuiPtr> > KnobsGuiMapping; @@ -348,6 +348,6 @@ class KnobGuiContainerHelper boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // KNOBGUICONTAINERHELPER_H diff --git a/Gui/KnobGuiContainerI.h b/Gui/KnobGuiContainerI.h index db0b3d7cfe..79b476d00c 100644 --- a/Gui/KnobGuiContainerI.h +++ b/Gui/KnobGuiContainerI.h @@ -29,7 +29,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class KnobGuiContainerI { @@ -73,6 +73,6 @@ class KnobGuiContainerI QWidget* _containerWidget; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // KNOBGUICONTAINERI_H diff --git a/Gui/KnobGuiFactory.cpp b/Gui/KnobGuiFactory.cpp index f56eaa53c3..f41717229e 100644 --- a/Gui/KnobGuiFactory.cpp +++ b/Gui/KnobGuiFactory.cpp @@ -51,7 +51,7 @@ #include "Gui/KnobGuiParametric.h" #include "Gui/DockablePanel.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; using std::pair; @@ -128,4 +128,4 @@ KnobGuiFactory::createGuiForKnob(KnobPtr knob, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/KnobGuiFactory.h b/Gui/KnobGuiFactory.h index 13140c0965..18af186f7b 100644 --- a/Gui/KnobGuiFactory.h +++ b/Gui/KnobGuiFactory.h @@ -36,7 +36,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /******************************KNOB_FACTORY**************************************/ //Maybe the factory should move to a separate file since it is used to create KnobGui aswell @@ -64,6 +64,6 @@ class KnobGuiFactory void loadBultinKnobs(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_KNOBGUIFACTORY_H diff --git a/Gui/KnobGuiFile.cpp b/Gui/KnobGuiFile.cpp index 23c53f9bdd..4b843c919b 100644 --- a/Gui/KnobGuiFile.cpp +++ b/Gui/KnobGuiFile.cpp @@ -59,7 +59,7 @@ #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //===========================FILE_KNOB_GUI===================================== @@ -1150,7 +1150,7 @@ KnobGuiPath::updateToolTip() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiFile.cpp" diff --git a/Gui/KnobGuiFile.h b/Gui/KnobGuiFile.h index a1c1cd9cb3..490f94ff11 100644 --- a/Gui/KnobGuiFile.h +++ b/Gui/KnobGuiFile.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/KnobGuiTable.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //================================ class KnobGuiFile @@ -253,7 +253,7 @@ public Q_SLOTS: boost::weak_ptr _knob; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_KnobGuiFile_h diff --git a/Gui/KnobGuiGroup.cpp b/Gui/KnobGuiGroup.cpp index ce70dd7fa2..4a818ca14c 100644 --- a/Gui/KnobGuiGroup.cpp +++ b/Gui/KnobGuiGroup.cpp @@ -80,7 +80,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; @@ -320,7 +320,7 @@ KnobGuiGroup::getKnob() const return _knob.lock(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiGroup.cpp" diff --git a/Gui/KnobGuiGroup.h b/Gui/KnobGuiGroup.h index 977d855233..e84d4e60a2 100644 --- a/Gui/KnobGuiGroup.h +++ b/Gui/KnobGuiGroup.h @@ -51,7 +51,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/Label.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class KnobGuiGroup : public KnobGui @@ -116,6 +116,6 @@ public Q_SLOTS: boost::weak_ptr _knob; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_KnobGuiGroup_h diff --git a/Gui/KnobGuiParametric.cpp b/Gui/KnobGuiParametric.cpp index 95a9f656ed..59433ac947 100644 --- a/Gui/KnobGuiParametric.cpp +++ b/Gui/KnobGuiParametric.cpp @@ -80,7 +80,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; @@ -366,7 +366,7 @@ KnobGuiParametric::restoreOpenGLContext() _curveWidget->restoreOpenGLContext(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiParametric.cpp" diff --git a/Gui/KnobGuiParametric.h b/Gui/KnobGuiParametric.h index 5c640f5a9b..cdce7e3ec1 100644 --- a/Gui/KnobGuiParametric.h +++ b/Gui/KnobGuiParametric.h @@ -51,7 +51,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/Label.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class KnobGuiParametric : public KnobGui @@ -133,6 +133,6 @@ public Q_SLOTS: boost::weak_ptr _knob; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_KnobGuiParametric_h diff --git a/Gui/KnobGuiPrivate.cpp b/Gui/KnobGuiPrivate.cpp index eae5ca9753..582b8b1bc8 100644 --- a/Gui/KnobGuiPrivate.cpp +++ b/Gui/KnobGuiPrivate.cpp @@ -27,7 +27,7 @@ #include "Gui/NodeViewerContext.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER KnobGuiPrivate::KnobGuiPrivate(KnobGuiContainerI* container) @@ -62,5 +62,5 @@ KnobGuiPrivate::removeFromKnobsOnSameLineVector(const KnobPtr& knob) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/KnobGuiSeparator.cpp b/Gui/KnobGuiSeparator.cpp index f0c4db0528..db2db34637 100644 --- a/Gui/KnobGuiSeparator.cpp +++ b/Gui/KnobGuiSeparator.cpp @@ -77,7 +77,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; //=============================SEPARATOR_KNOB_GUI=================================== @@ -145,4 +145,4 @@ KnobGuiSeparator::getKnob() const return _knob.lock(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/KnobGuiSeparator.h b/Gui/KnobGuiSeparator.h index 3a0e2ac9d4..b7d3282e79 100644 --- a/Gui/KnobGuiSeparator.h +++ b/Gui/KnobGuiSeparator.h @@ -51,7 +51,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/Label.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class KnobGuiSeparator : public KnobGui @@ -101,6 +101,6 @@ class KnobGuiSeparator boost::weak_ptr _knob; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_KnobGuiSeparator_h diff --git a/Gui/KnobGuiString.cpp b/Gui/KnobGuiString.cpp index cbe9b6b2f4..de93763d41 100644 --- a/Gui/KnobGuiString.cpp +++ b/Gui/KnobGuiString.cpp @@ -79,7 +79,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; @@ -1371,7 +1371,7 @@ KnobGuiString::reflectModificationsState() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiString.cpp" diff --git a/Gui/KnobGuiString.h b/Gui/KnobGuiString.h index ba2e3223e0..7351d1cdaf 100644 --- a/Gui/KnobGuiString.h +++ b/Gui/KnobGuiString.h @@ -57,7 +57,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class AnimatingTextEdit : public QTextEdit @@ -270,6 +270,6 @@ public Q_SLOTS: boost::weak_ptr _knob; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_KnobGuiString_h diff --git a/Gui/KnobGuiTable.cpp b/Gui/KnobGuiTable.cpp index eb810138f0..5eea0acd0b 100644 --- a/Gui/KnobGuiTable.cpp +++ b/Gui/KnobGuiTable.cpp @@ -45,7 +45,7 @@ #include "Gui/NewLayerDialog.h" #include "Gui/TableModelView.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -775,7 +775,7 @@ KnobGuiLayers::getKnob() const return _knob.lock(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiTable.cpp" diff --git a/Gui/KnobGuiTable.h b/Gui/KnobGuiTable.h index 7f5a7cb3fd..fffe054782 100644 --- a/Gui/KnobGuiTable.h +++ b/Gui/KnobGuiTable.h @@ -34,7 +34,7 @@ #include "Gui/GuiFwd.h" #include "Gui/KnobGui.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct KnobGuiTablePrivate; class KnobGuiTable @@ -150,6 +150,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON boost::weak_ptr _knob; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_KnobGuiLayer_h diff --git a/Gui/KnobGuiValue.cpp b/Gui/KnobGuiValue.cpp index db8cb65cba..0d4b64667e 100644 --- a/Gui/KnobGuiValue.cpp +++ b/Gui/KnobGuiValue.cpp @@ -80,7 +80,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct KnobGuiValuePrivate { @@ -1364,7 +1364,7 @@ KnobGuiInt::getIncrements(std::vector* increments) const } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_KnobGuiValue.cpp" diff --git a/Gui/KnobGuiValue.h b/Gui/KnobGuiValue.h index 9d107161b4..26fd3bdafb 100644 --- a/Gui/KnobGuiValue.h +++ b/Gui/KnobGuiValue.h @@ -51,7 +51,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/Label.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct KnobGuiValuePrivate; class KnobGuiValue @@ -242,7 +242,7 @@ class KnobGuiInt virtual void getIncrements(std::vector* increments) const OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // KNOBGUIVALUE_H diff --git a/Gui/KnobUndoCommand.cpp b/Gui/KnobUndoCommand.cpp index 7a96f48f3e..c935145e58 100644 --- a/Gui/KnobUndoCommand.cpp +++ b/Gui/KnobUndoCommand.cpp @@ -49,7 +49,7 @@ GCC_DIAG_ON(unused-parameter) #include "Gui/GuiApplicationManager.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PasteUndoCommandPrivate { KnobGuiWPtr knob; @@ -742,4 +742,4 @@ SetExpressionCommand::redo() setText( tr("Set expression") ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/KnobUndoCommand.h b/Gui/KnobUndoCommand.h index 6f9fdebbba..d56d9c13fb 100644 --- a/Gui/KnobUndoCommand.h +++ b/Gui/KnobUndoCommand.h @@ -58,7 +58,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiAppInstance.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //================================================================ @@ -429,6 +429,6 @@ class SetExpressionCommand int _dimension; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_KNOBUNDOCOMMAND_H diff --git a/Gui/KnobWidgetDnD.cpp b/Gui/KnobWidgetDnD.cpp index d6b90d0a97..b2d23849ae 100644 --- a/Gui/KnobWidgetDnD.cpp +++ b/Gui/KnobWidgetDnD.cpp @@ -55,7 +55,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiMacros.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct KnobWidgetDnDPrivate @@ -493,4 +493,4 @@ KnobWidgetDnD::focusOut() _imp->userInputSinceFocusIn = false; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/KnobWidgetDnD.h b/Gui/KnobWidgetDnD.h index 09e20c38d6..d8a5bb159b 100644 --- a/Gui/KnobWidgetDnD.h +++ b/Gui/KnobWidgetDnD.h @@ -39,7 +39,7 @@ #define KNOB_DND_MIME_DATA_KEY "KnobLink" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct KnobWidgetDnDPrivate; class KnobWidgetDnD : public boost::enable_shared_from_this @@ -85,6 +85,6 @@ class KnobWidgetDnD : public boost::enable_shared_from_this boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // KNOBWIDGETDND_H diff --git a/Gui/Label.cpp b/Gui/Label.cpp index 67d7347e62..f38b80899f 100644 --- a/Gui/Label.cpp +++ b/Gui/Label.cpp @@ -29,7 +29,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER Label::Label(const QString &text, QWidget *parent, @@ -75,7 +75,7 @@ Label::setAltered(bool a) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_Label.cpp" diff --git a/Gui/Label.h b/Gui/Label.h index e4db6a10a3..c86f43e899 100644 --- a/Gui/Label.h +++ b/Gui/Label.h @@ -36,7 +36,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class Label : public QLabel @@ -71,6 +71,6 @@ class Label bool altered; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_-LABEL_H diff --git a/Gui/LineEdit.cpp b/Gui/LineEdit.cpp index 9deb70a1cd..542d0b2b7b 100644 --- a/Gui/LineEdit.cpp +++ b/Gui/LineEdit.cpp @@ -48,7 +48,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiApplicationManager.h" #include "Gui/GuiDefines.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER LineEdit::LineEdit(QWidget* parent) : QLineEdit(parent) @@ -180,7 +180,7 @@ LineEdit::keyPressEvent(QKeyEvent* e) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_LineEdit.cpp" diff --git a/Gui/LineEdit.h b/Gui/LineEdit.h index 3287ef214e..18a071c634 100644 --- a/Gui/LineEdit.h +++ b/Gui/LineEdit.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class LineEdit : public QLineEdit @@ -104,6 +104,6 @@ public Q_SLOTS: bool altered; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ifndef NATRON_GUI_LINEEDIT_H diff --git a/Gui/LinkToKnobDialog.cpp b/Gui/LinkToKnobDialog.cpp index b3537637fe..43d04c0378 100644 --- a/Gui/LinkToKnobDialog.cpp +++ b/Gui/LinkToKnobDialog.cpp @@ -91,7 +91,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/TimeLineGui.h" #include "Gui/ViewerTab.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct LinkToKnobDialogPrivate { @@ -236,7 +236,7 @@ LinkToKnobDialog::getSelectedKnobs() const } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_LinkToKnobDialog.cpp" diff --git a/Gui/LinkToKnobDialog.h b/Gui/LinkToKnobDialog.h index 98d36e2c8b..595ebe9605 100644 --- a/Gui/LinkToKnobDialog.h +++ b/Gui/LinkToKnobDialog.h @@ -45,7 +45,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct LinkToKnobDialogPrivate; @@ -74,6 +74,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_LinkToKnobDialog_h diff --git a/Gui/LogWindow.cpp b/Gui/LogWindow.cpp index 809d2c46dd..039507f017 100644 --- a/Gui/LogWindow.cpp +++ b/Gui/LogWindow.cpp @@ -44,7 +44,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/DialogButtonBox.h" #include "Gui/GuiApplicationManager.h" // appPTR -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER LogWindow::LogWindow(QWidget* parent) : QWidget(parent, Qt::Dialog | Qt::WindowStaysOnTopHint) @@ -174,7 +174,7 @@ LogWindowModal::keyPressEvent(QKeyEvent* e) QDialog::keyPressEvent(e); } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_LogWindow.cpp" diff --git a/Gui/LogWindow.h b/Gui/LogWindow.h index dee28f77de..069cd50dbc 100644 --- a/Gui/LogWindow.h +++ b/Gui/LogWindow.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class LogWindow : public QWidget @@ -90,6 +90,6 @@ public Q_SLOTS: virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_LogWindow_h diff --git a/Gui/ManageUserParamsDialog.cpp b/Gui/ManageUserParamsDialog.cpp index 06d5783a66..ef9fc75f23 100644 --- a/Gui/ManageUserParamsDialog.cpp +++ b/Gui/ManageUserParamsDialog.cpp @@ -53,7 +53,7 @@ #include "Gui/NodeSettingsPanel.h" #include "Gui/PickKnobDialog.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -748,7 +748,7 @@ ManageUserParamsDialog::onSelectionChanged() _imp->downButton->setEnabled(selection.size() == 1); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ManageUserParamsDialog.cpp" diff --git a/Gui/ManageUserParamsDialog.h b/Gui/ManageUserParamsDialog.h index a9b1a09efd..02f30a0428 100644 --- a/Gui/ManageUserParamsDialog.h +++ b/Gui/ManageUserParamsDialog.h @@ -39,7 +39,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ManageUserParamsDialogPrivate; class ManageUserParamsDialog @@ -89,6 +89,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_ManageUserParamsDialog_h diff --git a/Gui/Menu.cpp b/Gui/Menu.cpp index 13630495f6..70434dfd61 100644 --- a/Gui/Menu.cpp +++ b/Gui/Menu.cpp @@ -38,7 +38,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON CLANG_DIAG_ON(deprecated) CLANG_DIAG_ON(uninitialized) -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER Menu::Menu(const QString &title, QWidget *parent) : QMenu(title, parent) @@ -78,4 +78,4 @@ MenuWithToolTips::event (QEvent* e) return QMenu::event(e); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/Menu.h b/Gui/Menu.h index 810572c485..9297d6394b 100644 --- a/Gui/Menu.h +++ b/Gui/Menu.h @@ -36,7 +36,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class Menu : public QMenu @@ -60,6 +60,6 @@ class MenuWithToolTips bool event(QEvent* e); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_MENUWITHTOOLTIPS_H diff --git a/Gui/MessageBox.cpp b/Gui/MessageBox.cpp index 99acb88e36..2ab2f63ad5 100644 --- a/Gui/MessageBox.cpp +++ b/Gui/MessageBox.cpp @@ -45,7 +45,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/Label.h" #include "Gui/QtEnumConvert.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct MessageBoxPrivate { @@ -340,7 +340,7 @@ MessageBox::event(QEvent* e) return result; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_MessageBox.cpp" diff --git a/Gui/MessageBox.h b/Gui/MessageBox.h index 5ec0db6196..7395a93f82 100644 --- a/Gui/MessageBox.h +++ b/Gui/MessageBox.h @@ -42,7 +42,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct MessageBoxPrivate; class MessageBox @@ -94,6 +94,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // _NATRON_MESSAGE_BOX_H diff --git a/Gui/MultiInstancePanel.cpp b/Gui/MultiInstancePanel.cpp index 1e6039fe97..8c2c3b23bd 100644 --- a/Gui/MultiInstancePanel.cpp +++ b/Gui/MultiInstancePanel.cpp @@ -99,7 +99,7 @@ GCC_DIAG_UNUSED_LOCAL_TYPEDEFS_ON #define COL_SCRIPT_NAME 1 #define COL_FIRST_KNOB 2 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -2442,7 +2442,7 @@ TrackerPanelV1::showMenuForInstance(Node* instance) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_MultiInstancePanel.cpp" diff --git a/Gui/MultiInstancePanel.h b/Gui/MultiInstancePanel.h index 6da3b1defe..80629d179f 100644 --- a/Gui/MultiInstancePanel.h +++ b/Gui/MultiInstancePanel.h @@ -45,7 +45,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief This class represents a multi-instance settings panel. @@ -221,6 +221,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // MULTIINSTANCEPANEL_H diff --git a/Gui/NatronGui/guiapp_wrapper.h b/Gui/NatronGui/guiapp_wrapper.h index 85840dc6bf..0db86278fa 100644 --- a/Gui/NatronGui/guiapp_wrapper.h +++ b/Gui/NatronGui/guiapp_wrapper.h @@ -5,14 +5,14 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class GuiAppWrapper : public GuiApp { public: virtual ~GuiAppWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_GUIAPPWRAPPER_H diff --git a/Gui/NatronGui/natrongui_python.h b/Gui/NatronGui/natrongui_python.h index a16a20905b..d2d08d9f3f 100644 --- a/Gui/NatronGui/natrongui_python.h +++ b/Gui/NatronGui/natrongui_python.h @@ -14,14 +14,18 @@ // Module Includes 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) 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) #include // Binded library includes diff --git a/Gui/NatronGui/pyguiapplication_wrapper.h b/Gui/NatronGui/pyguiapplication_wrapper.h index 997fdb0981..826a57a0e4 100644 --- a/Gui/NatronGui/pyguiapplication_wrapper.h +++ b/Gui/NatronGui/pyguiapplication_wrapper.h @@ -5,7 +5,7 @@ #include -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class PyGuiApplicationWrapper : public PyGuiApplication { public: @@ -13,7 +13,7 @@ class PyGuiApplicationWrapper : public PyGuiApplication virtual ~PyGuiApplicationWrapper(); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_PYGUIAPPLICATIONWRAPPER_H diff --git a/Gui/NatronGui/pymodaldialog_wrapper.h b/Gui/NatronGui/pymodaldialog_wrapper.h index f8d8e0e9e8..7494c867c8 100644 --- a/Gui/NatronGui/pymodaldialog_wrapper.h +++ b/Gui/NatronGui/pymodaldialog_wrapper.h @@ -7,7 +7,7 @@ namespace PySide { class DynamicQMetaObject; } -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class PyModalDialogWrapper : public PyModalDialog { public: @@ -106,7 +106,7 @@ class PyModalDialogWrapper : public PyModalDialog virtual void* qt_metacast(const char* _clname); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_PYMODALDIALOGWRAPPER_H diff --git a/Gui/NatronGui/pypanel_wrapper.h b/Gui/NatronGui/pypanel_wrapper.h index c4fee3c8e0..105688de15 100644 --- a/Gui/NatronGui/pypanel_wrapper.h +++ b/Gui/NatronGui/pypanel_wrapper.h @@ -7,7 +7,7 @@ namespace PySide { class DynamicQMetaObject; } -NATRON_NAMESPACE_ENTER; NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_PYTHON_NAMESPACE_ENTER class PyPanelWrapper : public PyPanel { public: @@ -109,7 +109,7 @@ class PyPanelWrapper : public PyPanel virtual void* qt_metacast(const char* _clname); static void pysideInitQtMetaTypes(); }; -NATRON_PYTHON_NAMESPACE_EXIT; NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT NATRON_NAMESPACE_EXIT #endif // SBK_PYPANELWRAPPER_H diff --git a/Gui/NewLayerDialog.cpp b/Gui/NewLayerDialog.cpp index 08c54ec840..686ceacfa4 100644 --- a/Gui/NewLayerDialog.cpp +++ b/Gui/NewLayerDialog.cpp @@ -77,7 +77,7 @@ CLANG_DIAG_ON(uninitialized) #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; @@ -334,7 +334,7 @@ NewLayerDialog::onRGBAButtonClicked() _imp->aEdit->setVisible(true); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_NewLayerDialog.cpp" diff --git a/Gui/NewLayerDialog.h b/Gui/NewLayerDialog.h index 48e42550a8..ce39aad5ea 100644 --- a/Gui/NewLayerDialog.h +++ b/Gui/NewLayerDialog.h @@ -39,7 +39,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct NewLayerDialogPrivate; class NewLayerDialog @@ -64,6 +64,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_NewLayerDialog_h diff --git a/Gui/NodeBackdropSerialization.cpp b/Gui/NodeBackdropSerialization.cpp index b347a7925e..ea99528dee 100644 --- a/Gui/NodeBackdropSerialization.cpp +++ b/Gui/NodeBackdropSerialization.cpp @@ -26,11 +26,11 @@ #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NodeBackdropSerialization::NodeBackdropSerialization() : posX(0), posY(0), width(0), height(0), name(), label(), r(0), g(0), b(0), selected(false), _isNull(true) { } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeBackdropSerialization.h b/Gui/NodeBackdropSerialization.h index 3d2388248d..98e5886a8e 100644 --- a/Gui/NodeBackdropSerialization.h +++ b/Gui/NodeBackdropSerialization.h @@ -49,7 +49,7 @@ GCC_DIAG_ON(unused-parameter) #define NODE_BACKDROP_INTRODUCES_SELECTED 2 #define NODE_BACKDROP_SERIALIZATION_VERSION NODE_BACKDROP_INTRODUCES_SELECTED -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** This class is completly deprecated do not use it. @@ -160,7 +160,7 @@ class NodeBackdropSerialization BOOST_SERIALIZATION_SPLIT_MEMBER() }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::NodeBackdropSerialization, NODE_BACKDROP_SERIALIZATION_VERSION) diff --git a/Gui/NodeClipBoard.h b/Gui/NodeClipBoard.h index 0b8da6c882..d49bdd38e8 100644 --- a/Gui/NodeClipBoard.h +++ b/Gui/NodeClipBoard.h @@ -38,7 +38,7 @@ #include "Engine/NodeSerialization.h" #include "Gui/NodeGuiSerialization.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class NodeClipBoard { @@ -95,6 +95,6 @@ class NodeClipBoard BOOST_SERIALIZATION_SPLIT_MEMBER() }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_NodeClipBoard_h diff --git a/Gui/NodeCreationDialog.cpp b/Gui/NodeCreationDialog.cpp index bf869c929e..7e980a9f6f 100644 --- a/Gui/NodeCreationDialog.cpp +++ b/Gui/NodeCreationDialog.cpp @@ -54,7 +54,7 @@ CLANG_DIAG_ON(uninitialized) */ //#define NODE_TAB_DIALOG_USE_MATCHED_LENGTH -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct CompleterLineEditPrivate @@ -528,7 +528,7 @@ NodeCreationDialog::finish(bool accepted) Q_EMIT dialogFinished(accepted); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_NodeCreationDialog.cpp" diff --git a/Gui/NodeCreationDialog.h b/Gui/NodeCreationDialog.h index 7f9af2e784..81aa50cef0 100644 --- a/Gui/NodeCreationDialog.h +++ b/Gui/NodeCreationDialog.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/LineEdit.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct CompleterLineEditPrivate; @@ -121,6 +121,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NODECREATIONDIALOG_H diff --git a/Gui/NodeGraph.cpp b/Gui/NodeGraph.cpp index 800bb12dd4..561ed2cc47 100644 --- a/Gui/NodeGraph.cpp +++ b/Gui/NodeGraph.cpp @@ -55,7 +55,7 @@ #include "Global/QtCompat.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //using std::cout; using std::endl; @@ -451,7 +451,7 @@ NodeGraph::getUndoStack() const return _imp->_undoStack; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_NodeGraph.cpp" diff --git a/Gui/NodeGraph.h b/Gui/NodeGraph.h index 54a8a59256..205907415f 100644 --- a/Gui/NodeGraph.h +++ b/Gui/NodeGraph.h @@ -53,7 +53,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/PanelWidget.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class NodeGraphPrivate; @@ -361,6 +361,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_NodeGraph_h diff --git a/Gui/NodeGraph05.cpp b/Gui/NodeGraph05.cpp index e8f3f4d9f1..a89a926240 100644 --- a/Gui/NodeGraph05.cpp +++ b/Gui/NodeGraph05.cpp @@ -45,7 +45,7 @@ #include "Gui/GuiAppInstance.h" #include "Gui/NodeGui.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //using std::cout; using std::endl; @@ -313,5 +313,5 @@ NodeGraph::moveNodesForIdealPosition(const NodeGuiPtr &node, node->setPosition( position.x(), position.y() ); } // moveNodesForIdealPosition -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraph10.cpp b/Gui/NodeGraph10.cpp index 8fefd1e0a7..f89c43af15 100644 --- a/Gui/NodeGraph10.cpp +++ b/Gui/NodeGraph10.cpp @@ -52,7 +52,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Global/QtCompat.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER static NodeGui* isNodeGuiChild(QGraphicsItem* item) { @@ -386,4 +386,4 @@ NodeGraph::mousePressEvent(QMouseEvent* e) } } // mousePressEvent -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraph13.cpp b/Gui/NodeGraph13.cpp index f6974cb4a6..ca906c6b54 100644 --- a/Gui/NodeGraph13.cpp +++ b/Gui/NodeGraph13.cpp @@ -37,7 +37,7 @@ #include "Global/QtCompat.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //using std::cout; using std::endl; @@ -109,4 +109,4 @@ NodeGraph::deselect() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraph15.cpp b/Gui/NodeGraph15.cpp index 84c2a77bb4..f3adb1d26e 100644 --- a/Gui/NodeGraph15.cpp +++ b/Gui/NodeGraph15.cpp @@ -57,7 +57,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #define NATRON_AUTO_SCROLL_TIMEOUT_MS 50 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER static bool handleConnectionError(const NodeGuiPtr& outputNode, const NodeGuiPtr& inputNode, @@ -395,4 +395,4 @@ NodeGraph::onAutoScrollTimerTriggered() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraph20.cpp b/Gui/NodeGraph20.cpp index d565846bfd..c180ee4c57 100644 --- a/Gui/NodeGraph20.cpp +++ b/Gui/NodeGraph20.cpp @@ -51,7 +51,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Global/QtCompat.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void NodeGraph::checkForHints(bool shiftdown, bool controlDown, @@ -556,5 +556,5 @@ NodeGraph::mouseMoveEvent(QMouseEvent* e) QGraphicsView::mouseMoveEvent(e); } // mouseMoveEvent -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraph25.cpp b/Gui/NodeGraph25.cpp index 49d8c10a8a..cda251bc11 100644 --- a/Gui/NodeGraph25.cpp +++ b/Gui/NodeGraph25.cpp @@ -59,7 +59,7 @@ CLANG_DIAG_ON(uninitialized) #include "Global/QtCompat.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void NodeGraph::showNodePanel(bool casIsCtrl, bool casIsShift, NodeGui* nearbyNode) @@ -472,4 +472,4 @@ NodeGraph::selectAllNodes(bool onlyInVisiblePortion) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraph30.cpp b/Gui/NodeGraph30.cpp index b0c844fefc..688292a43e 100644 --- a/Gui/NodeGraph30.cpp +++ b/Gui/NodeGraph30.cpp @@ -59,7 +59,7 @@ CLANG_DIAG_ON(uninitialized) #include "Global/QtCompat.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void NodeGraph::connectCurrentViewerToSelection(int inputNB, bool isASide) @@ -480,4 +480,4 @@ NodeGraph::areAllNodesVisible() return true; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraph35.cpp b/Gui/NodeGraph35.cpp index c58d3d09a7..55a38e9f27 100644 --- a/Gui/NodeGraph35.cpp +++ b/Gui/NodeGraph35.cpp @@ -55,7 +55,7 @@ CLANG_DIAG_ON(uninitialized) #include "Global/QtCompat.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER QImage NodeGraph::getFullSceneScreenShot() { @@ -494,4 +494,4 @@ NodeGraph::showMenu(const QPoint & pos) } } // NodeGraph::showMenu -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraph40.cpp b/Gui/NodeGraph40.cpp index 018813eadd..bf8919eefd 100644 --- a/Gui/NodeGraph40.cpp +++ b/Gui/NodeGraph40.cpp @@ -63,7 +63,7 @@ GCC_DIAG_ON(unused-parameter) #include "Global/QtCompat.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void NodeGraph::togglePreviewsForSelectedNodes() { @@ -473,4 +473,4 @@ NodeGraph::centerOnAllNodes() update(); } // NodeGraph::centerOnAllNodes -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraph45.cpp b/Gui/NodeGraph45.cpp index 7867a86144..03b1cc90b7 100644 --- a/Gui/NodeGraph45.cpp +++ b/Gui/NodeGraph45.cpp @@ -65,7 +65,7 @@ CLANG_DIAG_ON(uninitialized) #include "Global/QtCompat.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -689,4 +689,4 @@ NodeGraph::getRootPos() const return _imp->_root->pos(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraphPrivate.cpp b/Gui/NodeGraphPrivate.cpp index c6c0319033..ff0b7844b0 100644 --- a/Gui/NodeGraphPrivate.cpp +++ b/Gui/NodeGraphPrivate.cpp @@ -43,7 +43,7 @@ #include "Gui/NodeGuiSerialization.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NodeGraphPrivate::NodeGraphPrivate(NodeGraph* p, @@ -221,4 +221,4 @@ NodeGraphPrivate::copyNodesInternal(const NodesGuiList& selection, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraphPrivate.h b/Gui/NodeGraphPrivate.h index cc9cecb342..dae40dd995 100644 --- a/Gui/NodeGraphPrivate.h +++ b/Gui/NodeGraphPrivate.h @@ -62,7 +62,7 @@ CLANG_DIAG_ON(uninitialized) #define NATRON_SCENE_MAX 1e6 #define NATRON_SCENE_MIN 0 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER enum EventStateEnum { @@ -254,6 +254,6 @@ class NodeGraphPrivate void toggleSelectedNodesEnabled(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_NodeGraphPrivate_h diff --git a/Gui/NodeGraphPrivate10.cpp b/Gui/NodeGraphPrivate10.cpp index 79f2b656a5..7908744c48 100644 --- a/Gui/NodeGraphPrivate10.cpp +++ b/Gui/NodeGraphPrivate10.cpp @@ -46,7 +46,7 @@ #include "Gui/NodeGuiSerialization.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -362,4 +362,4 @@ NodeGraphPrivate::toggleSelectedNodesEnabled() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraphTextItem.cpp b/Gui/NodeGraphTextItem.cpp index 99f34a1f74..64dc3ca6ec 100644 --- a/Gui/NodeGraphTextItem.cpp +++ b/Gui/NodeGraphTextItem.cpp @@ -39,7 +39,7 @@ #define NODEGRAPH_SIMPLE_TEXT_ITEM_MIN_HEIGHT_PX 6 #define NODEGRAPH_PIXMAP_ITEM_MIN_HEIGHT_PX 10 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NodeGraphTextItem::NodeGraphTextItem(NodeGraph* graph, QGraphicsItem* parent, @@ -156,4 +156,4 @@ NodeGraphPixmapItem::paint(QPainter *painter, QGraphicsPixmapItem::paint(painter, option, widget); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraphTextItem.h b/Gui/NodeGraphTextItem.h index 36f1fab0eb..859c69db56 100644 --- a/Gui/NodeGraphTextItem.h +++ b/Gui/NodeGraphTextItem.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class NodeGraphTextItem : public QGraphicsTextItem @@ -85,7 +85,7 @@ class NodeGraphPixmapItem virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NODEGRAPHTEXTITEM_H diff --git a/Gui/NodeGraphUndoRedo.cpp b/Gui/NodeGraphUndoRedo.cpp index 364a14ced8..fcfddc7986 100644 --- a/Gui/NodeGraphUndoRedo.cpp +++ b/Gui/NodeGraphUndoRedo.cpp @@ -54,7 +54,7 @@ CLANG_DIAG_ON(uninitialized) #define MINIMUM_VERTICAL_SPACE_BETWEEN_NODES 10 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER MoveMultipleNodesCommand::MoveMultipleNodesCommand(const NodesGuiList & nodes, double dx, @@ -2079,4 +2079,4 @@ InlineGroupCommand::redo() _firstRedoCalled = true; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGraphUndoRedo.h b/Gui/NodeGraphUndoRedo.h index 7cc45a2e82..225afd222b 100644 --- a/Gui/NodeGraphUndoRedo.h +++ b/Gui/NodeGraphUndoRedo.h @@ -46,7 +46,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * This file gathers undo/redo command associated to the node graph. Each of them triggers an autosave when redone/undone @@ -470,6 +470,6 @@ class InlineGroupCommand }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NODEGRAPHUNDOREDO_H diff --git a/Gui/NodeGui.cpp b/Gui/NodeGui.cpp index a6230aefff..a8f867b21b 100644 --- a/Gui/NodeGui.cpp +++ b/Gui/NodeGui.cpp @@ -114,7 +114,7 @@ CLANG_DIAG_ON(uninitialized) #define NATRON_PLUGIN_ICON_SIZE 20 #define PLUGIN_ICON_OFFSET 2 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER using std::make_pair; @@ -3993,7 +3993,7 @@ NodeGui::onInputVisibilityChanged(int /*inputNb*/) refreshEdgesVisility(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_NodeGui.cpp" diff --git a/Gui/NodeGui.h b/Gui/NodeGui.h index 72e128ec99..2b183f20e2 100644 --- a/Gui/NodeGui.h +++ b/Gui/NodeGui.h @@ -57,7 +57,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct NodeGuiIndicatorPrivate; @@ -687,6 +687,6 @@ public Q_SLOTS: boost::shared_ptr _activeNodeCustomModalDialog; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Natron_Gui_NodeGui_h diff --git a/Gui/NodeGuiSerialization.cpp b/Gui/NodeGuiSerialization.cpp index a82f0fc363..f10a706f91 100644 --- a/Gui/NodeGuiSerialization.cpp +++ b/Gui/NodeGuiSerialization.cpp @@ -37,7 +37,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/Node.h" #include "Engine/NodeGroup.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void NodeGuiSerialization::initialize(const NodeGui* n) @@ -87,4 +87,4 @@ NodeGuiSerialization::initialize(const NodeGui* n) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/NodeGuiSerialization.h b/Gui/NodeGuiSerialization.h index 9e9880b788..1b9034b644 100644 --- a/Gui/NodeGuiSerialization.h +++ b/Gui/NodeGuiSerialization.h @@ -51,7 +51,7 @@ GCC_DIAG_ON(unused-parameter) #define NODE_GUI_INTRODUCES_CHILDREN 6 #define NODE_GUI_SERIALIZATION_VERSION NODE_GUI_INTRODUCES_CHILDREN -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class NodeGuiSerialization { @@ -242,7 +242,7 @@ class NodeGuiSerialization BOOST_SERIALIZATION_SPLIT_MEMBER() }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::NodeGuiSerialization, NODE_GUI_SERIALIZATION_VERSION) diff --git a/Gui/NodeSettingsPanel.cpp b/Gui/NodeSettingsPanel.cpp index a36fb72245..5c45ab33cc 100644 --- a/Gui/NodeSettingsPanel.cpp +++ b/Gui/NodeSettingsPanel.cpp @@ -58,7 +58,7 @@ using std::make_pair; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NodeSettingsPanel::NodeSettingsPanel(const boost::shared_ptr & multiPanel, @@ -299,7 +299,7 @@ NodeSettingsPanel::onExportPresetsActionTriggered() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_NodeSettingsPanel.cpp" diff --git a/Gui/NodeSettingsPanel.h b/Gui/NodeSettingsPanel.h index 819ffbb6a8..45d936de15 100644 --- a/Gui/NodeSettingsPanel.h +++ b/Gui/NodeSettingsPanel.h @@ -50,7 +50,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/DockablePanel.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class NodeSettingsPanel : public DockablePanel @@ -113,6 +113,6 @@ public Q_SLOTS: void onExportPresetsActionTriggered(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_NodeSettingsPanel_h diff --git a/Gui/NodeViewerContext.cpp b/Gui/NodeViewerContext.cpp index b3f8b72817..d9afc23d96 100644 --- a/Gui/NodeViewerContext.cpp +++ b/Gui/NodeViewerContext.cpp @@ -56,7 +56,7 @@ #include "Gui/ViewerTab.h" #include "Gui/ViewerToolButton.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct NodeViewerContextPrivate { @@ -744,6 +744,6 @@ NodeViewerContext::notifyGuiClosing() _imp->viewerTab = 0; } -NATRON_NAMESPACE_EXIT; -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_EXIT +NATRON_NAMESPACE_USING #include "moc_NodeViewerContext.cpp" diff --git a/Gui/NodeViewerContext.h b/Gui/NodeViewerContext.h index 9e24bc60b7..3ac7305485 100644 --- a/Gui/NodeViewerContext.h +++ b/Gui/NodeViewerContext.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(deprecated) #include "Gui/GuiFwd.h" #include "Gui/KnobGuiContainerI.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct NodeViewerContextPrivate; @@ -143,6 +143,6 @@ public Q_SLOTS: }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NODEVIEWERCONTEXT_H diff --git a/Gui/PanelWidget.cpp b/Gui/PanelWidget.cpp index fede16c25d..ba63c99c4d 100644 --- a/Gui/PanelWidget.cpp +++ b/Gui/PanelWidget.cpp @@ -34,7 +34,7 @@ #include "Gui/TabWidget.h" #include "Gui/Gui.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER PanelWidget::PanelWidget(QWidget* thisWidget, Gui* gui) @@ -197,4 +197,4 @@ PanelWidget::handleUnCaughtKeyPressEvent(QKeyEvent* e) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/PanelWidget.h b/Gui/PanelWidget.h index ccd405c1a0..4ac9e5b468 100644 --- a/Gui/PanelWidget.h +++ b/Gui/PanelWidget.h @@ -37,7 +37,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class PanelWidget : public ScriptObject @@ -104,7 +104,7 @@ class PanelWidget void leaveEventBase(); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PANELWIDGET_H diff --git a/Gui/PickKnobDialog.cpp b/Gui/PickKnobDialog.cpp index cacff07e01..9e8ba77885 100644 --- a/Gui/PickKnobDialog.cpp +++ b/Gui/PickKnobDialog.cpp @@ -51,7 +51,7 @@ #include "Gui/NodeGui.h" #include "Gui/NodeSettingsPanel.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PickKnobDialogPrivate { @@ -415,7 +415,7 @@ PickKnobDialog::getSelectedKnob(bool* makeAlias, return _imp->selectedKnob; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_PickKnobDialog.cpp" diff --git a/Gui/PickKnobDialog.h b/Gui/PickKnobDialog.h index 0429ee0ba6..a9f485d501 100644 --- a/Gui/PickKnobDialog.h +++ b/Gui/PickKnobDialog.h @@ -40,7 +40,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PickKnobDialogPrivate; @@ -69,6 +69,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_PickKnobDialog_h diff --git a/Gui/PreferencesPanel.cpp b/Gui/PreferencesPanel.cpp index 1ee868909e..16b401076d 100644 --- a/Gui/PreferencesPanel.cpp +++ b/Gui/PreferencesPanel.cpp @@ -67,7 +67,7 @@ CLANG_DIAG_ON(uninitialized) #define COL_MT_ENABLED COL_RS_ENABLED + 1 #define COL_GL_ENABLED COL_MT_ENABLED + 1 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER; @@ -1649,7 +1649,7 @@ PreferencesPanel::onRestoreDefaultShortcutsButtonClicked() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_PreferencesPanel.cpp" diff --git a/Gui/PreferencesPanel.h b/Gui/PreferencesPanel.h index 87c4b36f04..24b059b614 100644 --- a/Gui/PreferencesPanel.h +++ b/Gui/PreferencesPanel.h @@ -37,7 +37,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/LineEdit.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PreferencesPanelPrivate; @@ -133,6 +133,6 @@ class KeybindRecorder virtual void keyPressEvent(QKeyEvent* e) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PREFERENCESPANEL_H diff --git a/Gui/PreviewThread.cpp b/Gui/PreviewThread.cpp index 6456c1fa5c..938d6a9079 100644 --- a/Gui/PreviewThread.cpp +++ b/Gui/PreviewThread.cpp @@ -38,7 +38,7 @@ #include "Engine/Node.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class ComputePreviewRequest : public GenericThreadStartArgs @@ -132,5 +132,5 @@ PreviewThread::threadLoopOnce(const ThreadStartArgsPtr& inArgs) return eThreadStateActive; } // PreviewThread::threadLoopOnce -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/PreviewThread.h b/Gui/PreviewThread.h index d3e96ff90b..0fb9354d55 100644 --- a/Gui/PreviewThread.h +++ b/Gui/PreviewThread.h @@ -39,7 +39,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PreviewThreadPrivate; class PreviewThread @@ -63,6 +63,6 @@ class PreviewThread boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PREVIEWTHREAD_H diff --git a/Gui/ProgressPanel.cpp b/Gui/ProgressPanel.cpp index b054283365..25672338e1 100644 --- a/Gui/ProgressPanel.cpp +++ b/Gui/ProgressPanel.cpp @@ -71,7 +71,7 @@ CLANG_DIAG_ON(uninitialized) #define NATRON_DISPLAY_PROGRESS_PANEL_AFTER_MS 3000 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef std::map TasksMap; typedef std::vector TasksOrdered; @@ -645,8 +645,8 @@ ProgressPanel::onItemRightClicked(TableItem* item) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ProgressPanel.cpp" diff --git a/Gui/ProgressPanel.h b/Gui/ProgressPanel.h index 91841df326..291df45b7d 100644 --- a/Gui/ProgressPanel.h +++ b/Gui/ProgressPanel.h @@ -42,7 +42,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ProgressPanelPrivate; struct ProgressPanelPrivate; @@ -147,6 +147,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PROGRESSPANEL_H diff --git a/Gui/ProgressTaskInfo.cpp b/Gui/ProgressTaskInfo.cpp index 215674762d..abc2ff5991 100644 --- a/Gui/ProgressTaskInfo.cpp +++ b/Gui/ProgressTaskInfo.cpp @@ -66,7 +66,7 @@ CLANG_DIAG_ON(uninitialized) #define NATRON_SHOW_PROGRESS_TOTAL_ESTIMATED_TIME_MS 4000 #define NATRON_PROGRESS_DIALOG_ETA_REFRESH_MS 1000 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER NATRON_NAMESPACE_ANONYMOUS_ENTER @@ -729,7 +729,7 @@ ProgressTaskInfoPrivate::refreshButtons() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ProgressTaskInfo.cpp" diff --git a/Gui/ProgressTaskInfo.h b/Gui/ProgressTaskInfo.h index 588ecd3178..f34f293909 100644 --- a/Gui/ProgressTaskInfo.h +++ b/Gui/ProgressTaskInfo.h @@ -38,7 +38,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ProgressTaskInfoPrivate; class ProgressTaskInfo @@ -171,6 +171,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_ProgressTaskInfo_h diff --git a/Gui/ProjectGui.cpp b/Gui/ProjectGui.cpp index 6cc00f730b..77cdf5467f 100644 --- a/Gui/ProjectGui.cpp +++ b/Gui/ProjectGui.cpp @@ -79,7 +79,7 @@ CLANG_DIAG_ON(uninitialized) #include "Engine/RectISerialization.h" #include "Engine/RectDSerialization.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ProjectGui::ProjectGui(Gui* gui) : _gui(gui) @@ -645,7 +645,7 @@ ProjectGui::setPickersColor(double r, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ProjectGui.cpp" diff --git a/Gui/ProjectGui.h b/Gui/ProjectGui.h index 52830ee67a..b8ad48873d 100644 --- a/Gui/ProjectGui.h +++ b/Gui/ProjectGui.h @@ -43,7 +43,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class ProjectGui : public QObject @@ -165,7 +165,7 @@ public Q_SLOTS: DialogButtonBox* _buttonBox; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // PROJECTGUI_H diff --git a/Gui/ProjectGuiSerialization.cpp b/Gui/ProjectGuiSerialization.cpp index 6104a17646..df5998265d 100644 --- a/Gui/ProjectGuiSerialization.cpp +++ b/Gui/ProjectGuiSerialization.cpp @@ -57,7 +57,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/ViewerGL.h" #include "Gui/ViewerTab.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void ProjectGuiSerialization::initialize(const ProjectGui* projectGui) @@ -313,4 +313,4 @@ PythonPanelSerialization::initialize(NATRON_PYTHON_NAMESPACE::PyPanel* tab, userData = tab->save_serialization_thread().toStdString(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/ProjectGuiSerialization.h b/Gui/ProjectGuiSerialization.h index 6188fd343b..ce6134ba4e 100644 --- a/Gui/ProjectGuiSerialization.h +++ b/Gui/ProjectGuiSerialization.h @@ -95,7 +95,7 @@ GCC_DIAG_ON(unused-parameter) #define kNatronProjectSettingsPanelSerializationName "Natron_Project_Settings_Panel" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ViewerData { double zoomLeft; @@ -792,7 +792,7 @@ class ProjectGuiSerialization BOOST_SERIALIZATION_SPLIT_MEMBER() }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT BOOST_CLASS_VERSION(NATRON_NAMESPACE::GuiLayoutSerialization, GUI_LAYOUT_SERIALIZATION_VERSION); BOOST_CLASS_VERSION(NATRON_NAMESPACE::ApplicationWindowSerialization, APPLICATION_WINDOW_SERIALIZATION_VERSION) diff --git a/Gui/PropertiesBinWrapper.cpp b/Gui/PropertiesBinWrapper.cpp index 469a54b8f2..0fb5b57b04 100644 --- a/Gui/PropertiesBinWrapper.cpp +++ b/Gui/PropertiesBinWrapper.cpp @@ -33,7 +33,7 @@ #include "Gui/KnobWidgetDnD.h" #include "Gui/RightClickableWidget.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER PropertiesBinWrapper::PropertiesBinWrapper(Gui* parent) : QWidget(parent) @@ -94,4 +94,4 @@ PropertiesBinWrapper::getUndoStack() const return 0; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/PropertiesBinWrapper.h b/Gui/PropertiesBinWrapper.h index 456a003e72..a09f84e7bb 100644 --- a/Gui/PropertiesBinWrapper.h +++ b/Gui/PropertiesBinWrapper.h @@ -30,7 +30,7 @@ #include "Gui/PanelWidget.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class PropertiesBinWrapper : public QWidget, public PanelWidget @@ -50,6 +50,6 @@ class PropertiesBinWrapper virtual QUndoStack* getUndoStack() const OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_PropertiesBinWrapper_h diff --git a/Gui/PyGlobalGui.h b/Gui/PyGlobalGui.h index 97326c1a80..bb0c32e7d5 100644 --- a/Gui/PyGlobalGui.h +++ b/Gui/PyGlobalGui.h @@ -41,8 +41,8 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiApplicationManager.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER class PyGuiApplication : public PyCoreApplication @@ -121,7 +121,7 @@ class PyGuiApplication } }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #endif // GLOBAL_GUI_WRAPPER_H diff --git a/Gui/PyGuiApp.cpp b/Gui/PyGuiApp.cpp index 20a5a411c7..e56c39af23 100644 --- a/Gui/PyGuiApp.cpp +++ b/Gui/PyGuiApp.cpp @@ -51,8 +51,8 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/ViewerGL.h" #include "Gui/ViewerTab.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER GuiApp::GuiApp(const GuiAppInstPtr& app) : App(app) @@ -822,5 +822,5 @@ PyViewer::getCurrentView() const return _viewer->getCurrentView().value(); } -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT diff --git a/Gui/PyGuiApp.h b/Gui/PyGuiApp.h index 1b29366202..0c8244f342 100644 --- a/Gui/PyGuiApp.h +++ b/Gui/PyGuiApp.h @@ -35,8 +35,8 @@ #include "Gui/GuiAppInstance.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER class PyViewer { @@ -165,7 +165,7 @@ class GuiApp void renderBlocking(const std::list& effects, const std::list& firstFrames, const std::list& lastFrames, const std::list& frameSteps); }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #endif // GUIAPPWRAPPER_H diff --git a/Gui/PythonPanels.cpp b/Gui/PythonPanels.cpp index b174bb2787..5b54f89fbd 100644 --- a/Gui/PythonPanels.cpp +++ b/Gui/PythonPanels.cpp @@ -45,8 +45,8 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/DockablePanel.h" #include "Gui/PyGuiApp.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER struct DialogParamHolderPrivate { @@ -683,9 +683,9 @@ PyTabWidget::getScriptName() const return _tab->objectName_mt_safe(); } -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; -NATRON_PYTHON_NAMESPACE_USING; +NATRON_NAMESPACE_USING +NATRON_PYTHON_NAMESPACE_USING #include "moc_PythonPanels.cpp" diff --git a/Gui/PythonPanels.h b/Gui/PythonPanels.h index 9589f639a3..7afcbff659 100644 --- a/Gui/PythonPanels.h +++ b/Gui/PythonPanels.h @@ -45,8 +45,8 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/PanelWidget.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; -NATRON_PYTHON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER +NATRON_PYTHON_NAMESPACE_ENTER struct DialogParamHolderPrivate; class DialogParamHolder @@ -215,7 +215,7 @@ class PyTabWidget QString getScriptName() const; }; -NATRON_PYTHON_NAMESPACE_EXIT; -NATRON_NAMESPACE_EXIT; +NATRON_PYTHON_NAMESPACE_EXIT +NATRON_NAMESPACE_EXIT #endif // PYTHONPANELS_H diff --git a/Gui/QtEnumConvert.cpp b/Gui/QtEnumConvert.cpp index 124aae7118..d7163b0975 100644 --- a/Gui/QtEnumConvert.cpp +++ b/Gui/QtEnumConvert.cpp @@ -27,7 +27,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ///what a painful mapping! Key @@ -1887,5 +1887,5 @@ QtEnumConvert::toQtCursor(CursorEnum c, return b; } // toQtCursor -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/QtEnumConvert.h b/Gui/QtEnumConvert.h index cd51df3fa9..76deb4f140 100644 --- a/Gui/QtEnumConvert.h +++ b/Gui/QtEnumConvert.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class QtEnumConvert { @@ -61,6 +61,6 @@ class QtEnumConvert static bool toQtCursor(CursorEnum c, Qt::CursorShape* ret); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_QtEnumConvert_h diff --git a/Gui/QtMac.mm b/Gui/QtMac.mm index 527263eb1b..4e6ffd2710 100644 --- a/Gui/QtMac.mm +++ b/Gui/QtMac.mm @@ -82,7 +82,7 @@ - (NSRect)convertRectFromBacking:(NSRect)aRect; #endif // MAC_OS_X_VERSION_10_7 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER bool QtMac::isHighDPIInternal(const QWidget* w) { @@ -94,6 +94,6 @@ - (NSRect)convertRectFromBacking:(NSRect)aRect; return (scaleFactor > 1.0); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif diff --git a/Gui/RegisteredTabs.h b/Gui/RegisteredTabs.h index f09d4c48e5..054061b15e 100644 --- a/Gui/RegisteredTabs.h +++ b/Gui/RegisteredTabs.h @@ -33,10 +33,10 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef std::map > RegisteredTabs; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_RegisteredTabs_h diff --git a/Gui/RenderStatsDialog.cpp b/Gui/RenderStatsDialog.cpp index e2e9ee87ae..ec0105cd9a 100644 --- a/Gui/RenderStatsDialog.cpp +++ b/Gui/RenderStatsDialog.cpp @@ -67,7 +67,7 @@ #define NUM_COLS 16 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER enum ItemsRoleEnum { @@ -1084,7 +1084,7 @@ RenderStatsDialog::onIDLineEditChanged(const QString& filter) _imp->updateVisibleRowsInternal(_imp->nameFilterEdit->text(), filter); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_RenderStatsDialog.cpp" diff --git a/Gui/RenderStatsDialog.h b/Gui/RenderStatsDialog.h index 2fe63811a5..27413f54be 100644 --- a/Gui/RenderStatsDialog.h +++ b/Gui/RenderStatsDialog.h @@ -44,7 +44,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct RenderStatsDialogPrivate; @@ -79,6 +79,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // RENDERSTATSDIALOG_H diff --git a/Gui/ResizableMessageBox.cpp b/Gui/ResizableMessageBox.cpp index 00f1ea30eb..2d4e5ad96e 100644 --- a/Gui/ResizableMessageBox.cpp +++ b/Gui/ResizableMessageBox.cpp @@ -29,7 +29,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // resizable message box, // see http://www.qtcentre.org/threads/24888-Resizing-a-QMessageBox#post135851 @@ -79,5 +79,5 @@ ResizableMessageBox::event(QEvent *e) return result; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/ResizableMessageBox.h b/Gui/ResizableMessageBox.h index cdc4065b20..b60db58163 100644 --- a/Gui/ResizableMessageBox.h +++ b/Gui/ResizableMessageBox.h @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER // resizable message box, // see http://www.qtcentre.org/threads/24888-Resizing-a-QMessageBox#post135851 @@ -57,6 +57,6 @@ class ResizableMessageBox bool event(QEvent *e) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_ResizableMessageBox_h diff --git a/Gui/RightClickableWidget.cpp b/Gui/RightClickableWidget.cpp index 60b62ff4f9..8a5033d3fb 100644 --- a/Gui/RightClickableWidget.cpp +++ b/Gui/RightClickableWidget.cpp @@ -41,7 +41,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/NodeGraph.h" #include "Gui/ViewerGL.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void RightClickableWidget::mousePressEvent(QMouseEvent* e) @@ -101,7 +101,7 @@ RightClickableWidget::isParentSettingsPanelRecursive(QWidget* w) } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_RightClickableWidget.cpp" diff --git a/Gui/RightClickableWidget.h b/Gui/RightClickableWidget.h index d391fe8b20..712eedf88a 100644 --- a/Gui/RightClickableWidget.h +++ b/Gui/RightClickableWidget.h @@ -43,7 +43,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class RightClickableWidget : public QWidget @@ -84,6 +84,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON virtual void mousePressEvent(QMouseEvent* e) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_RightClickableWidget_h diff --git a/Gui/RotoPanel.cpp b/Gui/RotoPanel.cpp index 1e8dc226d0..6a148d7cbf 100644 --- a/Gui/RotoPanel.cpp +++ b/Gui/RotoPanel.cpp @@ -90,7 +90,7 @@ CLANG_DIAG_ON(uninitialized) #define MAX_COLS 6 #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class RemoveItemsUndoCommand @@ -2999,7 +2999,7 @@ DuplicateItemUndoCommand::redo() setText( tr("Duplicate item(s) of %2").arg( QString::fromUtf8( _roto->getNodeName().c_str() ) ) ); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_RotoPanel.cpp" diff --git a/Gui/RotoPanel.h b/Gui/RotoPanel.h index 6c749699a1..e4ae1b2dbd 100644 --- a/Gui/RotoPanel.h +++ b/Gui/RotoPanel.h @@ -46,7 +46,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct RotoPanelPrivate; @@ -208,6 +208,6 @@ class DroppedTreeItem typedef boost::shared_ptr DroppedTreeItemPtr; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ROTOPANEL_H diff --git a/Gui/ScaleSliderQWidget.cpp b/Gui/ScaleSliderQWidget.cpp index 80b07f4791..0f1c2945cb 100644 --- a/Gui/ScaleSliderQWidget.cpp +++ b/Gui/ScaleSliderQWidget.cpp @@ -59,7 +59,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #define SLIDER_WIDTH 4 #define SLIDER_HEIGHT 15 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ScaleSliderQWidgetPrivate { @@ -651,7 +651,7 @@ ScaleSliderQWidget::setUseLineColor(bool use, update(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ScaleSliderQWidget.cpp" diff --git a/Gui/ScaleSliderQWidget.h b/Gui/ScaleSliderQWidget.h index bb7b948895..5aeaa1af78 100644 --- a/Gui/ScaleSliderQWidget.h +++ b/Gui/ScaleSliderQWidget.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ScaleSliderQWidgetPrivate; @@ -129,6 +129,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // SCALESLIDERQWIDGET_H diff --git a/Gui/ScriptEditor.cpp b/Gui/ScriptEditor.cpp index f0f926d1ab..c710f730ef 100644 --- a/Gui/ScriptEditor.cpp +++ b/Gui/ScriptEditor.cpp @@ -55,7 +55,7 @@ #include "Gui/ActionShortcuts.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ScriptEditorPrivate { @@ -655,7 +655,7 @@ ScriptEditor::focusInEvent(QFocusEvent* e) QWidget::focusInEvent(e); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ScriptEditor.cpp" diff --git a/Gui/ScriptEditor.h b/Gui/ScriptEditor.h index 8e8762bbc3..e725f9c156 100644 --- a/Gui/ScriptEditor.h +++ b/Gui/ScriptEditor.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/PanelWidget.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ScriptEditorPrivate; @@ -122,6 +122,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // SCRIPTEDITOR_H diff --git a/Gui/ScriptTextEdit.cpp b/Gui/ScriptTextEdit.cpp index 7b5fc5cfc8..f255f0550c 100644 --- a/Gui/ScriptTextEdit.cpp +++ b/Gui/ScriptTextEdit.cpp @@ -46,7 +46,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiApplicationManager.h" #include "Gui/KnobWidgetDnD.h" // KNOB_DND_MIME_DATA_KEY -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PyHighLightRule @@ -539,7 +539,7 @@ OutputScriptTextEdit::scrollContentsBy(int dx, Q_EMIT userScrollChanged(v == max); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ScriptTextEdit.cpp" diff --git a/Gui/ScriptTextEdit.h b/Gui/ScriptTextEdit.h index be4529d118..12ada6b610 100644 --- a/Gui/ScriptTextEdit.h +++ b/Gui/ScriptTextEdit.h @@ -42,7 +42,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct PySyntaxHighlighterPrivate; @@ -162,6 +162,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON virtual void scrollContentsBy(int dx, int dy) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // SCRIPTTEXTEDIT_H diff --git a/Gui/SequenceFileDialog.cpp b/Gui/SequenceFileDialog.cpp index e455392a98..4f91bacd0d 100644 --- a/Gui/SequenceFileDialog.cpp +++ b/Gui/SequenceFileDialog.cpp @@ -116,7 +116,7 @@ CLANG_DIAG_ON(uninitialized) #define FILE_DIALOG_DISABLE_ICONS using std::make_pair; -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #if 0 static inline bool @@ -3051,7 +3051,7 @@ SequenceFileDialog::done(int r) QDialog::done(r); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_SequenceFileDialog.cpp" diff --git a/Gui/SequenceFileDialog.h b/Gui/SequenceFileDialog.h index 3cf2c98a44..ec9d8bad6d 100644 --- a/Gui/SequenceFileDialog.h +++ b/Gui/SequenceFileDialog.h @@ -64,7 +64,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief The UrlModel class is the model used by the favorite view in the file dialog. It serves as a connexion between @@ -624,6 +624,6 @@ class SequenceItemDelegate }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif /* defined(NATRON_GUI_SEQUENCEFILEDIALOG_H_) */ diff --git a/Gui/SerializableWindow.cpp b/Gui/SerializableWindow.cpp index 7ed9b6782b..6df013e068 100644 --- a/Gui/SerializableWindow.cpp +++ b/Gui/SerializableWindow.cpp @@ -28,7 +28,7 @@ #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER SerializableWindow::SerializableWindow() : _lock(new QMutex) @@ -81,5 +81,5 @@ SerializableWindow::getMtSafePosition(int &x, y = _y; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/SerializableWindow.h b/Gui/SerializableWindow.h index 8ec0347150..bafd196126 100644 --- a/Gui/SerializableWindow.h +++ b/Gui/SerializableWindow.h @@ -31,7 +31,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief A serializable window is a window which have mutex-protected members that can be accessed in the serialization thread @@ -64,7 +64,7 @@ class SerializableWindow void getMtSafePosition(int &x, int &y); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // SERIALIZABLEWINDOW_H diff --git a/Gui/Shaders.cpp b/Gui/Shaders.cpp index f89d859b56..599f95ded9 100644 --- a/Gui/Shaders.cpp +++ b/Gui/Shaders.cpp @@ -26,7 +26,7 @@ #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER const char* fragRGB = "uniform sampler2D Tex;\n" @@ -216,4 +216,4 @@ const char *histogramMaximum_frag = "}\n" ; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/Shaders.h b/Gui/Shaders.h index 53e597ae83..c5de8a3c68 100644 --- a/Gui/Shaders.h +++ b/Gui/Shaders.h @@ -27,7 +27,7 @@ #include "Global/Macros.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER extern const char* fragRGB; extern const char* vertRGB; @@ -43,6 +43,6 @@ extern const char *histogramRenderingVertex_vert; extern const char* minimal_vert; extern const char *histogramMaximum_frag; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif diff --git a/Gui/SpinBox.cpp b/Gui/SpinBox.cpp index 32ff2f70e4..08b811057c 100644 --- a/Gui/SpinBox.cpp +++ b/Gui/SpinBox.cpp @@ -55,7 +55,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #define SPINBOX_MAX_WIDTH 50 #define SPINBOX_MIN_WIDTH 35 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct SpinBoxPrivate @@ -1112,7 +1112,7 @@ KnobSpinBox::focusOutEvent(QFocusEvent* e) SpinBox::focusOutEvent(e); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_SpinBox.cpp" diff --git a/Gui/SpinBox.h b/Gui/SpinBox.h index caa0f4baec..3ae6e582eb 100644 --- a/Gui/SpinBox.h +++ b/Gui/SpinBox.h @@ -36,7 +36,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct SpinBoxPrivate; @@ -194,6 +194,6 @@ class KnobSpinBox boost::shared_ptr _dnd; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif /* defined(NATRON_GUI_FEEDBACKSPINBOX_H_) */ diff --git a/Gui/SpinBoxValidator.cpp b/Gui/SpinBoxValidator.cpp index ba0ca03efb..07c29bae0e 100644 --- a/Gui/SpinBoxValidator.cpp +++ b/Gui/SpinBoxValidator.cpp @@ -32,7 +32,7 @@ #include "Gui/KnobGuiColor.h" #include "Gui/SpinBox.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct NumericKnobValidatorPrivate { @@ -141,4 +141,4 @@ NumericKnobValidator::validateInput(const QString& userText, return true; } // NumericKnobValidator::validateInput -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/SpinBoxValidator.h b/Gui/SpinBoxValidator.h index 13799fbec6..147bbe0bfb 100644 --- a/Gui/SpinBoxValidator.h +++ b/Gui/SpinBoxValidator.h @@ -35,7 +35,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class SpinBoxValidator { @@ -71,6 +71,6 @@ class NumericKnobValidator boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // GUI_SPINBOXVALIDATOR_H diff --git a/Gui/SplashScreen.cpp b/Gui/SplashScreen.cpp index e1bf91ae76..398710581b 100644 --- a/Gui/SplashScreen.cpp +++ b/Gui/SplashScreen.cpp @@ -34,7 +34,7 @@ CLANG_DIAG_OFF(deprecated) #include CLANG_DIAG_ON(deprecated) -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER SplashScreen::SplashScreen(const QString & filePath) : QWidget(0, Qt::ToolTip | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint) @@ -151,7 +151,7 @@ LoadProjectSplashScreen::paintEvent(QPaintEvent* /*e*/) p.drawText(loadStrPos, loadString); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_SplashScreen.cpp" diff --git a/Gui/SplashScreen.h b/Gui/SplashScreen.h index d9566d66cb..801abf00e7 100644 --- a/Gui/SplashScreen.h +++ b/Gui/SplashScreen.h @@ -37,7 +37,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class SplashScreen : public QWidget @@ -94,6 +94,6 @@ GCC_DIAG_SUGGEST_OVERRIDE_ON virtual void paintEvent(QPaintEvent* e) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // SPLASHSCREEN_H diff --git a/Gui/Splitter.cpp b/Gui/Splitter.cpp index c5fb3ac513..ff1abaaa9b 100644 --- a/Gui/Splitter.cpp +++ b/Gui/Splitter.cpp @@ -27,7 +27,7 @@ #include #include -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER Splitter::Splitter(QWidget* parent) : QSplitter(parent) @@ -148,4 +148,4 @@ Splitter::event(QEvent* e) return QSplitter::event(e); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/Splitter.h b/Gui/Splitter.h index 567fbbfc4b..c60c2f43af 100644 --- a/Gui/Splitter.h +++ b/Gui/Splitter.h @@ -38,7 +38,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @class A thread-safe wrapper over QSplitter @@ -83,6 +83,6 @@ class Splitter mutable QMutex _lock; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // SPLITTER_H diff --git a/Gui/TabGroup.cpp b/Gui/TabGroup.cpp index a813fa7f46..219674254f 100644 --- a/Gui/TabGroup.cpp +++ b/Gui/TabGroup.cpp @@ -36,7 +36,7 @@ #define NATRON_FORM_LAYOUT_LINES_SPACING 0 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct TabGroupTab { @@ -191,7 +191,7 @@ TabGroup::onGroupKnobSecretChanged() refreshTabSecretNess(groupKnob); } -NATRON_NAMESPACE_EXIT; -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_EXIT +NATRON_NAMESPACE_USING #include "moc_TabGroup.cpp" diff --git a/Gui/TabGroup.h b/Gui/TabGroup.h index 220016150e..ffdccf1f29 100644 --- a/Gui/TabGroup.h +++ b/Gui/TabGroup.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief Used when group are using the kFnOfxParamPropGroupIsTab extension @@ -78,6 +78,6 @@ public Q_SLOTS: }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_TabGroup_h diff --git a/Gui/TabWidget.cpp b/Gui/TabWidget.cpp index 5292e0c02b..a287c471e0 100644 --- a/Gui/TabWidget.cpp +++ b/Gui/TabWidget.cpp @@ -81,7 +81,7 @@ CLANG_DIAG_ON(deprecated) #define TAB_DRAG_WIDGET_PERCENT_FOR_SPLITTING 0.13 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class TransparentDropRect : public QWidget @@ -2179,7 +2179,7 @@ TabWidgetPrivate::removeTabToPython(PanelWidget* widget, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_TabWidget.cpp" diff --git a/Gui/TabWidget.h b/Gui/TabWidget.h index 93184e49cc..4de056120e 100644 --- a/Gui/TabWidget.h +++ b/Gui/TabWidget.h @@ -44,7 +44,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class DragPixmap : public QWidget @@ -369,6 +369,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif /* defined(NATRON_GUI_TABWIDGET_H_) */ diff --git a/Gui/TableModelView.cpp b/Gui/TableModelView.cpp index ff57529a19..e87596a42a 100644 --- a/Gui/TableModelView.cpp +++ b/Gui/TableModelView.cpp @@ -43,7 +43,7 @@ #include "Gui/ComboBox.h" #include "Gui/SpinBox.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER //////////////TableItem @@ -1454,7 +1454,7 @@ TableView::dropEvent(QDropEvent* e) Q_EMIT itemDropped(); } // TableView::dropEvent -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_TableModelView.cpp" diff --git a/Gui/TableModelView.h b/Gui/TableModelView.h index d11f2c6094..d7ae9b5ac1 100644 --- a/Gui/TableModelView.h +++ b/Gui/TableModelView.h @@ -47,7 +47,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/LineEdit.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class TableItem { @@ -460,7 +460,7 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT Q_DECLARE_METATYPE(NATRON_NAMESPACE::TableItem*) diff --git a/Gui/TextRenderer.cpp b/Gui/TextRenderer.cpp index 6c7293bb91..64b9540f8e 100644 --- a/Gui/TextRenderer.cpp +++ b/Gui/TextRenderer.cpp @@ -42,7 +42,7 @@ CLANG_DIAG_OFF(deprecated) #include CLANG_DIAG_ON(deprecated) -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #define TEXTURE_SIZE 256 @@ -346,5 +346,5 @@ TextRenderer::renderText(float x, glCheckError(); } // renderText -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/TextRenderer.h b/Gui/TextRenderer.h index 8e98ad2a0f..f51178ffca 100644 --- a/Gui/TextRenderer.h +++ b/Gui/TextRenderer.h @@ -34,7 +34,7 @@ #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class TextRenderer { @@ -58,6 +58,6 @@ class TextRenderer boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_TEXTRENDERER_H diff --git a/Gui/TimeLineGui.cpp b/Gui/TimeLineGui.cpp index 66f7382d29..153fd5f585 100644 --- a/Gui/TimeLineGui.cpp +++ b/Gui/TimeLineGui.cpp @@ -60,7 +60,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/ViewerTab.h" #include "Gui/ticks.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #define TICK_HEIGHT 7 #define CURSOR_WIDTH 15 @@ -1335,7 +1335,7 @@ TimeLineGui::onProjectFrameRangeChanged(int left, update(); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_TimeLineGui.cpp" diff --git a/Gui/TimeLineGui.h b/Gui/TimeLineGui.h index 7d817547c7..d9f0f83cb0 100644 --- a/Gui/TimeLineGui.h +++ b/Gui/TimeLineGui.h @@ -47,7 +47,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct TimelineGuiPrivate; @@ -177,6 +177,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif /* defined(NATRON_GUI_TIMELINE_H_) */ diff --git a/Gui/ToolButton.cpp b/Gui/ToolButton.cpp index 7ca0e5a9cd..c6a3017409 100644 --- a/Gui/ToolButton.cpp +++ b/Gui/ToolButton.cpp @@ -38,7 +38,7 @@ CLANG_DIAG_ON(deprecated) #include "Engine/CreateNodeArgs.h" #include "Engine/Project.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ToolButtonPrivate { @@ -232,7 +232,7 @@ ToolButton::sortChildren() _imp->_children = sortedChildren; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ToolButton.cpp" diff --git a/Gui/ToolButton.h b/Gui/ToolButton.h index 4306c91c26..584d1a820b 100644 --- a/Gui/ToolButton.h +++ b/Gui/ToolButton.h @@ -43,7 +43,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ToolButtonPrivate; @@ -102,6 +102,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TOOLBUTTON_H diff --git a/Gui/TrackerPanel.cpp b/Gui/TrackerPanel.cpp index 9ca1ec1c9b..3e4404abe7 100644 --- a/Gui/TrackerPanel.cpp +++ b/Gui/TrackerPanel.cpp @@ -75,7 +75,7 @@ #define COL_ERROR 7 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class TrackerTableItemDelegate : public QStyledItemDelegate @@ -2043,8 +2043,8 @@ TrackerPanel::onTimeChanged(SequenceTime time, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_TrackerPanel.cpp" diff --git a/Gui/TrackerPanel.h b/Gui/TrackerPanel.h index 9a51db6cb3..6a6ad931c0 100644 --- a/Gui/TrackerPanel.h +++ b/Gui/TrackerPanel.h @@ -43,7 +43,7 @@ CLANG_DIAG_ON(uninitialized) #include "Global/GlobalDefines.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** * @brief This is the new tracker panel, the previous version TrackerPanelV1 (used for TrackerPM) can be found in MultiInstancePanel.h @@ -158,6 +158,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // TRACKERPANEL_H diff --git a/Gui/VerticalColorBar.cpp b/Gui/VerticalColorBar.cpp index e63cf5bb4d..9d238c205a 100644 --- a/Gui/VerticalColorBar.cpp +++ b/Gui/VerticalColorBar.cpp @@ -31,7 +31,7 @@ #define NATRON_VERTICAL_BAR_WIDTH 2 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER VerticalColorBar::VerticalColorBar(QWidget* parent) : QWidget(parent) @@ -67,7 +67,7 @@ VerticalColorBar::paintEvent(QPaintEvent* /*e*/) p.drawLine( NATRON_VERTICAL_BAR_WIDTH / 2, NATRON_VERTICAL_BAR_WIDTH, NATRON_VERTICAL_BAR_WIDTH / 2, height() - NATRON_VERTICAL_BAR_WIDTH); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_VerticalColorBar.cpp" diff --git a/Gui/VerticalColorBar.h b/Gui/VerticalColorBar.h index ce15b6c0f4..8eda28e9ab 100644 --- a/Gui/VerticalColorBar.h +++ b/Gui/VerticalColorBar.h @@ -43,7 +43,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class VerticalColorBar : public QWidget @@ -69,6 +69,6 @@ public Q_SLOTS: virtual void paintEvent(QPaintEvent* e) OVERRIDE FINAL; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_VerticalColorBar_h diff --git a/Gui/ViewerGL.cpp b/Gui/ViewerGL.cpp index 9d596b9141..8b52ecb145 100644 --- a/Gui/ViewerGL.cpp +++ b/Gui/ViewerGL.cpp @@ -107,7 +107,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON /*This class is the the core of the viewer : what displays images, overlays, etc... Everything related to OpenGL will (almost always) be in this class */ -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ViewerGL::ViewerGL(ViewerTab* parent, @@ -4607,7 +4607,7 @@ ViewerGL::currentTimeForEvent(QInputEvent* e) return now.tv_sec + now.tv_usec / 1000000.0; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ViewerGL.cpp" diff --git a/Gui/ViewerGL.h b/Gui/ViewerGL.h index 379d4b0054..b48ed5dbf3 100644 --- a/Gui/ViewerGL.h +++ b/Gui/ViewerGL.h @@ -48,7 +48,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** *@class ViewerGL @@ -633,6 +633,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; // PIMPL: hide implementation details }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // GLVIEWER_H diff --git a/Gui/ViewerGLPrivate.cpp b/Gui/ViewerGLPrivate.cpp index 65e525b4ab..6d4fa8be4d 100644 --- a/Gui/ViewerGLPrivate.cpp +++ b/Gui/ViewerGLPrivate.cpp @@ -55,7 +55,7 @@ -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*This class is the the core of the viewer : what displays images, overlays, etc... Everything related to OpenGL will (almost always) be in this class */ @@ -992,4 +992,4 @@ ViewerGL::Implementation::refreshSelectionRectangle(const QPointF & pos) selectionRectangle.setRect(xmin, ymin, xmax - xmin, ymax - ymin); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/ViewerGLPrivate.h b/Gui/ViewerGLPrivate.h index 9dc27f3cdf..f84b25b5b8 100644 --- a/Gui/ViewerGLPrivate.h +++ b/Gui/ViewerGLPrivate.h @@ -47,7 +47,7 @@ CLANG_DIAG_ON(uninitialized) #define MAX_MIP_MAP_LEVELS 20 -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /*This class is the the core of the viewer : what displays images, overlays, etc... Everything related to OpenGL will (almost always) be in this class */ @@ -287,6 +287,6 @@ struct ViewerGL::Implementation bool initAndCheckGlExtensions (); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif //_Gui_ViewerGLPrivate_h_ diff --git a/Gui/ViewerTab.cpp b/Gui/ViewerTab.cpp index 537df6b8c9..56daa65050 100644 --- a/Gui/ViewerTab.cpp +++ b/Gui/ViewerTab.cpp @@ -61,7 +61,7 @@ #include "Gui/ViewerGL.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER static void @@ -1096,7 +1096,7 @@ ViewerTab::ViewerTab(const std::list & existingNodesContext, } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING #include "moc_ViewerTab.cpp" diff --git a/Gui/ViewerTab.h b/Gui/ViewerTab.h index 7c871561dc..98fdb47e62 100644 --- a/Gui/ViewerTab.h +++ b/Gui/ViewerTab.h @@ -42,7 +42,7 @@ #include "Gui/PanelWidget.h" #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER typedef std::map RenderStatsMap; @@ -476,6 +476,6 @@ public Q_SLOTS: boost::scoped_ptr _imp; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // NATRON_GUI_VIEWERTAB_H diff --git a/Gui/ViewerTab10.cpp b/Gui/ViewerTab10.cpp index 62faa1a691..4dc36b6886 100644 --- a/Gui/ViewerTab10.cpp +++ b/Gui/ViewerTab10.cpp @@ -61,7 +61,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/ViewerGL.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void @@ -1046,4 +1046,4 @@ ViewerTab::nextView() _imp->viewerNode->renderCurrentFrame(true); } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/ViewerTab20.cpp b/Gui/ViewerTab20.cpp index 85d76e6ea9..98444e9ce3 100644 --- a/Gui/ViewerTab20.cpp +++ b/Gui/ViewerTab20.cpp @@ -55,7 +55,7 @@ GCC_DIAG_UNUSED_PRIVATE_FIELD_ON #include "Gui/ViewerGL.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER #ifdef NATRON_TRANSFORM_AFFECTS_OVERLAYS //OpenGL is column-major for matrixes @@ -1062,4 +1062,4 @@ ViewerTab::notifyOverlaysFocusLost(const RenderScale & renderScale) return ret; } // ViewerTab::notifyOverlaysFocusLost -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/ViewerTab30.cpp b/Gui/ViewerTab30.cpp index 197fadf7f7..d7ed660df4 100644 --- a/Gui/ViewerTab30.cpp +++ b/Gui/ViewerTab30.cpp @@ -62,7 +62,7 @@ #endif -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER bool ViewerTab::isClippedToProject() const @@ -1204,4 +1204,4 @@ ViewerTab::onClipPreferencesChanged() } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/ViewerTab40.cpp b/Gui/ViewerTab40.cpp index 67cba2f91b..c76f4fb4f6 100644 --- a/Gui/ViewerTab40.cpp +++ b/Gui/ViewerTab40.cpp @@ -62,7 +62,7 @@ #include "Gui/ViewerGL.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER void ViewerTab::onInputChanged(int inputNb) @@ -1308,4 +1308,4 @@ ViewerTab::onPanelMadeCurrent() } } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/ViewerTabPrivate.cpp b/Gui/ViewerTabPrivate.cpp index c4025d93ee..d67b78ebb9 100644 --- a/Gui/ViewerTabPrivate.cpp +++ b/Gui/ViewerTabPrivate.cpp @@ -45,7 +45,7 @@ #include "Gui/ViewerTab.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ViewerTabPrivate::ViewerTabPrivate(ViewerTab* publicInterface, @@ -415,4 +415,4 @@ ViewerTabPrivate::hasInactiveNodeViewerContext(const NodePtr& node) return n->getNode() != node; } -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT diff --git a/Gui/ViewerTabPrivate.h b/Gui/ViewerTabPrivate.h index 7f795ff872..2991cfc9a3 100644 --- a/Gui/ViewerTabPrivate.h +++ b/Gui/ViewerTabPrivate.h @@ -49,7 +49,7 @@ CLANG_DIAG_ON(uninitialized) #define NATRON_TRANSFORM_AFFECTS_OVERLAYS -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER struct ViewerTabPrivate { @@ -224,6 +224,6 @@ struct ViewerTabPrivate bool hasInactiveNodeViewerContext(const NodePtr& node); }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // Gui_ViewerTabPrivate_h diff --git a/Gui/ViewerToolButton.cpp b/Gui/ViewerToolButton.cpp index 52ef0feb52..c18344c091 100644 --- a/Gui/ViewerToolButton.cpp +++ b/Gui/ViewerToolButton.cpp @@ -35,7 +35,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiMacros.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER ViewerToolButton::ViewerToolButton(QWidget* parent) @@ -120,6 +120,6 @@ ViewerToolButton::handleSelection() } } -NATRON_NAMESPACE_EXIT; -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_EXIT +NATRON_NAMESPACE_USING #include "moc_ViewerToolButton.cpp" diff --git a/Gui/ViewerToolButton.h b/Gui/ViewerToolButton.h index a8325739f9..9176aea19e 100644 --- a/Gui/ViewerToolButton.h +++ b/Gui/ViewerToolButton.h @@ -35,7 +35,7 @@ CLANG_DIAG_OFF(uninitialized) CLANG_DIAG_ON(deprecated) CLANG_DIAG_ON(uninitialized) -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER class ViewerToolButton : public QToolButton @@ -70,6 +70,6 @@ public Q_SLOTS: bool wasMouseReleased; }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // VIEWERTOOLBUTTON_H diff --git a/Gui/ZoomContext.h b/Gui/ZoomContext.h index 20c95dfbc1..0d5418642a 100644 --- a/Gui/ZoomContext.h +++ b/Gui/ZoomContext.h @@ -41,7 +41,7 @@ CLANG_DIAG_ON(uninitialized) #include "Gui/GuiFwd.h" -NATRON_NAMESPACE_ENTER; +NATRON_NAMESPACE_ENTER /** *@class ZoomContext @@ -357,6 +357,6 @@ class ZoomContext double _screenHeight; /// window height in screen pixels }; -NATRON_NAMESPACE_EXIT; +NATRON_NAMESPACE_EXIT #endif // ZOOMCONTEXT_H diff --git a/Tests/Tracker_Test.cpp b/Tests/Tracker_Test.cpp index a86d4a95ed..f6a80cafe3 100644 --- a/Tests/Tracker_Test.cpp +++ b/Tests/Tracker_Test.cpp @@ -44,7 +44,7 @@ GCC_DIAG_ON(maybe-uninitialized) #include "Engine/Transform.h" #include "Global/GlobalDefines.h" -NATRON_NAMESPACE_USING; +NATRON_NAMESPACE_USING using namespace openMVG::robust; diff --git a/global.pri b/global.pri index aa797b4d5b..b8e72f5c7a 100644 --- a/global.pri +++ b/global.pri @@ -36,13 +36,16 @@ run-without-python { DEFINES += NATRON_RUN_WITHOUT_PYTHON } -*g++* | *clang* { +*g++* | *clang* | *xcode* { #See https://bugreports.qt.io/browse/QTBUG-35776 we cannot use # QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO # QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO # QMAKE_OBJECTIVE_CFLAGS_RELEASE_WITH_DEBUGINFO # QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO + QMAKE_CFLAGS_WARN_ON += -Wall -Wextra -pedantic -Wmissing-prototypes -Wmissing-declarations -Wno-multichar -Winit-self + QMAKE_CXXFLAGS_WARN_ON += -Wall -Wextra -pedantic -Weffc++ -Wno-multichar -Winit-self + CONFIG(relwithdebinfo) { CONFIG += release DEFINES *= NDEBUG @@ -127,8 +130,6 @@ unix:LIBS += $$QMAKE_LIBS_DYNLOAD *g++* { QMAKE_CXXFLAGS += -ftemplate-depth-1024 - QMAKE_CFLAGS_WARN_ON += -Wextra -Wmissing-prototypes -Wmissing-declarations -Wno-multichar - QMAKE_CXXFLAGS_WARN_ON += -Wextra -Wno-multichar GCCVer = $$system($$QMAKE_CXX --version) contains(GCCVer,[0-3]\\.[0-9]+.*) { } else { @@ -371,8 +372,7 @@ unix { *clang* { QMAKE_CXXFLAGS += -ftemplate-depth-1024 - QMAKE_CFLAGS_WARN_ON += -Wextra - QMAKE_CXXFLAGS_WARN_ON += -Wextra -Wno-c++11-extensions + QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions c++11 { QMAKE_CXXFLAGS += -std=c++11 } diff --git a/tools/utils/runPostShiboken.sh b/tools/utils/runPostShiboken.sh index ceb7f04ad6..4f47887e6a 100755 --- a/tools/utils/runPostShiboken.sh +++ b/tools/utils/runPostShiboken.sh @@ -57,9 +57,9 @@ sed -e 's@"NatronEngine\.NATRON_NAMESPACE@"NatronEngine.Natron@g' -e 's@"NatronG #sed -e 's@" ::\([^s][^t][^d]\)@ NATRON_NAMESPACE::\1@g' -i'.bak' Engine/NatronEngine/*.cpp Engine/NatronEngine/*.h Gui/NatronGui/*.cpp Gui/NatronGui/*.h sed -e 's@SbkType< ::@SbkType$@CLANG_DIAG_OFF(header-guard)\ sed -e 's@^#include $@CLANG_DIAG_OFF(deprecated)\ CLANG_DIAG_OFF(uninitialized)\ +CLANG_DIAG_OFF(keyword-macro)\ #include // produces warnings\ CLANG_DIAG_ON(deprecated)\ -CLANG_DIAG_ON(uninitialized)@' -i'.bak' Engine/NatronEngine/*.cpp Gui/NatronGui/*.cpp Engine/NatronEngine/*.h Gui/NatronGui/*.h +CLANG_DIAG_ON(uninitialized)\ +CLANG_DIAG_ON(keyword-macro)@' -i'.bak' Engine/NatronEngine/*.cpp Gui/NatronGui/*.cpp Engine/NatronEngine/*.h Gui/NatronGui/*.h sed -e 's@^#include $@CLANG_DIAG_OFF(deprecated)\ CLANG_DIAG_OFF(uninitialized)\ +CLANG_DIAG_OFF(keyword-macro)\ #include // produces warnings\ CLANG_DIAG_ON(deprecated)\ -CLANG_DIAG_ON(uninitialized)@' -i'.bak' Engine/NatronEngine/*.cpp Gui/NatronGui/*.cpp Engine/NatronEngine/*.h Gui/NatronGui/*.h +CLANG_DIAG_ON(uninitialized)\ +CLANG_DIAG_ON(keyword-macro)@' -i'.bak' Engine/NatronEngine/*.cpp Gui/NatronGui/*.cpp Engine/NatronEngine/*.h Gui/NatronGui/*.h # clean up rm Gui/NatronGui/*.bak Engine/NatronEngine/*.bak