From 48f0f071761d6e4127eb8439f7d0f76a3750a39b Mon Sep 17 00:00:00 2001 From: tritao Date: Sun, 19 Jan 2025 23:44:27 +0000 Subject: [PATCH] Gui: Reorganize the navigation files into a top `Navigation` folder. --- src/Gui/CMakeLists.txt | 48 ++++++++++-------- src/Gui/CommandDoc.cpp | 2 +- src/Gui/CommandView.cpp | 2 +- .../BlenderNavigationStyle.cpp | 2 +- .../{ => Navigation}/CADNavigationStyle.cpp | 2 +- ...NavigationStyle-state-machine-diagram.docx | Bin .../GestureNavigationStyle.cpp | 0 .../{ => Navigation}/GestureNavigationStyle.h | 2 +- .../InventorNavigationStyle.cpp | 2 +- .../MayaGestureNavigationStyle.cpp | 2 +- .../{ => Navigation}/NavigationAnimation.cpp | 0 .../{ => Navigation}/NavigationAnimation.h | 2 +- .../{ => Navigation}/NavigationAnimator.cpp | 0 src/Gui/{ => Navigation}/NavigationAnimator.h | 2 +- src/Gui/{ => Navigation}/NavigationStyle.cpp | 8 +-- src/Gui/{ => Navigation}/NavigationStyle.h | 0 .../{ => Navigation}/NavigationStylePy.xml | 2 +- .../{ => Navigation}/NavigationStylePyImp.cpp | 4 +- .../OpenCascadeNavigationStyle.cpp | 2 +- .../OpenSCADNavigationStyle.cpp | 2 +- .../{ => Navigation}/RevitNavigationStyle.cpp | 2 +- .../TinkerCADNavigationStyle.cpp | 2 +- .../TouchpadNavigationStyle.cpp | 2 +- .../PreferencePages/DlgSettingsNavigation.cpp | 2 +- src/Gui/SoFCDB.cpp | 4 +- src/Gui/SplitView3DInventor.cpp | 2 +- src/Gui/View3DInventor.cpp | 2 +- src/Gui/View3DInventorViewer.cpp | 6 +-- src/Gui/View3DPy.cpp | 2 +- src/Gui/View3DSettings.cpp | 2 +- src/Gui/View3DViewerPy.cpp | 2 +- src/Mod/Mesh/Gui/Command.cpp | 2 +- src/Mod/Mesh/Gui/MeshSelection.cpp | 2 +- src/Mod/Sandbox/Gui/Overlay.cpp | 2 +- src/Mod/Start/Gui/GeneralSettingsWidget.cpp | 2 +- src/Mod/TechDraw/Gui/QGVPage.cpp | 2 +- 36 files changed, 65 insertions(+), 57 deletions(-) rename src/Gui/{ => Navigation}/BlenderNavigationStyle.cpp (99%) rename src/Gui/{ => Navigation}/CADNavigationStyle.cpp (99%) rename src/Gui/{ => Navigation}/GestureNavigationStyle-state-machine-diagram.docx (100%) rename src/Gui/{ => Navigation}/GestureNavigationStyle.cpp (100%) rename src/Gui/{ => Navigation}/GestureNavigationStyle.h (99%) rename src/Gui/{ => Navigation}/InventorNavigationStyle.cpp (99%) rename src/Gui/{ => Navigation}/MayaGestureNavigationStyle.cpp (99%) rename src/Gui/{ => Navigation}/NavigationAnimation.cpp (100%) rename src/Gui/{ => Navigation}/NavigationAnimation.h (98%) rename src/Gui/{ => Navigation}/NavigationAnimator.cpp (100%) rename src/Gui/{ => Navigation}/NavigationAnimator.h (98%) rename src/Gui/{ => Navigation}/NavigationStyle.cpp (99%) rename src/Gui/{ => Navigation}/NavigationStyle.h (100%) rename src/Gui/{ => Navigation}/NavigationStylePy.xml (90%) rename src/Gui/{ => Navigation}/NavigationStylePyImp.cpp (94%) rename src/Gui/{ => Navigation}/OpenCascadeNavigationStyle.cpp (99%) rename src/Gui/{ => Navigation}/OpenSCADNavigationStyle.cpp (99%) rename src/Gui/{ => Navigation}/RevitNavigationStyle.cpp (99%) rename src/Gui/{ => Navigation}/TinkerCADNavigationStyle.cpp (99%) rename src/Gui/{ => Navigation}/TouchpadNavigationStyle.cpp (99%) diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index c642702a8c..3e3c05e4f9 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -262,7 +262,7 @@ generate_from_xml(LinkViewPy) generate_from_xml(ViewProviderLinkPy) generate_from_xml(AxisOriginPy) generate_from_xml(CommandPy) -generate_from_xml(NavigationStylePy) +generate_from_xml(Navigation/NavigationStylePy) generate_from_py(FreeCADGuiInit GuiInitScript.h) @@ -895,18 +895,6 @@ SET(View3D_CPP_SRCS GLPainter.cpp Multisample.cpp MouseSelection.cpp - NavigationStyle.cpp - NavigationStylePyImp.cpp - InventorNavigationStyle.cpp - CADNavigationStyle.cpp - RevitNavigationStyle.cpp - BlenderNavigationStyle.cpp - MayaGestureNavigationStyle.cpp - OpenCascadeNavigationStyle.cpp - OpenSCADNavigationStyle.cpp - TinkerCADNavigationStyle.cpp - TouchpadNavigationStyle.cpp - GestureNavigationStyle.cpp SplitView3DInventor.cpp View.cpp View3DInventor.cpp @@ -918,8 +906,6 @@ SET(View3D_CPP_SRCS View3DPy.cpp View3DViewerPy.cpp NaviCube.cpp - NavigationAnimator.cpp - NavigationAnimation.cpp ) SET(View3D_SRCS ${View3D_CPP_SRCS} @@ -929,9 +915,6 @@ SET(View3D_SRCS GLPainter.h Multisample.h MouseSelection.h - NavigationStyle.h - NavigationStylePy.xml - GestureNavigationStyle.h SplitView3DInventor.h View.h View3DInventor.h @@ -943,11 +926,35 @@ SET(View3D_SRCS CoinRiftWidget.h View3DViewerPy.h NaviCube.h - NavigationAnimator.h - NavigationAnimation.h ) SOURCE_GROUP("View3D" FILES ${View3D_SRCS}) +SET(Navigation_CPP_SRCS + Navigation/NavigationStyle.cpp + Navigation/NavigationStylePyImp.cpp + Navigation/InventorNavigationStyle.cpp + Navigation/CADNavigationStyle.cpp + Navigation/RevitNavigationStyle.cpp + Navigation/BlenderNavigationStyle.cpp + Navigation/MayaGestureNavigationStyle.cpp + Navigation/OpenCascadeNavigationStyle.cpp + Navigation/OpenSCADNavigationStyle.cpp + Navigation/TinkerCADNavigationStyle.cpp + Navigation/TouchpadNavigationStyle.cpp + Navigation/GestureNavigationStyle.cpp + Navigation/NavigationAnimator.cpp + Navigation/NavigationAnimation.cpp +) +SET(Navigation_SRCS + ${Navigation_CPP_SRCS} + Navigation/NavigationStyle.h + Navigation/NavigationStylePy.xml + Navigation/GestureNavigationStyle.h + Navigation/NavigationAnimator.h + Navigation/NavigationAnimation.h +) +SOURCE_GROUP("Navigation" FILES ${Navigation_SRCS}) + #quarter sources FILE(GLOB_RECURSE Quarter_CPP_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Quarter/*.cpp) FILE(GLOB_RECURSE Quarter_H_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Quarter/*.h) @@ -1360,6 +1367,7 @@ SET(FreeCADGui_SRCS ${Resource_SRCS} ${Quarter_SRCS} ${View3D_SRCS} + ${Navigation_SRCS} ${Viewprovider_SRCS} ${Widget_SRCS} ${Params_SRCS} diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp index f5d2a00fb5..83f0d413de 100644 --- a/src/Gui/CommandDoc.cpp +++ b/src/Gui/CommandDoc.cpp @@ -61,7 +61,7 @@ #include "GraphvizView.h" #include "ManualAlignment.h" #include "MergeDocuments.h" -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "Placement.h" #include "Transform.h" #include "View3DInventor.h" diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 92fe52fd28..10746f1a11 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -68,7 +68,7 @@ #include "Inventor/SoAxisCrossKit.h" #include "Macro.h" #include "MainWindow.h" -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "OverlayParams.h" #include "OverlayManager.h" #include "SceneInspector.h" diff --git a/src/Gui/BlenderNavigationStyle.cpp b/src/Gui/Navigation/BlenderNavigationStyle.cpp similarity index 99% rename from src/Gui/BlenderNavigationStyle.cpp rename to src/Gui/Navigation/BlenderNavigationStyle.cpp index 6988b34caa..3bc606585a 100644 --- a/src/Gui/BlenderNavigationStyle.cpp +++ b/src/Gui/Navigation/BlenderNavigationStyle.cpp @@ -27,7 +27,7 @@ # include #endif -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/CADNavigationStyle.cpp b/src/Gui/Navigation/CADNavigationStyle.cpp similarity index 99% rename from src/Gui/CADNavigationStyle.cpp rename to src/Gui/Navigation/CADNavigationStyle.cpp index b5d9dbb632..301d80907e 100644 --- a/src/Gui/CADNavigationStyle.cpp +++ b/src/Gui/Navigation/CADNavigationStyle.cpp @@ -26,7 +26,7 @@ # include #endif -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/GestureNavigationStyle-state-machine-diagram.docx b/src/Gui/Navigation/GestureNavigationStyle-state-machine-diagram.docx similarity index 100% rename from src/Gui/GestureNavigationStyle-state-machine-diagram.docx rename to src/Gui/Navigation/GestureNavigationStyle-state-machine-diagram.docx diff --git a/src/Gui/GestureNavigationStyle.cpp b/src/Gui/Navigation/GestureNavigationStyle.cpp similarity index 100% rename from src/Gui/GestureNavigationStyle.cpp rename to src/Gui/Navigation/GestureNavigationStyle.cpp diff --git a/src/Gui/GestureNavigationStyle.h b/src/Gui/Navigation/GestureNavigationStyle.h similarity index 99% rename from src/Gui/GestureNavigationStyle.h rename to src/Gui/Navigation/GestureNavigationStyle.h index 3b8886799b..a8fa4e6d0a 100644 --- a/src/Gui/GestureNavigationStyle.h +++ b/src/Gui/Navigation/GestureNavigationStyle.h @@ -23,7 +23,7 @@ #ifndef GESTURENAVIGATIONSTYLE2_H #define GESTURENAVIGATIONSTYLE2_H -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include #include diff --git a/src/Gui/InventorNavigationStyle.cpp b/src/Gui/Navigation/InventorNavigationStyle.cpp similarity index 99% rename from src/Gui/InventorNavigationStyle.cpp rename to src/Gui/Navigation/InventorNavigationStyle.cpp index 9acf9f6255..e8bb21d176 100644 --- a/src/Gui/InventorNavigationStyle.cpp +++ b/src/Gui/Navigation/InventorNavigationStyle.cpp @@ -28,7 +28,7 @@ #endif #include "Inventor/SoMouseWheelEvent.h" -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/MayaGestureNavigationStyle.cpp b/src/Gui/Navigation/MayaGestureNavigationStyle.cpp similarity index 99% rename from src/Gui/MayaGestureNavigationStyle.cpp rename to src/Gui/Navigation/MayaGestureNavigationStyle.cpp index 645f1067b9..9d7e31ebf5 100644 --- a/src/Gui/MayaGestureNavigationStyle.cpp +++ b/src/Gui/Navigation/MayaGestureNavigationStyle.cpp @@ -63,7 +63,7 @@ #include -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "SoTouchEvents.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/NavigationAnimation.cpp b/src/Gui/Navigation/NavigationAnimation.cpp similarity index 100% rename from src/Gui/NavigationAnimation.cpp rename to src/Gui/Navigation/NavigationAnimation.cpp diff --git a/src/Gui/NavigationAnimation.h b/src/Gui/Navigation/NavigationAnimation.h similarity index 98% rename from src/Gui/NavigationAnimation.h rename to src/Gui/Navigation/NavigationAnimation.h index 1308a8e95e..d14e8a366a 100644 --- a/src/Gui/NavigationAnimation.h +++ b/src/Gui/Navigation/NavigationAnimation.h @@ -24,7 +24,7 @@ #ifndef GUI_NAVIGATIONANIMATION_H #define GUI_NAVIGATIONANIMATION_H -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include #include #include diff --git a/src/Gui/NavigationAnimator.cpp b/src/Gui/Navigation/NavigationAnimator.cpp similarity index 100% rename from src/Gui/NavigationAnimator.cpp rename to src/Gui/Navigation/NavigationAnimator.cpp diff --git a/src/Gui/NavigationAnimator.h b/src/Gui/Navigation/NavigationAnimator.h similarity index 98% rename from src/Gui/NavigationAnimator.h rename to src/Gui/Navigation/NavigationAnimator.h index 8b206acd71..0d0f6e953f 100644 --- a/src/Gui/NavigationAnimator.h +++ b/src/Gui/Navigation/NavigationAnimator.h @@ -24,7 +24,7 @@ #ifndef GUI_NAVIGATIONANIMATOR_H #define GUI_NAVIGATIONANIMATOR_H -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include #include diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/Navigation/NavigationStyle.cpp similarity index 99% rename from src/Gui/NavigationStyle.cpp rename to src/Gui/Navigation/NavigationStyle.cpp index 9316c1ac8d..32f9939e3c 100644 --- a/src/Gui/NavigationStyle.cpp +++ b/src/Gui/Navigation/NavigationStyle.cpp @@ -42,14 +42,14 @@ #include #include -#include "NavigationStyle.h" -#include "NavigationStylePy.h" +#include "Navigation/NavigationStyle.h" +#include "Navigation/NavigationStylePy.h" #include "Application.h" #include "Inventor/SoMouseWheelEvent.h" #include "MenuManager.h" #include "MouseSelection.h" -#include "NavigationAnimator.h" -#include "NavigationAnimation.h" +#include "Navigation/NavigationAnimator.h" +#include "Navigation/NavigationAnimation.h" #include "View3DInventorViewer.h" using namespace Gui; diff --git a/src/Gui/NavigationStyle.h b/src/Gui/Navigation/NavigationStyle.h similarity index 100% rename from src/Gui/NavigationStyle.h rename to src/Gui/Navigation/NavigationStyle.h diff --git a/src/Gui/NavigationStylePy.xml b/src/Gui/Navigation/NavigationStylePy.xml similarity index 90% rename from src/Gui/NavigationStylePy.xml rename to src/Gui/Navigation/NavigationStylePy.xml index 7506701f88..314eda00ee 100644 --- a/src/Gui/NavigationStylePy.xml +++ b/src/Gui/Navigation/NavigationStylePy.xml @@ -5,7 +5,7 @@ Name="NavigationStylePy" Twin="NavigationStyle" TwinPointer="NavigationStyle" - Include="Gui/NavigationStyle.h" + Include="Gui/Navigation/NavigationStyle.h" Namespace="Gui" FatherInclude="Base/BaseClassPy.h" FatherNamespace="Base"> diff --git a/src/Gui/NavigationStylePyImp.cpp b/src/Gui/Navigation/NavigationStylePyImp.cpp similarity index 94% rename from src/Gui/NavigationStylePyImp.cpp rename to src/Gui/Navigation/NavigationStylePyImp.cpp index df0f1c573c..c8cb1859ac 100644 --- a/src/Gui/NavigationStylePyImp.cpp +++ b/src/Gui/Navigation/NavigationStylePyImp.cpp @@ -22,8 +22,8 @@ #include "PreCompiled.h" // inclusion of the generated files (generated out of NavigationStylePy.xml) -#include "NavigationStylePy.h" -#include "NavigationStylePy.cpp" +#include "Navigation/NavigationStylePy.h" +#include "Navigation/NavigationStylePy.cpp" using namespace Gui; diff --git a/src/Gui/OpenCascadeNavigationStyle.cpp b/src/Gui/Navigation/OpenCascadeNavigationStyle.cpp similarity index 99% rename from src/Gui/OpenCascadeNavigationStyle.cpp rename to src/Gui/Navigation/OpenCascadeNavigationStyle.cpp index ddb6613069..0100f2c7c0 100644 --- a/src/Gui/OpenCascadeNavigationStyle.cpp +++ b/src/Gui/Navigation/OpenCascadeNavigationStyle.cpp @@ -26,7 +26,7 @@ # include #endif -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/OpenSCADNavigationStyle.cpp b/src/Gui/Navigation/OpenSCADNavigationStyle.cpp similarity index 99% rename from src/Gui/OpenSCADNavigationStyle.cpp rename to src/Gui/Navigation/OpenSCADNavigationStyle.cpp index 263e8f0f85..3603df95a6 100644 --- a/src/Gui/OpenSCADNavigationStyle.cpp +++ b/src/Gui/Navigation/OpenSCADNavigationStyle.cpp @@ -26,7 +26,7 @@ # include #endif -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/RevitNavigationStyle.cpp b/src/Gui/Navigation/RevitNavigationStyle.cpp similarity index 99% rename from src/Gui/RevitNavigationStyle.cpp rename to src/Gui/Navigation/RevitNavigationStyle.cpp index af4e9b114e..7efc1bf436 100644 --- a/src/Gui/RevitNavigationStyle.cpp +++ b/src/Gui/Navigation/RevitNavigationStyle.cpp @@ -26,7 +26,7 @@ # include #endif -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/TinkerCADNavigationStyle.cpp b/src/Gui/Navigation/TinkerCADNavigationStyle.cpp similarity index 99% rename from src/Gui/TinkerCADNavigationStyle.cpp rename to src/Gui/Navigation/TinkerCADNavigationStyle.cpp index e7ca54f6c0..2935e2037f 100644 --- a/src/Gui/TinkerCADNavigationStyle.cpp +++ b/src/Gui/Navigation/TinkerCADNavigationStyle.cpp @@ -26,7 +26,7 @@ # include #endif -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/TouchpadNavigationStyle.cpp b/src/Gui/Navigation/TouchpadNavigationStyle.cpp similarity index 99% rename from src/Gui/TouchpadNavigationStyle.cpp rename to src/Gui/Navigation/TouchpadNavigationStyle.cpp index 6efa6dc9a3..9300b4619e 100644 --- a/src/Gui/TouchpadNavigationStyle.cpp +++ b/src/Gui/Navigation/TouchpadNavigationStyle.cpp @@ -25,7 +25,7 @@ # include #endif -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.cpp b/src/Gui/PreferencePages/DlgSettingsNavigation.cpp index 1d71982431..b1bb46d6ea 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.cpp +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp index d762615c11..44f100a1a6 100644 --- a/src/Gui/SoFCDB.cpp +++ b/src/Gui/SoFCDB.cpp @@ -50,8 +50,8 @@ #include "SoFCDB.h" #include "Camera.h" #include "Flag.h" -#include "GestureNavigationStyle.h" -#include "NavigationStyle.h" +#include "Navigation/GestureNavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "SelectionObject.h" #include "SoDevicePixelRatioElement.h" #include "SoFCColorBar.h" diff --git a/src/Gui/SplitView3DInventor.cpp b/src/Gui/SplitView3DInventor.cpp index 09fc08eec1..94e7ec4a72 100644 --- a/src/Gui/SplitView3DInventor.cpp +++ b/src/Gui/SplitView3DInventor.cpp @@ -36,7 +36,7 @@ #include "Application.h" #include "Camera.h" #include "Document.h" -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "SoFCSelectionAction.h" #include "View3DInventorViewer.h" #include "View3DPy.h" diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp index c38243c473..1364dc3b06 100644 --- a/src/Gui/View3DInventor.cpp +++ b/src/Gui/View3DInventor.cpp @@ -67,7 +67,7 @@ #include "FileDialog.h" #include "MainWindow.h" #include "NaviCube.h" -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "SoFCDB.h" #include "SoFCSelectionAction.h" #include "SoFCVectorizeSVGAction.h" diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index 7f0d238e5d..97731c14c8 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -107,7 +107,7 @@ #include "MainWindow.h" #include "Multisample.h" #include "NaviCube.h" -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "Selection.h" #include "SoDevicePixelRatioElement.h" #include "SoFCDB.h" @@ -126,8 +126,8 @@ #include "ViewProvider.h" #include "ViewProviderDocumentObject.h" #include "ViewProviderLink.h" -#include "NavigationAnimator.h" -#include "NavigationAnimation.h" +#include "Navigation/NavigationAnimator.h" +#include "Navigation/NavigationAnimation.h" #include "Utilities.h" #include diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp index d5e623c273..8d4834d4ac 100644 --- a/src/Gui/View3DPy.cpp +++ b/src/Gui/View3DPy.cpp @@ -56,7 +56,7 @@ #include "Camera.h" #include "Document.h" #include "Inventor/SoMouseWheelEvent.h" -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "PythonWrapper.h" #include "SoFCDB.h" #include "SoFCOffscreenRenderer.h" diff --git a/src/Gui/View3DSettings.cpp b/src/Gui/View3DSettings.cpp index a91c21709c..b309b6c172 100644 --- a/src/Gui/View3DSettings.cpp +++ b/src/Gui/View3DSettings.cpp @@ -33,7 +33,7 @@ #include #include "NaviCube.h" -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "SoFCSelectionAction.h" #include "View3DSettings.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/View3DViewerPy.cpp b/src/Gui/View3DViewerPy.cpp index 318a1e77b6..68f4c8da90 100644 --- a/src/Gui/View3DViewerPy.cpp +++ b/src/Gui/View3DViewerPy.cpp @@ -32,7 +32,7 @@ #include #include "PythonWrapper.h" -#include "NavigationStyle.h" +#include "Navigation/NavigationStyle.h" #include "View3DViewerPy.h" #include "View3DInventorViewer.h" diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp index 893aeb6fe6..595bc84f33 100644 --- a/src/Mod/Mesh/Gui/Command.cpp +++ b/src/Mod/Mesh/Gui/Command.cpp @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Mod/Mesh/Gui/MeshSelection.cpp b/src/Mod/Mesh/Gui/MeshSelection.cpp index 0f7c9f59fc..5653350595 100644 --- a/src/Mod/Mesh/Gui/MeshSelection.cpp +++ b/src/Mod/Mesh/Gui/MeshSelection.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Mod/Sandbox/Gui/Overlay.cpp b/src/Mod/Sandbox/Gui/Overlay.cpp index 6597579e51..c6e3fbff1e 100644 --- a/src/Mod/Sandbox/Gui/Overlay.cpp +++ b/src/Mod/Sandbox/Gui/Overlay.cpp @@ -310,7 +310,7 @@ void paintSelection() } // --------------------------------------- -#include +#include DrawingPlane::DrawingPlane() { diff --git a/src/Mod/Start/Gui/GeneralSettingsWidget.cpp b/src/Mod/Start/Gui/GeneralSettingsWidget.cpp index d9e1545f46..727b6b76eb 100644 --- a/src/Mod/Start/Gui/GeneralSettingsWidget.cpp +++ b/src/Mod/Start/Gui/GeneralSettingsWidget.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include using namespace StartGui; diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp index 233554eb33..4931016d5b 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.cpp +++ b/src/Mod/TechDraw/Gui/QGVPage.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include