From a72a0d6405ac871bf787ccd647ec505ad2e7631c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Reitb=C3=B6ck?= Date: Sat, 13 Sep 2025 11:39:05 +0200 Subject: [PATCH] Gui: use CMake to generate precompiled headers on all platforms "Professional CMake" book suggest the following: "Targets should build successfully with or without compiler support for precompiled headers. It should be considered an optimization, not a requirement. In particular, do not explicitly include a precompile header (e.g. stdafx.h) in the source code, let CMake force-include an automatically generated precompile header on the compiler command line instead. This is more portable across the major compilers and is likely to be easier to maintain. It will also avoid warnings being generated from certain code checking tools like iwyu (include what you use)." Therefore, removed the "#include " from sources, also there is no need for the "#ifdef _PreComp_" anymore --- src/Gui/3Dconnexion/GuiNativeEventWin32.cpp | 1 - src/Gui/3Dconnexion/MouseParameters.cpp | 1 - src/Gui/3Dconnexion/navlib/NavlibCmds.cpp | 1 - .../3Dconnexion/navlib/NavlibNavigation.cpp | 1 - src/Gui/3Dconnexion/navlib/NavlibPivot.cpp | 4 ---- src/Gui/Action.cpp | 5 ---- src/Gui/ActionFunction.cpp | 4 ---- src/Gui/ActiveObjectList.cpp | 2 -- src/Gui/Application.cpp | 6 ++--- src/Gui/ApplicationPy.cpp | 4 ---- src/Gui/ArcEngine.cpp | 2 -- src/Gui/Assistant.cpp | 5 ---- src/Gui/AutoSaver.cpp | 5 ---- src/Gui/AxisOrigin.cpp | 4 ---- src/Gui/AxisOriginPyImp.cpp | 3 --- src/Gui/BitmapFactory.cpp | 4 ---- src/Gui/CMakeLists.txt | 13 ++++++---- src/Gui/CallTips.cpp | 5 +--- src/Gui/Camera.cpp | 2 -- src/Gui/Clipping.cpp | 5 +--- src/Gui/CoinRiftWidget.cpp | 2 +- src/Gui/ComboLinks.cpp | 4 ---- src/Gui/ComboView.cpp | 3 --- src/Gui/Command.cpp | 6 ++--- src/Gui/CommandActionPy.cpp | 2 +- src/Gui/CommandCompleter.cpp | 4 ---- src/Gui/CommandDoc.cpp | 4 ---- src/Gui/CommandFeat.cpp | 4 ---- src/Gui/CommandLink.cpp | 4 ---- src/Gui/CommandMacro.cpp | 3 --- src/Gui/CommandPyImp.cpp | 3 --- src/Gui/CommandStd.cpp | 3 --- src/Gui/CommandStructure.cpp | 3 --- src/Gui/CommandTest.cpp | 4 ---- src/Gui/CommandView.cpp | 5 ---- src/Gui/CommandWindow.cpp | 4 ---- src/Gui/Control.cpp | 5 ---- src/Gui/DAGView/DAGModel.cpp | 3 --- src/Gui/DAGView/DAGModelGraph.cpp | 1 - src/Gui/DAGView/DAGRectItem.cpp | 4 +--- src/Gui/DAGView/DAGView.cpp | 3 --- src/Gui/DemoMode.cpp | 4 +--- src/Gui/Dialogs/DlgAbout.cpp | 4 ---- src/Gui/Dialogs/DlgActionsImp.cpp | 3 --- src/Gui/Dialogs/DlgActivateWindowImp.cpp | 3 --- src/Gui/Dialogs/DlgAddProperty.cpp | 3 --- src/Gui/Dialogs/DlgCheckableMessageBox.cpp | 3 --- .../Dialogs/DlgCreateNewPreferencePackImp.cpp | 4 ---- src/Gui/Dialogs/DlgCustomizeImp.cpp | 4 ---- src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp | 1 - src/Gui/Dialogs/DlgCustomizeSpaceball.cpp | 4 ---- .../DlgEditFileIncludePropertyExternal.cpp | 2 -- src/Gui/Dialogs/DlgExpressionInput.cpp | 3 --- src/Gui/Dialogs/DlgInputDialogImp.cpp | 4 ---- src/Gui/Dialogs/DlgKeyboardImp.cpp | 5 +--- src/Gui/Dialogs/DlgMacroExecuteImp.cpp | 3 --- src/Gui/Dialogs/DlgMacroRecordImp.cpp | 3 --- src/Gui/Dialogs/DlgMaterialPropertiesImp.cpp | 2 -- src/Gui/Dialogs/DlgObjectSelection.cpp | 3 --- src/Gui/Dialogs/DlgOnlineHelpImp.cpp | 3 --- src/Gui/Dialogs/DlgParameterFind.cpp | 3 --- src/Gui/Dialogs/DlgParameterImp.cpp | 4 +--- .../DlgPreferencePackManagementImp.cpp | 3 --- src/Gui/Dialogs/DlgPreferencesImp.cpp | 3 --- src/Gui/Dialogs/DlgProjectInformationImp.cpp | 3 --- src/Gui/Dialogs/DlgProjectUtility.cpp | 3 --- src/Gui/Dialogs/DlgPropertyLink.cpp | 3 --- .../Dialogs/DlgRevertToBackupConfigImp.cpp | 3 --- src/Gui/Dialogs/DlgRunExternal.cpp | 3 --- .../Dialogs/DlgSettingsColorGradientImp.cpp | 3 --- src/Gui/Dialogs/DlgSettingsImageImp.cpp | 3 --- src/Gui/Dialogs/DlgThemeEditor.cpp | 4 ---- src/Gui/Dialogs/DlgToolbarsImp.cpp | 3 --- src/Gui/Dialogs/DlgUndoRedo.cpp | 4 ---- src/Gui/Dialogs/DlgUnitsCalculatorImp.cpp | 4 ---- src/Gui/DockWindow.cpp | 2 -- src/Gui/DockWindowManager.cpp | 4 ---- src/Gui/Document.cpp | 4 ---- src/Gui/DocumentModel.cpp | 4 ---- src/Gui/DocumentObserver.cpp | 5 ---- src/Gui/DocumentObserverPython.cpp | 2 -- src/Gui/DocumentPyImp.cpp | 4 ---- src/Gui/DocumentRecovery.cpp | 5 ++-- src/Gui/DownloadItem.cpp | 1 - src/Gui/DownloadManager.cpp | 1 - src/Gui/EditableDatumLabel.cpp | 11 ++++----- src/Gui/EditorView.cpp | 4 ---- src/Gui/ElideCheckBox.cpp | 2 -- src/Gui/ElideCheckBox.h | 2 -- src/Gui/ElideLabel.cpp | 2 -- src/Gui/ElideLabel.h | 2 -- src/Gui/ExpressionBinding.cpp | 3 --- src/Gui/ExpressionBindingPy.cpp | 2 +- src/Gui/ExpressionCompleter.cpp | 5 ++-- src/Gui/FileDialog.cpp | 5 ++-- src/Gui/FileHandler.cpp | 5 ++-- src/Gui/Flag.cpp | 5 ++-- src/Gui/FontScaledSVG.cpp | 2 -- src/Gui/FontScaledSVG.h | 2 -- src/Gui/GLBuffer.cpp | 4 +++- src/Gui/GLPainter.cpp | 5 ---- src/Gui/GLPainter.h | 2 ++ src/Gui/GraphicsViewZoom.cpp | 5 ++-- src/Gui/GraphvizView.cpp | 6 ++--- src/Gui/GuiApplication.cpp | 19 ++++++++------- src/Gui/GuiApplicationNativeEventAware.cpp | 2 +- src/Gui/GuiConsole.cpp | 5 +--- src/Gui/ImageView.cpp | 5 ++-- src/Gui/InputField.cpp | 4 ---- src/Gui/InputHintPy.cpp | 2 -- src/Gui/InputHintWidget.cpp | 5 ++-- src/Gui/InputVector.cpp | 5 ++-- src/Gui/Inventor/Draggers/Gizmo.cpp | 4 ---- src/Gui/Inventor/Draggers/SoLinearDragger.cpp | 4 ---- .../Draggers/SoLinearDraggerGeometry.cpp | 4 ---- src/Gui/Inventor/Draggers/SoPlanarDragger.cpp | 3 --- .../Inventor/Draggers/SoRotationDragger.cpp | 3 --- .../Draggers/SoRotationDraggerGeometry.cpp | 4 ---- .../Inventor/Draggers/SoTransformDragger.cpp | 3 --- src/Gui/Inventor/MarkerBitmaps.cpp | 4 +--- src/Gui/Inventor/SmSwitchboard.cpp | 4 +--- src/Gui/Inventor/So3DAnnotation.cpp | 8 ++++--- src/Gui/Inventor/SoAutoZoomTranslation.cpp | 4 +--- src/Gui/Inventor/SoAxisCrossKit.cpp | 8 ++++--- src/Gui/Inventor/SoDrawingGrid.cpp | 9 ++++--- src/Gui/Inventor/SoFCBackgroundGradient.cpp | 11 +++++---- src/Gui/Inventor/SoFCBoundingBox.cpp | 4 ---- .../Inventor/SoFCPlacementIndicatorKit.cpp | 5 ---- src/Gui/Inventor/SoFCTransform.cpp | 3 --- src/Gui/Inventor/SoMouseWheelEvent.cpp | 1 - src/Gui/Inventor/SoToggleSwitch.cpp | 2 -- src/Gui/Inventor/SoToggleSwitch.h | 2 ++ src/Gui/InventorAll.h | 6 +++++ src/Gui/Language/Translator.cpp | 4 +--- src/Gui/LinkViewPyImp.cpp | 2 +- src/Gui/MDIView.cpp | 4 ---- src/Gui/MDIViewPy.cpp | 2 +- src/Gui/MDIViewPyWrap.cpp | 5 ++-- src/Gui/Macro.cpp | 5 ++-- src/Gui/MainWindow.cpp | 5 ++-- src/Gui/MainWindowPy.cpp | 5 ++-- src/Gui/ManualAlignment.cpp | 5 ++-- src/Gui/MenuManager.cpp | 5 ++-- src/Gui/MergeDocuments.cpp | 5 ++-- src/Gui/ModuleIO.cpp | 5 ++-- src/Gui/MouseSelection.cpp | 6 ++--- src/Gui/Multisample.cpp | 5 ++-- src/Gui/NaviCube.cpp | 5 ++-- src/Gui/Navigation/BlenderNavigationStyle.cpp | 4 ---- src/Gui/Navigation/CADNavigationStyle.cpp | 3 --- src/Gui/Navigation/GestureNavigationStyle.cpp | 7 +++--- .../Navigation/InventorNavigationStyle.cpp | 5 ++-- .../Navigation/MayaGestureNavigationStyle.cpp | 5 ++-- src/Gui/Navigation/NavigationAnimation.cpp | 2 +- src/Gui/Navigation/NavigationAnimator.cpp | 2 +- src/Gui/Navigation/NavigationStateChart.cpp | 2 -- src/Gui/Navigation/NavigationStyle.cpp | 5 ++-- src/Gui/Navigation/NavigationStylePyImp.cpp | 2 -- .../Navigation/OpenCascadeNavigationStyle.cpp | 5 ++-- .../Navigation/OpenSCADNavigationStyle.cpp | 5 ++-- src/Gui/Navigation/RevitNavigationStyle.cpp | 5 ++-- .../Navigation/SiemensNXNavigationStyle.cpp | 4 ---- .../Navigation/SolidWorksNavigationStyle.cpp | 4 ---- .../Navigation/TinkerCADNavigationStyle.cpp | 5 ++-- .../Navigation/TouchpadNavigationStyle.cpp | 5 ++-- src/Gui/NetworkRetriever.cpp | 6 ++--- src/Gui/NotificationArea.cpp | 5 ++-- src/Gui/NotificationBox.cpp | 5 ++-- src/Gui/OnlineDocumentation.cpp | 5 ++-- src/Gui/OverlayManager.cpp | 4 ---- src/Gui/OverlayParams.cpp | 2 +- src/Gui/OverlayWidgets.cpp | 5 ++-- src/Gui/ParamHandler.cpp | 3 --- src/Gui/Placement.cpp | 5 ++-- src/Gui/PreCompiled.cpp | 24 ------------------- src/Gui/PreCompiled.h | 6 ++--- src/Gui/PrefWidgets.cpp | 5 ++-- src/Gui/PreferencePackManager.cpp | 5 ++-- .../PreferencePages/DlgSettings3DViewImp.cpp | 4 +--- .../PreferencePages/DlgSettingsAdvanced.cpp | 4 +--- .../DlgSettingsCacheDirectory.cpp | 4 ---- .../DlgSettingsDocumentImp.cpp | 4 ---- src/Gui/PreferencePages/DlgSettingsEditor.cpp | 4 +--- .../PreferencePages/DlgSettingsGeneral.cpp | 3 --- .../DlgSettingsLightSources.cpp | 4 ---- .../PreferencePages/DlgSettingsMacroImp.cpp | 1 - .../PreferencePages/DlgSettingsNavigation.cpp | 4 +--- .../DlgSettingsNotificationArea.cpp | 4 +--- src/Gui/PreferencePages/DlgSettingsPDF.cpp | 3 +-- .../DlgSettingsPythonConsole.cpp | 1 - .../PreferencePages/DlgSettingsReportView.cpp | 1 - .../PreferencePages/DlgSettingsSelection.cpp | 1 - src/Gui/PreferencePages/DlgSettingsUI.cpp | 4 +--- .../PreferencePages/DlgSettingsViewColor.cpp | 4 +--- .../DlgSettingsWorkbenchesImp.cpp | 3 --- .../PreferencePages/ListWidgetDragBugFix.cpp | 5 ++-- src/Gui/ProgressBar.cpp | 5 ++-- src/Gui/ProgressDialog.cpp | 5 ++-- src/Gui/PropertyPage.cpp | 5 ++-- src/Gui/PropertyView.cpp | 5 ++-- src/Gui/PythonConsole.cpp | 5 ++-- src/Gui/PythonConsolePy.cpp | 2 +- src/Gui/PythonDebugger.cpp | 6 ++--- src/Gui/PythonEditor.cpp | 5 ++-- src/Gui/PythonTracing.cpp | 5 ++-- src/Gui/PythonWorkbenchPyImp.cpp | 2 +- src/Gui/PythonWrapper.cpp | 10 ++++---- src/Gui/QuantitySpinBox.cpp | 4 ---- src/Gui/Quarter/SoQTQuarterAdaptor.cpp | 2 +- src/Gui/ReportView.cpp | 5 ++-- src/Gui/SceneInspector.cpp | 5 ++-- src/Gui/Selection/Selection.cpp | 5 ++-- src/Gui/Selection/SelectionFilter.cpp | 2 +- src/Gui/Selection/SelectionFilterPy.cpp | 2 +- src/Gui/Selection/SelectionObject.cpp | 2 +- src/Gui/Selection/SelectionObjectPyImp.cpp | 2 +- src/Gui/Selection/SelectionObserverPython.cpp | 2 +- src/Gui/Selection/SelectionView.cpp | 3 --- src/Gui/Selection/SoFCSelection.cpp | 5 ++-- src/Gui/Selection/SoFCSelection.h | 2 ++ src/Gui/Selection/SoFCSelectionAction.cpp | 5 ++-- src/Gui/Selection/SoFCSelectionContext.cpp | 5 ++-- src/Gui/Selection/SoFCUnifiedSelection.cpp | 5 ++-- src/Gui/ShortcutManager.cpp | 3 --- src/Gui/SoDatumLabel.cpp | 8 ++++--- src/Gui/SoDevicePixelRatioElement.cpp | 5 ++-- src/Gui/SoFCColorBar.cpp | 5 ++-- src/Gui/SoFCColorBarNotifier.cpp | 2 +- src/Gui/SoFCColorGradient.cpp | 5 ++-- src/Gui/SoFCColorLegend.cpp | 5 ++-- src/Gui/SoFCDB.cpp | 5 ++-- src/Gui/SoFCInteractiveElement.cpp | 5 ++-- src/Gui/SoFCOffscreenRenderer.cpp | 6 +++-- src/Gui/SoFCOffscreenRenderer.h | 2 ++ src/Gui/SoFCVectorizeSVGAction.cpp | 5 ++-- src/Gui/SoFCVectorizeU3DAction.cpp | 5 ++-- src/Gui/SoQtOffscreenRendererPy.cpp | 2 +- src/Gui/SoTextLabel.cpp | 4 +--- src/Gui/SoTouchEvents.cpp | 2 +- src/Gui/SpaceballEvent.cpp | 2 +- src/Gui/SpinBox.cpp | 4 ---- src/Gui/SplashScreen.cpp | 5 ++-- src/Gui/SplitView3DInventor.cpp | 5 ++-- src/Gui/StartupProcess.cpp | 9 ++++--- src/Gui/StyleParameters/ParameterManager.cpp | 6 ++--- src/Gui/StyleParameters/Parser.cpp | 4 ---- src/Gui/SyntaxHighlighter.cpp | 2 +- src/Gui/TaskDlgRelocation.cpp | 2 +- src/Gui/TaskElementColors.cpp | 5 ++-- src/Gui/TaskTransform.cpp | 3 --- src/Gui/TaskView/TaskAppearance.cpp | 1 - src/Gui/TaskView/TaskDialog.cpp | 4 +--- src/Gui/TaskView/TaskDialogPython.cpp | 4 +--- src/Gui/TaskView/TaskEditControl.cpp | 1 - src/Gui/TaskView/TaskImage.cpp | 3 --- src/Gui/TaskView/TaskOrientation.cpp | 3 --- src/Gui/TaskView/TaskSelectLinkProperty.cpp | 1 - src/Gui/TaskView/TaskSolverMessages.cpp | 3 --- src/Gui/TaskView/TaskView.cpp | 6 ++--- src/Gui/TaskView/TaskWatcher.cpp | 1 - src/Gui/TextDocumentEditorView.cpp | 5 ++-- src/Gui/TextEdit.cpp | 6 ++--- src/Gui/TextureMapping.cpp | 5 ++-- src/Gui/Thumbnail.cpp | 5 ++-- src/Gui/ToolBarAreaWidget.cpp | 5 ++-- src/Gui/ToolBarManager.cpp | 5 ++-- src/Gui/ToolBox.cpp | 5 ++-- src/Gui/ToolBoxManager.cpp | 5 ++-- src/Gui/ToolHandler.cpp | 3 --- src/Gui/Tools.h | 1 + src/Gui/TransactionObject.cpp | 2 +- src/Gui/Transform.cpp | 2 +- src/Gui/Tree.cpp | 5 ++-- src/Gui/TreeParams.cpp | 2 +- src/Gui/TreeView.cpp | 5 ++-- src/Gui/UiLoader.cpp | 5 ++-- src/Gui/Utilities.cpp | 5 ++-- src/Gui/VectorListEditor.cpp | 4 ---- src/Gui/View.cpp | 2 +- src/Gui/View3DInventor.cpp | 5 ++-- src/Gui/View3DInventorRiftViewer.cpp | 2 +- src/Gui/View3DInventorSelection.cpp | 5 ++-- src/Gui/View3DInventorViewer.cpp | 4 +--- src/Gui/View3DInventorViewer.h | 2 ++ src/Gui/View3DPy.cpp | 4 ---- src/Gui/View3DSettings.cpp | 5 ++-- src/Gui/View3DViewerPy.cpp | 4 ---- src/Gui/ViewParams.cpp | 2 +- src/Gui/ViewProvider.cpp | 5 ++-- src/Gui/ViewProviderAnnotation.cpp | 5 ++-- src/Gui/ViewProviderBuilder.cpp | 5 ++-- src/Gui/ViewProviderCoordinateSystem.cpp | 5 ++-- src/Gui/ViewProviderDatum.cpp | 4 ---- src/Gui/ViewProviderDocumentObject.cpp | 5 ++-- src/Gui/ViewProviderDocumentObjectGroup.cpp | 2 +- src/Gui/ViewProviderDocumentObjectPyImp.cpp | 5 ++-- src/Gui/ViewProviderDragger.cpp | 4 ---- src/Gui/ViewProviderExtension.cpp | 5 ++-- src/Gui/ViewProviderExtensionPyImp.cpp | 5 ++-- src/Gui/ViewProviderExtern.cpp | 5 ++-- src/Gui/ViewProviderFeature.cpp | 2 +- src/Gui/ViewProviderFeaturePython.cpp | 5 ++-- src/Gui/ViewProviderGeoFeatureGroup.cpp | 2 +- .../ViewProviderGeoFeatureGroupExtension.cpp | 5 ++-- src/Gui/ViewProviderGeometryObject.cpp | 5 ++-- src/Gui/ViewProviderGeometryObjectPyImp.cpp | 5 ++-- src/Gui/ViewProviderGroupExtension.cpp | 5 ++-- src/Gui/ViewProviderImagePlane.cpp | 5 ++-- src/Gui/ViewProviderInventorObject.cpp | 5 ++-- src/Gui/ViewProviderLine.cpp | 5 ++-- src/Gui/ViewProviderLink.cpp | 5 ++-- src/Gui/ViewProviderLinkPyImp.cpp | 5 ++-- src/Gui/ViewProviderMaterialObject.cpp | 5 ++-- src/Gui/ViewProviderOriginGroup.cpp | 2 +- src/Gui/ViewProviderOriginGroupExtension.cpp | 5 ++-- src/Gui/ViewProviderPart.cpp | 5 ++-- src/Gui/ViewProviderPlacement.cpp | 5 ++-- src/Gui/ViewProviderPlane.cpp | 4 ---- src/Gui/ViewProviderPoint.cpp | 5 ++-- src/Gui/ViewProviderPyImp.cpp | 5 ++-- src/Gui/ViewProviderSuppressibleExtension.cpp | 2 +- src/Gui/ViewProviderTextDocument.cpp | 5 ++-- src/Gui/ViewProviderTextureExtension.cpp | 5 ++-- src/Gui/ViewProviderVRMLObject.cpp | 5 ++-- src/Gui/ViewProviderVarSet.cpp | 5 ++-- src/Gui/WaitCursor.cpp | 5 +--- src/Gui/WhatsThis.cpp | 5 ++-- src/Gui/WidgetFactory.cpp | 6 ++--- src/Gui/Widgets.cpp | 5 ++-- src/Gui/Window.cpp | 2 +- src/Gui/Workbench.cpp | 5 ++-- src/Gui/WorkbenchFactory.cpp | 2 +- src/Gui/WorkbenchManager.cpp | 2 +- src/Gui/WorkbenchManipulator.cpp | 2 +- src/Gui/WorkbenchManipulatorPython.cpp | 2 +- src/Gui/WorkbenchPyImp.cpp | 2 +- src/Gui/WorkbenchSelector.cpp | 5 ++-- src/Gui/propertyeditor/PropertyEditor.cpp | 5 ---- src/Gui/propertyeditor/PropertyItem.cpp | 4 ---- .../propertyeditor/PropertyItemDelegate.cpp | 5 ---- src/Gui/propertyeditor/PropertyModel.cpp | 4 ---- src/Gui/resource.cpp | 2 +- .../StyleParametersApplicationTest.cpp | 2 ++ 343 files changed, 399 insertions(+), 983 deletions(-) delete mode 100644 src/Gui/PreCompiled.cpp diff --git a/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp b/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp index 8ab68da1e9..8de57e1846 100644 --- a/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp +++ b/src/Gui/3Dconnexion/GuiNativeEventWin32.cpp @@ -35,7 +35,6 @@ See also: http://www.3dconnexion.com/forum/viewtopic.php?f=19&t=4968&sid=72c018bdcf0e6edc99a6effb5c0c48d9 */ -#include "PreCompiled.h" #include #include "GuiNativeEventWin32.h" diff --git a/src/Gui/3Dconnexion/MouseParameters.cpp b/src/Gui/3Dconnexion/MouseParameters.cpp index 5a822fded9..ecc832caea 100644 --- a/src/Gui/3Dconnexion/MouseParameters.cpp +++ b/src/Gui/3Dconnexion/MouseParameters.cpp @@ -5,7 +5,6 @@ Development tools and related technology provided under license from 3Dconnexion */ -#include "PreCompiled.h" #include "MouseParameters.h" MouseParameters::MouseParameters(): fNavigation(kObjectMode) diff --git a/src/Gui/3Dconnexion/navlib/NavlibCmds.cpp b/src/Gui/3Dconnexion/navlib/NavlibCmds.cpp index c32747fe90..3165381cf4 100644 --- a/src/Gui/3Dconnexion/navlib/NavlibCmds.cpp +++ b/src/Gui/3Dconnexion/navlib/NavlibCmds.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include #include "NavlibInterface.h" #include diff --git a/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp b/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp index 47a0219f9e..3aad796fb6 100644 --- a/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp +++ b/src/Gui/3Dconnexion/navlib/NavlibNavigation.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include #include "NavlibInterface.h" #include diff --git a/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp b/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp index c021d21e3a..ce4d776e14 100644 --- a/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp +++ b/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ -#include - -#ifndef _PreComp_ #include -#endif #include #include diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp index fc870af556..f26155f401 100644 --- a/src/Gui/Action.cpp +++ b/src/Gui/Action.cpp @@ -20,10 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -36,7 +32,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/ActionFunction.cpp b/src/Gui/ActionFunction.cpp index 5ef70c8448..9264c327c4 100644 --- a/src/Gui/ActionFunction.cpp +++ b/src/Gui/ActionFunction.cpp @@ -20,14 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include # include -#endif #include "ActionFunction.h" diff --git a/src/Gui/ActiveObjectList.cpp b/src/Gui/ActiveObjectList.cpp index e76882167a..b8e158124a 100644 --- a/src/Gui/ActiveObjectList.cpp +++ b/src/Gui/ActiveObjectList.cpp @@ -21,8 +21,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include #include #include diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 5e627476ef..2cac0bcbfd 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -41,13 +38,14 @@ #include #include #include -#endif #include #include #include #include +#include + #include #include #include diff --git a/src/Gui/ApplicationPy.cpp b/src/Gui/ApplicationPy.cpp index 178531e472..5f4f1700ee 100644 --- a/src/Gui/ApplicationPy.cpp +++ b/src/Gui/ApplicationPy.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -32,7 +29,6 @@ # include # include # include -#endif #include diff --git a/src/Gui/ArcEngine.cpp b/src/Gui/ArcEngine.cpp index 33bfc4424b..6140962f19 100644 --- a/src/Gui/ArcEngine.cpp +++ b/src/Gui/ArcEngine.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "ArcEngine.h" #include #include diff --git a/src/Gui/Assistant.cpp b/src/Gui/Assistant.cpp index d4f577da8d..db9e53d2f1 100644 --- a/src/Gui/Assistant.cpp +++ b/src/Gui/Assistant.cpp @@ -20,10 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -31,7 +27,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/AutoSaver.cpp b/src/Gui/AutoSaver.cpp index f23e576635..6604d3a7b3 100644 --- a/src/Gui/AutoSaver.cpp +++ b/src/Gui/AutoSaver.cpp @@ -20,17 +20,12 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include # include # include # include -#endif #include #include diff --git a/src/Gui/AxisOrigin.cpp b/src/Gui/AxisOrigin.cpp index 397f4b2b39..b45b1c4212 100644 --- a/src/Gui/AxisOrigin.cpp +++ b/src/Gui/AxisOrigin.cpp @@ -20,9 +20,6 @@ * * ****************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -34,7 +31,6 @@ # include # include # include -#endif #include "Inventor/SoAutoZoomTranslation.h" #include "SoFCSelection.h" diff --git a/src/Gui/AxisOriginPyImp.cpp b/src/Gui/AxisOriginPyImp.cpp index 941b939bb4..38ac1d89ea 100644 --- a/src/Gui/AxisOriginPyImp.cpp +++ b/src/Gui/AxisOriginPyImp.cpp @@ -20,12 +20,9 @@ * * ****************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include -#endif #include "AxisOriginPy.h" #include "AxisOriginPy.cpp" diff --git a/src/Gui/BitmapFactory.cpp b/src/Gui/BitmapFactory.cpp index 2f99fb380c..b6657bac0f 100644 --- a/src/Gui/BitmapFactory.cpp +++ b/src/Gui/BitmapFactory.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -36,7 +33,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 271a03a6be..fbd4fe2f98 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -1416,7 +1416,6 @@ SET(FreeCADGui_SRCS MetaTypes.h ModuleIO.h Notifications.h - PreCompiled.cpp PreCompiled.h QtAll.h Control.h @@ -1497,9 +1496,15 @@ if(MSVC) ) endif(MSVC) -if (FREECAD_USE_PCH) - add_definitions(-D_PreComp_) - ADD_MSVC_PRECOMPILED_HEADER(FreeCADGui PreCompiled.h PreCompiled.cpp FreeCADGui_CPP_SRCS) +if(FREECAD_USE_PCH) + target_precompile_headers(FreeCADGui PRIVATE + $<$:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h"> + ) + + set_source_files_properties( + ${qsintActionPanel_SRCS} + ${Quarter_SRCS} + PROPERTIES SKIP_PRECOMPILE_HEADERS TRUE) endif(FREECAD_USE_PCH) if (FREECAD_USE_QT_FILEDIALOG) diff --git a/src/Gui/CallTips.cpp b/src/Gui/CallTips.cpp index 159d16d4bc..321fc728b9 100644 --- a/src/Gui/CallTips.cpp +++ b/src/Gui/CallTips.cpp @@ -20,10 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include + # include # include # include @@ -32,7 +30,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/Camera.cpp b/src/Gui/Camera.cpp index f6481a076f..5060e6fdc4 100644 --- a/src/Gui/Camera.cpp +++ b/src/Gui/Camera.cpp @@ -21,8 +21,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" - #include "Camera.h" #include "Utilities.h" diff --git a/src/Gui/Clipping.cpp b/src/Gui/Clipping.cpp index aebf86e8bd..266b1f0d16 100644 --- a/src/Gui/Clipping.cpp +++ b/src/Gui/Clipping.cpp @@ -20,17 +20,14 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ #include + #include #include #include #include #include #include -#endif #include "Clipping.h" #include "ui_Clipping.h" diff --git a/src/Gui/CoinRiftWidget.cpp b/src/Gui/CoinRiftWidget.cpp index 37b9108d47..8143395043 100644 --- a/src/Gui/CoinRiftWidget.cpp +++ b/src/Gui/CoinRiftWidget.cpp @@ -32,7 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * \**************************************************************************/ -#include "PreCompiled.h" + #include "CoinRiftWidget.h" #include diff --git a/src/Gui/ComboLinks.cpp b/src/Gui/ComboLinks.cpp index 70c1dec605..23aea6c42b 100644 --- a/src/Gui/ComboLinks.cpp +++ b/src/Gui/ComboLinks.cpp @@ -21,15 +21,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "ComboLinks.h" -#ifndef _PreComp_ #include #include #include -#endif #include #include diff --git a/src/Gui/ComboView.cpp b/src/Gui/ComboView.cpp index 4883829124..6d43933a88 100644 --- a/src/Gui/ComboView.cpp +++ b/src/Gui/ComboView.cpp @@ -20,12 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include -#endif #include "ComboView.h" #include "PropertyView.h" diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp index a3ddb24cd8..9704188674 100644 --- a/src/Gui/Command.cpp +++ b/src/Gui/Command.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -32,10 +29,11 @@ # include # include # include -#endif #include +#include + #include #include #include diff --git a/src/Gui/CommandActionPy.cpp b/src/Gui/CommandActionPy.cpp index b3671882bb..5d9dcbf6b8 100644 --- a/src/Gui/CommandActionPy.cpp +++ b/src/Gui/CommandActionPy.cpp @@ -21,7 +21,7 @@ * * **************************************************************************/ -#include "PreCompiled.h" + #include #include "Command.h" diff --git a/src/Gui/CommandCompleter.cpp b/src/Gui/CommandCompleter.cpp index df572b343a..4027601b4c 100644 --- a/src/Gui/CommandCompleter.cpp +++ b/src/Gui/CommandCompleter.cpp @@ -20,14 +20,10 @@ * * ****************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include # include -#endif #include "Application.h" #include "ShortcutManager.h" diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp index 7b378573aa..107329e3e6 100644 --- a/src/Gui/CommandDoc.cpp +++ b/src/Gui/CommandDoc.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -31,7 +28,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/CommandFeat.cpp b/src/Gui/CommandFeat.cpp index 9685959b80..400b54a7df 100644 --- a/src/Gui/CommandFeat.cpp +++ b/src/Gui/CommandFeat.cpp @@ -21,10 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include #include diff --git a/src/Gui/CommandLink.cpp b/src/Gui/CommandLink.cpp index 111609a6f9..b49d33bbb6 100644 --- a/src/Gui/CommandLink.cpp +++ b/src/Gui/CommandLink.cpp @@ -20,12 +20,8 @@ * * ****************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include -#endif #include #include diff --git a/src/Gui/CommandMacro.cpp b/src/Gui/CommandMacro.cpp index 622817c922..30f1031c7d 100644 --- a/src/Gui/CommandMacro.cpp +++ b/src/Gui/CommandMacro.cpp @@ -20,12 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include -#endif #include "Command.h" #include "Action.h" diff --git a/src/Gui/CommandPyImp.cpp b/src/Gui/CommandPyImp.cpp index b2cc752ee8..ed71d9d21d 100644 --- a/src/Gui/CommandPyImp.cpp +++ b/src/Gui/CommandPyImp.cpp @@ -20,12 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include -#endif #include diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp index d3a9ca5c1c..aecf061e14 100644 --- a/src/Gui/CommandStd.cpp +++ b/src/Gui/CommandStd.cpp @@ -22,8 +22,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -32,7 +30,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/CommandStructure.cpp b/src/Gui/CommandStructure.cpp index 2a83205824..3d56c3782c 100644 --- a/src/Gui/CommandStructure.cpp +++ b/src/Gui/CommandStructure.cpp @@ -20,10 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include #include diff --git a/src/Gui/CommandTest.cpp b/src/Gui/CommandTest.cpp index ab789e7448..803860c4b6 100644 --- a/src/Gui/CommandTest.cpp +++ b/src/Gui/CommandTest.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -36,7 +33,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index e9d0b72c21..abf7e74547 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -20,10 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -42,7 +38,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/CommandWindow.cpp b/src/Gui/CommandWindow.cpp index 43b1cd5078..836e97398a 100644 --- a/src/Gui/CommandWindow.cpp +++ b/src/Gui/CommandWindow.cpp @@ -20,13 +20,9 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include -#endif #include "Command.h" #include "Action.h" diff --git a/src/Gui/Control.cpp b/src/Gui/Control.cpp index db1de326ee..3732dc45ab 100644 --- a/src/Gui/Control.cpp +++ b/src/Gui/Control.cpp @@ -20,16 +20,11 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include # include # include -#endif #include #include diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp index 7b567249b5..7a9d0fb207 100644 --- a/src/Gui/DAGView/DAGModel.cpp +++ b/src/Gui/DAGView/DAGModel.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -37,7 +35,6 @@ #include #include #include -#endif #include #include diff --git a/src/Gui/DAGView/DAGModelGraph.cpp b/src/Gui/DAGView/DAGModelGraph.cpp index f5e4ee6959..4122679f39 100644 --- a/src/Gui/DAGView/DAGModelGraph.cpp +++ b/src/Gui/DAGView/DAGModelGraph.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include "DAGModelGraph.h" diff --git a/src/Gui/DAGView/DAGRectItem.cpp b/src/Gui/DAGView/DAGRectItem.cpp index 3a82758bc5..cfde5e8a15 100644 --- a/src/Gui/DAGView/DAGRectItem.cpp +++ b/src/Gui/DAGView/DAGRectItem.cpp @@ -20,11 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif + #include diff --git a/src/Gui/DAGView/DAGView.cpp b/src/Gui/DAGView/DAGView.cpp index d525bbc9b1..54c3cbda6e 100644 --- a/src/Gui/DAGView/DAGView.cpp +++ b/src/Gui/DAGView/DAGView.cpp @@ -20,12 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include -#endif #include #include diff --git a/src/Gui/DemoMode.cpp b/src/Gui/DemoMode.cpp index 31818f15de..2e37427206 100644 --- a/src/Gui/DemoMode.cpp +++ b/src/Gui/DemoMode.cpp @@ -20,13 +20,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include + #include #include #include -#endif #include diff --git a/src/Gui/Dialogs/DlgAbout.cpp b/src/Gui/Dialogs/DlgAbout.cpp index c6621f9a8d..dac5655161 100644 --- a/src/Gui/Dialogs/DlgAbout.cpp +++ b/src/Gui/Dialogs/DlgAbout.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -40,7 +37,6 @@ #include #include #include -#endif #include #include diff --git a/src/Gui/Dialogs/DlgActionsImp.cpp b/src/Gui/Dialogs/DlgActionsImp.cpp index d12b41619d..df2f6b8f7b 100644 --- a/src/Gui/Dialogs/DlgActionsImp.cpp +++ b/src/Gui/Dialogs/DlgActionsImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -31,7 +29,6 @@ #include #include #include -#endif #include "Dialogs/DlgActionsImp.h" #include "ui_DlgActions.h" diff --git a/src/Gui/Dialogs/DlgActivateWindowImp.cpp b/src/Gui/Dialogs/DlgActivateWindowImp.cpp index 8449fe9069..872e0da646 100644 --- a/src/Gui/Dialogs/DlgActivateWindowImp.cpp +++ b/src/Gui/Dialogs/DlgActivateWindowImp.cpp @@ -20,11 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include -#endif #include "Dialogs/DlgActivateWindowImp.h" #include "ui_DlgActivateWindow.h" diff --git a/src/Gui/Dialogs/DlgAddProperty.cpp b/src/Gui/Dialogs/DlgAddProperty.cpp index 1682575e52..265f34415a 100644 --- a/src/Gui/Dialogs/DlgAddProperty.cpp +++ b/src/Gui/Dialogs/DlgAddProperty.cpp @@ -22,13 +22,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include # include -#endif #include #include diff --git a/src/Gui/Dialogs/DlgCheckableMessageBox.cpp b/src/Gui/Dialogs/DlgCheckableMessageBox.cpp index 0e077d5331..203f91c9c4 100644 --- a/src/Gui/Dialogs/DlgCheckableMessageBox.cpp +++ b/src/Gui/Dialogs/DlgCheckableMessageBox.cpp @@ -27,11 +27,8 @@ ** **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include -#endif #include diff --git a/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp b/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp index cd12d0260f..63439472b2 100644 --- a/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp +++ b/src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp @@ -20,14 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include # include -#endif #include "Dialogs/DlgCreateNewPreferencePackImp.h" #include "ui_DlgCreateNewPreferencePack.h" diff --git a/src/Gui/Dialogs/DlgCustomizeImp.cpp b/src/Gui/Dialogs/DlgCustomizeImp.cpp index e35382ecb6..ca94bc7587 100644 --- a/src/Gui/Dialogs/DlgCustomizeImp.cpp +++ b/src/Gui/Dialogs/DlgCustomizeImp.cpp @@ -20,14 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include # include -#endif #include "Dialogs/DlgCustomizeImp.h" #include "MainWindow.h" diff --git a/src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp index 8270fe3017..f87597e476 100644 --- a/src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp +++ b/src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include "Dialogs/DlgCustomizeSpNavSettings.h" #include "ui_DlgCustomizeSpNavSettings.h" diff --git a/src/Gui/Dialogs/DlgCustomizeSpaceball.cpp b/src/Gui/Dialogs/DlgCustomizeSpaceball.cpp index 1983913df0..16606bd4a7 100644 --- a/src/Gui/Dialogs/DlgCustomizeSpaceball.cpp +++ b/src/Gui/Dialogs/DlgCustomizeSpaceball.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -34,7 +31,6 @@ #include #include #include -#endif #include "Base/Console.h" diff --git a/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.cpp b/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.cpp index 803372e5b2..4069deae99 100644 --- a/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.cpp +++ b/src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "Dialogs/DlgEditFileIncludePropertyExternal.h" #include "Application.h" #include "FileDialog.h" diff --git a/src/Gui/Dialogs/DlgExpressionInput.cpp b/src/Gui/Dialogs/DlgExpressionInput.cpp index 2e55b263ec..df3191861c 100644 --- a/src/Gui/Dialogs/DlgExpressionInput.cpp +++ b/src/Gui/Dialogs/DlgExpressionInput.cpp @@ -21,15 +21,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include #include #include -#endif #include diff --git a/src/Gui/Dialogs/DlgInputDialogImp.cpp b/src/Gui/Dialogs/DlgInputDialogImp.cpp index b386dd0151..49988c22aa 100644 --- a/src/Gui/Dialogs/DlgInputDialogImp.cpp +++ b/src/Gui/Dialogs/DlgInputDialogImp.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include -#endif #include "Dialogs/DlgInputDialogImp.h" #include "ui_DlgInputDialog.h" diff --git a/src/Gui/Dialogs/DlgKeyboardImp.cpp b/src/Gui/Dialogs/DlgKeyboardImp.cpp index 5360dd4a44..a006570aca 100644 --- a/src/Gui/Dialogs/DlgKeyboardImp.cpp +++ b/src/Gui/Dialogs/DlgKeyboardImp.cpp @@ -20,15 +20,12 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" #include -#ifndef _PreComp_ + #include #include #include #include -#endif #include #include diff --git a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp index 5df607e2a6..7dcd6212e5 100644 --- a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp +++ b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -30,7 +28,6 @@ #include #include #include -#endif #include #include diff --git a/src/Gui/Dialogs/DlgMacroRecordImp.cpp b/src/Gui/Dialogs/DlgMacroRecordImp.cpp index 53badd5ed7..307a9eae79 100644 --- a/src/Gui/Dialogs/DlgMacroRecordImp.cpp +++ b/src/Gui/Dialogs/DlgMacroRecordImp.cpp @@ -20,13 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include -#endif #include "Dialogs/DlgMacroRecordImp.h" #include "ui_DlgMacroRecord.h" diff --git a/src/Gui/Dialogs/DlgMaterialPropertiesImp.cpp b/src/Gui/Dialogs/DlgMaterialPropertiesImp.cpp index 2b59d320d6..c7200fa183 100644 --- a/src/Gui/Dialogs/DlgMaterialPropertiesImp.cpp +++ b/src/Gui/Dialogs/DlgMaterialPropertiesImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include #include "Dialogs/DlgMaterialPropertiesImp.h" diff --git a/src/Gui/Dialogs/DlgObjectSelection.cpp b/src/Gui/Dialogs/DlgObjectSelection.cpp index 7621fe4802..76d368376c 100644 --- a/src/Gui/Dialogs/DlgObjectSelection.cpp +++ b/src/Gui/Dialogs/DlgObjectSelection.cpp @@ -20,12 +20,9 @@ * * ****************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include -#endif #include #include diff --git a/src/Gui/Dialogs/DlgOnlineHelpImp.cpp b/src/Gui/Dialogs/DlgOnlineHelpImp.cpp index 99d18e90ff..562ed0076a 100644 --- a/src/Gui/Dialogs/DlgOnlineHelpImp.cpp +++ b/src/Gui/Dialogs/DlgOnlineHelpImp.cpp @@ -20,11 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include -#endif #include diff --git a/src/Gui/Dialogs/DlgParameterFind.cpp b/src/Gui/Dialogs/DlgParameterFind.cpp index 5e059789c8..5c2bb967b8 100644 --- a/src/Gui/Dialogs/DlgParameterFind.cpp +++ b/src/Gui/Dialogs/DlgParameterFind.cpp @@ -20,11 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif #include "Dialogs/DlgParameterFind.h" #include "ui_DlgParameterFind.h" diff --git a/src/Gui/Dialogs/DlgParameterImp.cpp b/src/Gui/Dialogs/DlgParameterImp.cpp index 597ab4f957..8308a16aa4 100644 --- a/src/Gui/Dialogs/DlgParameterImp.cpp +++ b/src/Gui/Dialogs/DlgParameterImp.cpp @@ -20,10 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include + #include #include #include @@ -31,7 +30,6 @@ #include #include #include -#endif #include #include diff --git a/src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp b/src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp index d1aab6e1ba..54d0a66852 100644 --- a/src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp +++ b/src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp @@ -20,10 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include -#endif #include "Dialogs/DlgPreferencePackManagementImp.h" #include "ui_DlgPreferencePackManagement.h" diff --git a/src/Gui/Dialogs/DlgPreferencesImp.cpp b/src/Gui/Dialogs/DlgPreferencesImp.cpp index bf11f16ae5..4ca7b05590 100644 --- a/src/Gui/Dialogs/DlgPreferencesImp.cpp +++ b/src/Gui/Dialogs/DlgPreferencesImp.cpp @@ -22,8 +22,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -57,7 +55,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/Dialogs/DlgProjectInformationImp.cpp b/src/Gui/Dialogs/DlgProjectInformationImp.cpp index a242448d27..e8844e2631 100644 --- a/src/Gui/Dialogs/DlgProjectInformationImp.cpp +++ b/src/Gui/Dialogs/DlgProjectInformationImp.cpp @@ -20,15 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include #include #include -#endif #include #include diff --git a/src/Gui/Dialogs/DlgProjectUtility.cpp b/src/Gui/Dialogs/DlgProjectUtility.cpp index eb340dbf1d..0a2123c7ee 100644 --- a/src/Gui/Dialogs/DlgProjectUtility.cpp +++ b/src/Gui/Dialogs/DlgProjectUtility.cpp @@ -20,12 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include -#endif #include diff --git a/src/Gui/Dialogs/DlgPropertyLink.cpp b/src/Gui/Dialogs/DlgPropertyLink.cpp index 87ec251ded..9ec2e93bf6 100644 --- a/src/Gui/Dialogs/DlgPropertyLink.cpp +++ b/src/Gui/Dialogs/DlgPropertyLink.cpp @@ -20,13 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include -#endif #include #include diff --git a/src/Gui/Dialogs/DlgRevertToBackupConfigImp.cpp b/src/Gui/Dialogs/DlgRevertToBackupConfigImp.cpp index 10e9f9f375..8c1f208b48 100644 --- a/src/Gui/Dialogs/DlgRevertToBackupConfigImp.cpp +++ b/src/Gui/Dialogs/DlgRevertToBackupConfigImp.cpp @@ -20,11 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include -#endif #include "Dialogs/DlgRevertToBackupConfigImp.h" #include "ui_DlgRevertToBackupConfig.h" diff --git a/src/Gui/Dialogs/DlgRunExternal.cpp b/src/Gui/Dialogs/DlgRunExternal.cpp index 2d82690a20..e443a89ec3 100644 --- a/src/Gui/Dialogs/DlgRunExternal.cpp +++ b/src/Gui/Dialogs/DlgRunExternal.cpp @@ -20,10 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include "Dialogs/DlgRunExternal.h" #include "ui_DlgRunExternal.h" diff --git a/src/Gui/Dialogs/DlgSettingsColorGradientImp.cpp b/src/Gui/Dialogs/DlgSettingsColorGradientImp.cpp index 6f0b298ccd..98a77b6895 100644 --- a/src/Gui/Dialogs/DlgSettingsColorGradientImp.cpp +++ b/src/Gui/Dialogs/DlgSettingsColorGradientImp.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -29,7 +27,6 @@ #include #include #include -#endif #include "Dialogs/DlgSettingsColorGradientImp.h" #include "ui_DlgSettingsColorGradient.h" diff --git a/src/Gui/Dialogs/DlgSettingsImageImp.cpp b/src/Gui/Dialogs/DlgSettingsImageImp.cpp index 96a0bd747a..ca85affcc8 100644 --- a/src/Gui/Dialogs/DlgSettingsImageImp.cpp +++ b/src/Gui/Dialogs/DlgSettingsImageImp.cpp @@ -20,11 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif #include "Dialogs/DlgSettingsImageImp.h" #include "ui_DlgSettingsImage.h" diff --git a/src/Gui/Dialogs/DlgThemeEditor.cpp b/src/Gui/Dialogs/DlgThemeEditor.cpp index a590661027..75bcb26505 100644 --- a/src/Gui/Dialogs/DlgThemeEditor.cpp +++ b/src/Gui/Dialogs/DlgThemeEditor.cpp @@ -21,8 +21,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "Tools.h" #include "Application.h" #include "OverlayManager.h" @@ -34,13 +32,11 @@ #include #include -#ifndef _PreComp_ # include # include # include # include # include -#endif QPixmap colorPreview(const QColor& color) { diff --git a/src/Gui/Dialogs/DlgToolbarsImp.cpp b/src/Gui/Dialogs/DlgToolbarsImp.cpp index 98f80cb79f..89f203405f 100644 --- a/src/Gui/Dialogs/DlgToolbarsImp.cpp +++ b/src/Gui/Dialogs/DlgToolbarsImp.cpp @@ -20,15 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include #include #include -#endif #include "Dialogs/DlgToolbarsImp.h" #include "Dialogs/DlgKeyboardImp.h" diff --git a/src/Gui/Dialogs/DlgUndoRedo.cpp b/src/Gui/Dialogs/DlgUndoRedo.cpp index 439c0a1532..3f56249286 100644 --- a/src/Gui/Dialogs/DlgUndoRedo.cpp +++ b/src/Gui/Dialogs/DlgUndoRedo.cpp @@ -20,12 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include -#endif #include "Dialogs/DlgUndoRedo.h" #include "Application.h" diff --git a/src/Gui/Dialogs/DlgUnitsCalculatorImp.cpp b/src/Gui/Dialogs/DlgUnitsCalculatorImp.cpp index 8e9ed1edc4..e3744c139d 100644 --- a/src/Gui/Dialogs/DlgUnitsCalculatorImp.cpp +++ b/src/Gui/Dialogs/DlgUnitsCalculatorImp.cpp @@ -20,13 +20,9 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include -#endif #include "Dialogs/DlgUnitsCalculatorImp.h" #include "ui_DlgUnitsCalculator.h" diff --git a/src/Gui/DockWindow.cpp b/src/Gui/DockWindow.cpp index 39ad26427d..91d5ca07fc 100644 --- a/src/Gui/DockWindow.cpp +++ b/src/Gui/DockWindow.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "DockWindow.h" diff --git a/src/Gui/DockWindowManager.cpp b/src/Gui/DockWindowManager.cpp index 590044801c..2b9acdb143 100644 --- a/src/Gui/DockWindowManager.cpp +++ b/src/Gui/DockWindowManager.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -31,7 +28,6 @@ # include # include # include -#endif #include diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index 64bd82e68a..497f54f18d 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -43,7 +40,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/DocumentModel.cpp b/src/Gui/DocumentModel.cpp index fc04ef65aa..65dacfe89e 100644 --- a/src/Gui/DocumentModel.cpp +++ b/src/Gui/DocumentModel.cpp @@ -20,12 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include -#endif #include #include diff --git a/src/Gui/DocumentObserver.cpp b/src/Gui/DocumentObserver.cpp index 10c2e84147..70a4a1655f 100644 --- a/src/Gui/DocumentObserver.cpp +++ b/src/Gui/DocumentObserver.cpp @@ -20,12 +20,7 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ # include -#endif #include diff --git a/src/Gui/DocumentObserverPython.cpp b/src/Gui/DocumentObserverPython.cpp index ef05c42638..9563248f61 100644 --- a/src/Gui/DocumentObserverPython.cpp +++ b/src/Gui/DocumentObserverPython.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include #include "Application.h" diff --git a/src/Gui/DocumentPyImp.cpp b/src/Gui/DocumentPyImp.cpp index 47ba85ebed..7f20f09710 100644 --- a/src/Gui/DocumentPyImp.cpp +++ b/src/Gui/DocumentPyImp.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include -#endif #include #include diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp index 561b8cdd75..7043724ecb 100644 --- a/src/Gui/DocumentRecovery.cpp +++ b/src/Gui/DocumentRecovery.cpp @@ -24,9 +24,7 @@ // write a property to file only when it has been modified // implement xml meta file -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -45,7 +43,8 @@ # include # include # include -#endif + +#include #include #include diff --git a/src/Gui/DownloadItem.cpp b/src/Gui/DownloadItem.cpp index 1f3bae4823..57162b31d4 100644 --- a/src/Gui/DownloadItem.cpp +++ b/src/Gui/DownloadItem.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Gui/DownloadManager.cpp b/src/Gui/DownloadManager.cpp index 0472745447..0f0c1c9c6a 100644 --- a/src/Gui/DownloadManager.cpp +++ b/src/Gui/DownloadManager.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Gui/EditableDatumLabel.cpp b/src/Gui/EditableDatumLabel.cpp index 73f91a91b6..f88e8fe8b8 100644 --- a/src/Gui/EditableDatumLabel.cpp +++ b/src/Gui/EditableDatumLabel.cpp @@ -21,15 +21,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include # include # include # include -#endif // _PreComp_ #include #include @@ -270,7 +267,7 @@ void EditableDatumLabel::stopEdit() spinBox->deleteLater(); spinBox = nullptr; - + // Lock icon will be automatically destroyed as it's a child of spinbox lockIconLabel = nullptr; } @@ -351,7 +348,7 @@ void EditableDatumLabel::positionSpinbox() pxCoord.setX(posX); pxCoord.setY(posY); spinBox->move(pxCoord); - + // Update lock icon position inside the spinbox if it exists and is visible if (lockIconLabel && lockIconLabel->isVisible()) { int iconSize = 14; @@ -498,7 +495,7 @@ void EditableDatumLabel::setLockedAppearance(bool locked) { if (locked) { if (spinBox) { - + // create lock icon label it it doesn't exist, if it does - show it if (!lockIconLabel) { lockIconLabel = new QLabel(spinBox); @@ -536,7 +533,7 @@ void EditableDatumLabel::setLockedAppearance(bool locked) // if spinbox exists, reset its appearance if (spinBox) { spinBox->setStyleSheet(QString()); - + // hide lock icon if it exists for later reuse if (lockIconLabel) { lockIconLabel->hide(); diff --git a/src/Gui/EditorView.cpp b/src/Gui/EditorView.cpp index a8b744f965..1d3b708af6 100644 --- a/src/Gui/EditorView.cpp +++ b/src/Gui/EditorView.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -42,7 +39,6 @@ #include #include #include -#endif #include "EditorView.h" #include "Application.h" diff --git a/src/Gui/ElideCheckBox.cpp b/src/Gui/ElideCheckBox.cpp index e6d8c4b28f..5ded4ee8d2 100644 --- a/src/Gui/ElideCheckBox.cpp +++ b/src/Gui/ElideCheckBox.cpp @@ -23,8 +23,6 @@ // This custom widget adds the missing ellipsize functionality in QT5 -#include "PreCompiled.h" - #include "ElideCheckBox.h" namespace Gui { diff --git a/src/Gui/ElideCheckBox.h b/src/Gui/ElideCheckBox.h index ce93133b53..0a1def0c6c 100644 --- a/src/Gui/ElideCheckBox.h +++ b/src/Gui/ElideCheckBox.h @@ -26,12 +26,10 @@ #ifndef ELIDECHECKBOX_H #define ELIDECHECKBOX_H -#ifndef _PreComp_ #include #include #include #include -#endif #include diff --git a/src/Gui/ElideLabel.cpp b/src/Gui/ElideLabel.cpp index 10d7294522..bb0c5fe32c 100644 --- a/src/Gui/ElideLabel.cpp +++ b/src/Gui/ElideLabel.cpp @@ -23,8 +23,6 @@ // This custom widget adds the missing ellipsize functionality in QT5 -#include "PreCompiled.h" - #include "ElideLabel.h" namespace Gui { diff --git a/src/Gui/ElideLabel.h b/src/Gui/ElideLabel.h index 7191d52f57..49acfbbd4d 100644 --- a/src/Gui/ElideLabel.h +++ b/src/Gui/ElideLabel.h @@ -26,11 +26,9 @@ #ifndef ELIDELABEL_H #define ELIDELABEL_H -#ifndef _PreComp_ #include #include #include -#endif #include diff --git a/src/Gui/ExpressionBinding.cpp b/src/Gui/ExpressionBinding.cpp index e6795617d1..4e9c9785c8 100644 --- a/src/Gui/ExpressionBinding.cpp +++ b/src/Gui/ExpressionBinding.cpp @@ -20,12 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include -#endif #include "BitmapFactory.h" #include "Command.h" diff --git a/src/Gui/ExpressionBindingPy.cpp b/src/Gui/ExpressionBindingPy.cpp index 670966bd00..b3e1643e54 100644 --- a/src/Gui/ExpressionBindingPy.cpp +++ b/src/Gui/ExpressionBindingPy.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include diff --git a/src/Gui/ExpressionCompleter.cpp b/src/Gui/ExpressionCompleter.cpp index fc8058f0ef..ac872251ea 100644 --- a/src/Gui/ExpressionCompleter.cpp +++ b/src/Gui/ExpressionCompleter.cpp @@ -20,16 +20,15 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include #include #include #include -#endif + #include #include diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp index 5ada39db60..2970408871 100644 --- a/src/Gui/FileDialog.cpp +++ b/src/Gui/FileDialog.cpp @@ -21,8 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -40,7 +39,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/FileHandler.cpp b/src/Gui/FileHandler.cpp index f64113c700..1caa554e46 100644 --- a/src/Gui/FileHandler.cpp +++ b/src/Gui/FileHandler.cpp @@ -21,13 +21,12 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include -#endif + #include "FileHandler.h" #include "Application.h" diff --git a/src/Gui/Flag.cpp b/src/Gui/Flag.cpp index 8fa2865801..4382c42881 100644 --- a/src/Gui/Flag.cpp +++ b/src/Gui/Flag.cpp @@ -21,12 +21,11 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include -#endif + #include #include "Flag.h" diff --git a/src/Gui/FontScaledSVG.cpp b/src/Gui/FontScaledSVG.cpp index 89c02e3b21..dd9d56e816 100644 --- a/src/Gui/FontScaledSVG.cpp +++ b/src/Gui/FontScaledSVG.cpp @@ -23,8 +23,6 @@ // This custom widget scales an svg according to fonts -#include "PreCompiled.h" - #include "FontScaledSVG.h" namespace Gui { diff --git a/src/Gui/FontScaledSVG.h b/src/Gui/FontScaledSVG.h index ffdc3e666b..f6dad95352 100644 --- a/src/Gui/FontScaledSVG.h +++ b/src/Gui/FontScaledSVG.h @@ -26,12 +26,10 @@ #ifndef FONTSCALEDSVG_H #define FONTSCALEDSVG_H -#ifndef _PreComp_ #include #include #include #include -#endif #include diff --git a/src/Gui/GLBuffer.cpp b/src/Gui/GLBuffer.cpp index 390dabec60..f1dd1ab3e2 100644 --- a/src/Gui/GLBuffer.cpp +++ b/src/Gui/GLBuffer.cpp @@ -21,12 +21,14 @@ ***************************************************************************/ -#include "PreCompiled.h" +#include #ifndef FC_OS_WIN32 # ifndef GL_GLEXT_PROTOTYPES # define GL_GLEXT_PROTOTYPES 1 # endif +#else +#include #endif #ifdef FC_OS_MACOSX diff --git a/src/Gui/GLPainter.cpp b/src/Gui/GLPainter.cpp index 600d2afb71..f6976a38b8 100644 --- a/src/Gui/GLPainter.cpp +++ b/src/Gui/GLPainter.cpp @@ -20,11 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ -#endif - #include #include "GLPainter.h" diff --git a/src/Gui/GLPainter.h b/src/Gui/GLPainter.h index ad16026c40..ccd0b3e88d 100644 --- a/src/Gui/GLPainter.h +++ b/src/Gui/GLPainter.h @@ -24,6 +24,8 @@ #ifndef GUI_GLPAINTER_H #define GUI_GLPAINTER_H +#include + #ifdef FC_OS_WIN32 #include #endif diff --git a/src/Gui/GraphicsViewZoom.cpp b/src/Gui/GraphicsViewZoom.cpp index b896b38124..7af39dc5ae 100644 --- a/src/Gui/GraphicsViewZoom.cpp +++ b/src/Gui/GraphicsViewZoom.cpp @@ -30,13 +30,12 @@ * */ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include -#endif + #include diff --git a/src/Gui/GraphvizView.cpp b/src/Gui/GraphvizView.cpp index f7acbc3e99..d4e812f411 100644 --- a/src/Gui/GraphvizView.cpp +++ b/src/Gui/GraphvizView.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -37,7 +36,8 @@ # include # include # include -#endif + +#include #include #include diff --git a/src/Gui/GuiApplication.cpp b/src/Gui/GuiApplication.cpp index 1df75a274f..7c988d00e3 100644 --- a/src/Gui/GuiApplication.cpp +++ b/src/Gui/GuiApplication.cpp @@ -21,9 +21,16 @@ ***************************************************************************/ -#include "PreCompiled.h" +#include + +#ifdef FC_OS_WIN32 +#include +#elif defined(Q_OS_UNIX) +# include +# include +# include +#endif -#ifndef _PreComp_ # include # include # include @@ -33,16 +40,12 @@ # include # include # include -#endif + #include #include -#if defined(Q_OS_UNIX) -# include -# include -# include -#endif + #include #include diff --git a/src/Gui/GuiApplicationNativeEventAware.cpp b/src/Gui/GuiApplicationNativeEventAware.cpp index 9e02558875..645c333952 100644 --- a/src/Gui/GuiApplicationNativeEventAware.cpp +++ b/src/Gui/GuiApplicationNativeEventAware.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include #include diff --git a/src/Gui/GuiConsole.cpp b/src/Gui/GuiConsole.cpp index 72c15a8721..42a38c8de0 100644 --- a/src/Gui/GuiConsole.cpp +++ b/src/Gui/GuiConsole.cpp @@ -20,17 +20,14 @@ * * ***************************************************************************/ +#include -#include "PreCompiled.h" - -#ifndef _PreComp_ # ifdef FC_OS_WIN32 # include "io.h" # include # endif # include # include -#endif #include "GuiConsole.h" diff --git a/src/Gui/ImageView.cpp b/src/Gui/ImageView.cpp index bfc5603f22..bce5cd559e 100644 --- a/src/Gui/ImageView.cpp +++ b/src/Gui/ImageView.cpp @@ -21,8 +21,7 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -40,7 +39,7 @@ # include # include # include -#endif + #include "ImageView.h" #include "BitmapFactory.h" diff --git a/src/Gui/InputField.cpp b/src/Gui/InputField.cpp index 80c125e517..07ce520eac 100644 --- a/src/Gui/InputField.cpp +++ b/src/Gui/InputField.cpp @@ -20,16 +20,12 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include # include # include # include -#endif #include #include diff --git a/src/Gui/InputHintPy.cpp b/src/Gui/InputHintPy.cpp index 9551039101..37a72ec54e 100644 --- a/src/Gui/InputHintPy.cpp +++ b/src/Gui/InputHintPy.cpp @@ -21,8 +21,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "InputHint.h" #include "InputHintPy.h" diff --git a/src/Gui/InputHintWidget.cpp b/src/Gui/InputHintWidget.cpp index 2d77cd0631..6fa5b62361 100644 --- a/src/Gui/InputHintWidget.cpp +++ b/src/Gui/InputHintWidget.cpp @@ -21,11 +21,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include -#endif + +#include #include diff --git a/src/Gui/InputVector.cpp b/src/Gui/InputVector.cpp index 999d4bc59e..8529992224 100644 --- a/src/Gui/InputVector.cpp +++ b/src/Gui/InputVector.cpp @@ -21,10 +21,9 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include diff --git a/src/Gui/Inventor/Draggers/Gizmo.cpp b/src/Gui/Inventor/Draggers/Gizmo.cpp index 7a27ebdacb..c4ad5a9b01 100644 --- a/src/Gui/Inventor/Draggers/Gizmo.cpp +++ b/src/Gui/Inventor/Draggers/Gizmo.cpp @@ -21,18 +21,14 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "Gizmo.h" -#ifndef _PreComp_ #include #include #include #include #include -#endif #include #include diff --git a/src/Gui/Inventor/Draggers/SoLinearDragger.cpp b/src/Gui/Inventor/Draggers/SoLinearDragger.cpp index fd4f3aac37..928f55e42d 100644 --- a/src/Gui/Inventor/Draggers/SoLinearDragger.cpp +++ b/src/Gui/Inventor/Draggers/SoLinearDragger.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include @@ -31,7 +28,6 @@ #include #include #include -#endif #include "SoLinearDragger.h" diff --git a/src/Gui/Inventor/Draggers/SoLinearDraggerGeometry.cpp b/src/Gui/Inventor/Draggers/SoLinearDraggerGeometry.cpp index e9b3f9bec8..2f197e5013 100644 --- a/src/Gui/Inventor/Draggers/SoLinearDraggerGeometry.cpp +++ b/src/Gui/Inventor/Draggers/SoLinearDraggerGeometry.cpp @@ -21,16 +21,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include #include #include #include -#endif #include "SoLinearDraggerGeometry.h" diff --git a/src/Gui/Inventor/Draggers/SoPlanarDragger.cpp b/src/Gui/Inventor/Draggers/SoPlanarDragger.cpp index 5b9aac85cf..5bad866821 100644 --- a/src/Gui/Inventor/Draggers/SoPlanarDragger.cpp +++ b/src/Gui/Inventor/Draggers/SoPlanarDragger.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include @@ -48,7 +46,6 @@ #include #include #include -#endif #include diff --git a/src/Gui/Inventor/Draggers/SoRotationDragger.cpp b/src/Gui/Inventor/Draggers/SoRotationDragger.cpp index 426ebf6aa6..05f2ac5820 100644 --- a/src/Gui/Inventor/Draggers/SoRotationDragger.cpp +++ b/src/Gui/Inventor/Draggers/SoRotationDragger.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include @@ -32,7 +30,6 @@ #include #include #include -#endif #include "SoRotationDragger.h" diff --git a/src/Gui/Inventor/Draggers/SoRotationDraggerGeometry.cpp b/src/Gui/Inventor/Draggers/SoRotationDraggerGeometry.cpp index 8b2122686d..8af76efef3 100644 --- a/src/Gui/Inventor/Draggers/SoRotationDraggerGeometry.cpp +++ b/src/Gui/Inventor/Draggers/SoRotationDraggerGeometry.cpp @@ -21,9 +21,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -39,7 +36,6 @@ #include #include #include -#endif #include "SoRotationDraggerGeometry.h" diff --git a/src/Gui/Inventor/Draggers/SoTransformDragger.cpp b/src/Gui/Inventor/Draggers/SoTransformDragger.cpp index 65bd8c5830..abe6b7c208 100644 --- a/src/Gui/Inventor/Draggers/SoTransformDragger.cpp +++ b/src/Gui/Inventor/Draggers/SoTransformDragger.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include @@ -48,7 +46,6 @@ #include #include #include -#endif #include #include diff --git a/src/Gui/Inventor/MarkerBitmaps.cpp b/src/Gui/Inventor/MarkerBitmaps.cpp index 2287ceb0d0..6297d89ab3 100644 --- a/src/Gui/Inventor/MarkerBitmaps.cpp +++ b/src/Gui/Inventor/MarkerBitmaps.cpp @@ -20,12 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include -#endif + #include "MarkerBitmaps.h" diff --git a/src/Gui/Inventor/SmSwitchboard.cpp b/src/Gui/Inventor/SmSwitchboard.cpp index fee7674f14..647e098e87 100644 --- a/src/Gui/Inventor/SmSwitchboard.cpp +++ b/src/Gui/Inventor/SmSwitchboard.cpp @@ -43,9 +43,7 @@ // FIXME: implement proper searching / SearchAction handling 2002-02-07 larsa // FIXME: implement proper writing / WriteAction handling 2002-02-07 larsa -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -54,7 +52,7 @@ # include # include # include -#endif + #include "SmSwitchboard.h" diff --git a/src/Gui/Inventor/So3DAnnotation.cpp b/src/Gui/Inventor/So3DAnnotation.cpp index a6766a3ff0..e402d2a2a2 100644 --- a/src/Gui/Inventor/So3DAnnotation.cpp +++ b/src/Gui/Inventor/So3DAnnotation.cpp @@ -20,17 +20,19 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include -#ifndef _PreComp_ #ifdef FC_OS_MACOSX #include #else +#ifdef FC_OS_WIN32 +#include +#endif #include #endif + #include #include -#endif #include "So3DAnnotation.h" #include diff --git a/src/Gui/Inventor/SoAutoZoomTranslation.cpp b/src/Gui/Inventor/SoAutoZoomTranslation.cpp index dcc773c041..36a85ff56b 100644 --- a/src/Gui/Inventor/SoAutoZoomTranslation.cpp +++ b/src/Gui/Inventor/SoAutoZoomTranslation.cpp @@ -20,9 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -33,7 +31,7 @@ # include # include # include -#endif + #include "SoAutoZoomTranslation.h" diff --git a/src/Gui/Inventor/SoAxisCrossKit.cpp b/src/Gui/Inventor/SoAxisCrossKit.cpp index d60457ae16..b13f560e06 100644 --- a/src/Gui/Inventor/SoAxisCrossKit.cpp +++ b/src/Gui/Inventor/SoAxisCrossKit.cpp @@ -20,9 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include + +#if defined(FC_OS_WIN32) +#include +#endif -#ifndef _PreComp_ # ifdef FC_OS_MACOSX # include # else @@ -50,7 +53,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/Inventor/SoDrawingGrid.cpp b/src/Gui/Inventor/SoDrawingGrid.cpp index 39e8c7042e..36e9fb5cb1 100644 --- a/src/Gui/Inventor/SoDrawingGrid.cpp +++ b/src/Gui/Inventor/SoDrawingGrid.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include -#ifndef _PreComp_ # include # include # include @@ -30,12 +29,16 @@ # include # include # include + +#if defined(FC_OS_WIN32) +#include +#endif + #ifdef FC_OS_MACOSX #include #else #include #endif -#endif #include "SoDrawingGrid.h" diff --git a/src/Gui/Inventor/SoFCBackgroundGradient.cpp b/src/Gui/Inventor/SoFCBackgroundGradient.cpp index 323c18a91e..d3b72587dd 100644 --- a/src/Gui/Inventor/SoFCBackgroundGradient.cpp +++ b/src/Gui/Inventor/SoFCBackgroundGradient.cpp @@ -20,19 +20,22 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include #include + +#include + +#ifdef FC_OS_WIN32 +#include +#endif + #ifdef FC_OS_MACOSX #include #else #include #endif -#endif #include "SoFCBackgroundGradient.h" diff --git a/src/Gui/Inventor/SoFCBoundingBox.cpp b/src/Gui/Inventor/SoFCBoundingBox.cpp index 0b7761fa1b..4247694c7a 100644 --- a/src/Gui/Inventor/SoFCBoundingBox.cpp +++ b/src/Gui/Inventor/SoFCBoundingBox.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include #include @@ -31,7 +28,6 @@ #include #include #include -#endif #include "SoFCBoundingBox.h" diff --git a/src/Gui/Inventor/SoFCPlacementIndicatorKit.cpp b/src/Gui/Inventor/SoFCPlacementIndicatorKit.cpp index fb0ca80b67..0f1eb5a31a 100644 --- a/src/Gui/Inventor/SoFCPlacementIndicatorKit.cpp +++ b/src/Gui/Inventor/SoFCPlacementIndicatorKit.cpp @@ -21,10 +21,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include @@ -40,7 +36,6 @@ #include #include #include -#endif #include "SoFCPlacementIndicatorKit.h" diff --git a/src/Gui/Inventor/SoFCTransform.cpp b/src/Gui/Inventor/SoFCTransform.cpp index c0bb145a70..4a96b87ce7 100644 --- a/src/Gui/Inventor/SoFCTransform.cpp +++ b/src/Gui/Inventor/SoFCTransform.cpp @@ -21,16 +21,13 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include #include #include -#endif #include "SoFCTransform.h" diff --git a/src/Gui/Inventor/SoMouseWheelEvent.cpp b/src/Gui/Inventor/SoMouseWheelEvent.cpp index 1eb55eefa5..d185f281b1 100644 --- a/src/Gui/Inventor/SoMouseWheelEvent.cpp +++ b/src/Gui/Inventor/SoMouseWheelEvent.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include "SoMouseWheelEvent.h" diff --git a/src/Gui/Inventor/SoToggleSwitch.cpp b/src/Gui/Inventor/SoToggleSwitch.cpp index 73447d4426..0fc1694220 100644 --- a/src/Gui/Inventor/SoToggleSwitch.cpp +++ b/src/Gui/Inventor/SoToggleSwitch.cpp @@ -21,8 +21,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "SoToggleSwitch.h" SO_NODE_SOURCE(SoToggleSwitch) diff --git a/src/Gui/Inventor/SoToggleSwitch.h b/src/Gui/Inventor/SoToggleSwitch.h index b6384082d2..33a4344bf0 100644 --- a/src/Gui/Inventor/SoToggleSwitch.h +++ b/src/Gui/Inventor/SoToggleSwitch.h @@ -24,6 +24,8 @@ #ifndef SO_TOGGLE_SWITCH #define SO_TOGGLE_SWITCH +#include + #include #include diff --git a/src/Gui/InventorAll.h b/src/Gui/InventorAll.h index c3d00ac0ff..41d38be958 100644 --- a/src/Gui/InventorAll.h +++ b/src/Gui/InventorAll.h @@ -23,6 +23,12 @@ #ifndef __InventorAll__ #define __InventorAll__ +#include + +# ifdef FC_OS_WIN32 +# include +# endif + // Open Inventor #ifdef FC_OS_MACOSX # include diff --git a/src/Gui/Language/Translator.cpp b/src/Gui/Language/Translator.cpp index 9bcd1fced6..bb2ce40f2b 100644 --- a/src/Gui/Language/Translator.cpp +++ b/src/Gui/Language/Translator.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -30,7 +28,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/LinkViewPyImp.cpp b/src/Gui/LinkViewPyImp.cpp index df95e6307e..d51870d916 100644 --- a/src/Gui/LinkViewPyImp.cpp +++ b/src/Gui/LinkViewPyImp.cpp @@ -20,7 +20,7 @@ * * ****************************************************************************/ -#include "PreCompiled.h" + #include #include diff --git a/src/Gui/MDIView.cpp b/src/Gui/MDIView.cpp index cad506c5d3..c54319644c 100644 --- a/src/Gui/MDIView.cpp +++ b/src/Gui/MDIView.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -36,7 +33,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/MDIViewPy.cpp b/src/Gui/MDIViewPy.cpp index 3aa020fd41..42e2273204 100644 --- a/src/Gui/MDIViewPy.cpp +++ b/src/Gui/MDIViewPy.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include #include diff --git a/src/Gui/MDIViewPyWrap.cpp b/src/Gui/MDIViewPyWrap.cpp index f6ab727155..5ececa1098 100644 --- a/src/Gui/MDIViewPyWrap.cpp +++ b/src/Gui/MDIViewPyWrap.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include #include diff --git a/src/Gui/Macro.cpp b/src/Gui/Macro.cpp index be04fd18da..49713f5ff9 100644 --- a/src/Gui/Macro.cpp +++ b/src/Gui/Macro.cpp @@ -21,13 +21,12 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include -#endif + #include #include diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 9b9fe72aae..f72612d28f 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -21,8 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -55,7 +54,7 @@ # include # include # include -#endif + #if defined(Q_OS_WIN) #if (QT_VERSION < QT_VERSION_CHECK(6,0,0)) diff --git a/src/Gui/MainWindowPy.cpp b/src/Gui/MainWindowPy.cpp index 5b0d870e39..5a2143d77d 100644 --- a/src/Gui/MainWindowPy.cpp +++ b/src/Gui/MainWindowPy.cpp @@ -21,10 +21,9 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include diff --git a/src/Gui/ManualAlignment.cpp b/src/Gui/ManualAlignment.cpp index 10e87c2902..a37af55c7e 100644 --- a/src/Gui/ManualAlignment.cpp +++ b/src/Gui/ManualAlignment.cpp @@ -21,8 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -43,7 +42,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/MenuManager.cpp b/src/Gui/MenuManager.cpp index e0520d0e57..47edac46a1 100644 --- a/src/Gui/MenuManager.cpp +++ b/src/Gui/MenuManager.cpp @@ -20,12 +20,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include -#endif + #include "MenuManager.h" #include "Application.h" diff --git a/src/Gui/MergeDocuments.cpp b/src/Gui/MergeDocuments.cpp index c13daee0c5..0b20bbaf04 100644 --- a/src/Gui/MergeDocuments.cpp +++ b/src/Gui/MergeDocuments.cpp @@ -20,10 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include diff --git a/src/Gui/ModuleIO.cpp b/src/Gui/ModuleIO.cpp index b404e1944a..7816a813b7 100644 --- a/src/Gui/ModuleIO.cpp +++ b/src/Gui/ModuleIO.cpp @@ -21,11 +21,10 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include -#endif + #include "ModuleIO.h" diff --git a/src/Gui/MouseSelection.cpp b/src/Gui/MouseSelection.cpp index bf90a4054a..8babe08a19 100644 --- a/src/Gui/MouseSelection.cpp +++ b/src/Gui/MouseSelection.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -31,7 +28,8 @@ #include #include #include -#endif + +#include #include "MouseSelection.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/Multisample.cpp b/src/Gui/Multisample.cpp index 5f0ee75bed..08700fbc23 100644 --- a/src/Gui/Multisample.cpp +++ b/src/Gui/Multisample.cpp @@ -21,11 +21,10 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include -#endif + #include "Multisample.h" #include diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp index 36203572e4..e0a2299eb8 100644 --- a/src/Gui/NaviCube.cpp +++ b/src/Gui/NaviCube.cpp @@ -20,8 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ +#include + # include # include # ifdef FC_OS_WIN32 @@ -45,7 +45,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/Navigation/BlenderNavigationStyle.cpp b/src/Gui/Navigation/BlenderNavigationStyle.cpp index e6086dbc6f..0b60f3c9b8 100644 --- a/src/Gui/Navigation/BlenderNavigationStyle.cpp +++ b/src/Gui/Navigation/BlenderNavigationStyle.cpp @@ -20,12 +20,8 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include -#endif #include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/Navigation/CADNavigationStyle.cpp b/src/Gui/Navigation/CADNavigationStyle.cpp index 09c519a25e..eac9bc7c7e 100644 --- a/src/Gui/Navigation/CADNavigationStyle.cpp +++ b/src/Gui/Navigation/CADNavigationStyle.cpp @@ -20,11 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include -#endif #include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/Navigation/GestureNavigationStyle.cpp b/src/Gui/Navigation/GestureNavigationStyle.cpp index 877f98f069..a6e9d0352b 100644 --- a/src/Gui/Navigation/GestureNavigationStyle.cpp +++ b/src/Gui/Navigation/GestureNavigationStyle.cpp @@ -60,17 +60,18 @@ * */ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include -#endif + #include +#include + #include #include #include diff --git a/src/Gui/Navigation/InventorNavigationStyle.cpp b/src/Gui/Navigation/InventorNavigationStyle.cpp index b8d4ceb91a..336afa1c02 100644 --- a/src/Gui/Navigation/InventorNavigationStyle.cpp +++ b/src/Gui/Navigation/InventorNavigationStyle.cpp @@ -21,11 +21,10 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include "Inventor/SoMouseWheelEvent.h" #include "Navigation/NavigationStyle.h" diff --git a/src/Gui/Navigation/MayaGestureNavigationStyle.cpp b/src/Gui/Navigation/MayaGestureNavigationStyle.cpp index 5e17c0356f..d04853e7bb 100644 --- a/src/Gui/Navigation/MayaGestureNavigationStyle.cpp +++ b/src/Gui/Navigation/MayaGestureNavigationStyle.cpp @@ -56,10 +56,9 @@ * This style wasn't tested with space during development (I don't have one). */ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include diff --git a/src/Gui/Navigation/NavigationAnimation.cpp b/src/Gui/Navigation/NavigationAnimation.cpp index 29b0529006..aaad1369f0 100644 --- a/src/Gui/Navigation/NavigationAnimation.cpp +++ b/src/Gui/Navigation/NavigationAnimation.cpp @@ -21,7 +21,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include "NavigationAnimation.h" #include diff --git a/src/Gui/Navigation/NavigationAnimator.cpp b/src/Gui/Navigation/NavigationAnimator.cpp index 6794c64b3a..ff52755804 100644 --- a/src/Gui/Navigation/NavigationAnimator.cpp +++ b/src/Gui/Navigation/NavigationAnimator.cpp @@ -21,7 +21,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include "NavigationAnimator.h" #include "NavigationAnimation.h" #include diff --git a/src/Gui/Navigation/NavigationStateChart.cpp b/src/Gui/Navigation/NavigationStateChart.cpp index 70a12f8f67..e8efe37789 100644 --- a/src/Gui/Navigation/NavigationStateChart.cpp +++ b/src/Gui/Navigation/NavigationStateChart.cpp @@ -21,8 +21,6 @@ * * **************************************************************************/ - -#include "PreCompiled.h" #include #include #include diff --git a/src/Gui/Navigation/NavigationStyle.cpp b/src/Gui/Navigation/NavigationStyle.cpp index 9c97445e34..1a920c140e 100644 --- a/src/Gui/Navigation/NavigationStyle.cpp +++ b/src/Gui/Navigation/NavigationStyle.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -37,7 +36,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/Navigation/NavigationStylePyImp.cpp b/src/Gui/Navigation/NavigationStylePyImp.cpp index a437032df1..ef44f760c2 100644 --- a/src/Gui/Navigation/NavigationStylePyImp.cpp +++ b/src/Gui/Navigation/NavigationStylePyImp.cpp @@ -19,8 +19,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - // inclusion of the generated files (generated out of NavigationStylePy.pyi) #include "Navigation/NavigationStylePy.h" #include "Navigation/NavigationStylePy.cpp" diff --git a/src/Gui/Navigation/OpenCascadeNavigationStyle.cpp b/src/Gui/Navigation/OpenCascadeNavigationStyle.cpp index f6d8b1bad3..8a83c400b0 100644 --- a/src/Gui/Navigation/OpenCascadeNavigationStyle.cpp +++ b/src/Gui/Navigation/OpenCascadeNavigationStyle.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/Navigation/OpenSCADNavigationStyle.cpp b/src/Gui/Navigation/OpenSCADNavigationStyle.cpp index 68eec6efc5..9302b5d9b0 100644 --- a/src/Gui/Navigation/OpenSCADNavigationStyle.cpp +++ b/src/Gui/Navigation/OpenSCADNavigationStyle.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/Navigation/RevitNavigationStyle.cpp b/src/Gui/Navigation/RevitNavigationStyle.cpp index 1544650abb..14a0773bf2 100644 --- a/src/Gui/Navigation/RevitNavigationStyle.cpp +++ b/src/Gui/Navigation/RevitNavigationStyle.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/Navigation/SiemensNXNavigationStyle.cpp b/src/Gui/Navigation/SiemensNXNavigationStyle.cpp index 45090aa2bf..0b51c373ac 100644 --- a/src/Gui/Navigation/SiemensNXNavigationStyle.cpp +++ b/src/Gui/Navigation/SiemensNXNavigationStyle.cpp @@ -21,11 +21,7 @@ * * **************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include #include diff --git a/src/Gui/Navigation/SolidWorksNavigationStyle.cpp b/src/Gui/Navigation/SolidWorksNavigationStyle.cpp index f8c4db5a45..bd78e21292 100644 --- a/src/Gui/Navigation/SolidWorksNavigationStyle.cpp +++ b/src/Gui/Navigation/SolidWorksNavigationStyle.cpp @@ -20,12 +20,8 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include -#endif #include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/Navigation/TinkerCADNavigationStyle.cpp b/src/Gui/Navigation/TinkerCADNavigationStyle.cpp index 1874f46878..c11abc5db1 100644 --- a/src/Gui/Navigation/TinkerCADNavigationStyle.cpp +++ b/src/Gui/Navigation/TinkerCADNavigationStyle.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/Navigation/TouchpadNavigationStyle.cpp b/src/Gui/Navigation/TouchpadNavigationStyle.cpp index 957652e8a0..62bd75a7e2 100644 --- a/src/Gui/Navigation/TouchpadNavigationStyle.cpp +++ b/src/Gui/Navigation/TouchpadNavigationStyle.cpp @@ -20,10 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include "Navigation/NavigationStyle.h" #include "View3DInventorViewer.h" diff --git a/src/Gui/NetworkRetriever.cpp b/src/Gui/NetworkRetriever.cpp index 598fb12a7c..57247885c2 100644 --- a/src/Gui/NetworkRetriever.cpp +++ b/src/Gui/NetworkRetriever.cpp @@ -21,15 +21,15 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include -#endif + +#include #include #include diff --git a/src/Gui/NotificationArea.cpp b/src/Gui/NotificationArea.cpp index 20755f2b1b..b3b78c7ce4 100644 --- a/src/Gui/NotificationArea.cpp +++ b/src/Gui/NotificationArea.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include @@ -39,7 +38,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Gui/NotificationBox.cpp b/src/Gui/NotificationBox.cpp index 241332dadc..8646724434 100644 --- a/src/Gui/NotificationBox.cpp +++ b/src/Gui/NotificationBox.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include @@ -32,7 +31,7 @@ #include #include #include -#endif + #include "NotificationBox.h" diff --git a/src/Gui/OnlineDocumentation.cpp b/src/Gui/OnlineDocumentation.cpp index 76a297c1f4..0cfa77f6fd 100644 --- a/src/Gui/OnlineDocumentation.cpp +++ b/src/Gui/OnlineDocumentation.cpp @@ -20,14 +20,13 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include #include #include -#endif + #include #include diff --git a/src/Gui/OverlayManager.cpp b/src/Gui/OverlayManager.cpp index 15fdc211c1..1ed45b1603 100644 --- a/src/Gui/OverlayManager.cpp +++ b/src/Gui/OverlayManager.cpp @@ -20,9 +20,6 @@ * * ****************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -40,7 +37,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/OverlayParams.cpp b/src/Gui/OverlayParams.cpp index 090960a5de..fe10afc974 100644 --- a/src/Gui/OverlayParams.cpp +++ b/src/Gui/OverlayParams.cpp @@ -20,7 +20,7 @@ * * ****************************************************************************/ -#include "PreCompiled.h" + #include "OverlayManager.h" /*[[[cog diff --git a/src/Gui/OverlayWidgets.cpp b/src/Gui/OverlayWidgets.cpp index f66960c4da..630e3e165c 100644 --- a/src/Gui/OverlayWidgets.cpp +++ b/src/Gui/OverlayWidgets.cpp @@ -20,9 +20,8 @@ * * ****************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -42,7 +41,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/ParamHandler.cpp b/src/Gui/ParamHandler.cpp index 97776c7783..0f743a0979 100644 --- a/src/Gui/ParamHandler.cpp +++ b/src/Gui/ParamHandler.cpp @@ -19,9 +19,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif #include "ParamHandler.h" diff --git a/src/Gui/Placement.cpp b/src/Gui/Placement.cpp index 548af2c10d..cf10e36093 100644 --- a/src/Gui/Placement.cpp +++ b/src/Gui/Placement.cpp @@ -20,15 +20,14 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include #include #include #include -#endif + #include #include diff --git a/src/Gui/PreCompiled.cpp b/src/Gui/PreCompiled.cpp deleted file mode 100644 index 7b200a1bf2..0000000000 --- a/src/Gui/PreCompiled.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * - * * - * This file is part of the FreeCAD CAx development system. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Library General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this library; see the file COPYING.LIB. If not, * - * write to the Free Software Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307, USA * - * * - ***************************************************************************/ - - -#include "PreCompiled.h" diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h index fa11b50223..0c2f02152b 100644 --- a/src/Gui/PreCompiled.h +++ b/src/Gui/PreCompiled.h @@ -26,8 +26,6 @@ #include -#ifdef _PreComp_ - // standard #include #include @@ -89,8 +87,8 @@ #include "QtAll.h" #include "InventorAll.h" -#elif defined(FC_OS_WIN32) +#if defined(FC_OS_WIN32) #include -#endif //_PreComp_ +#endif #endif // GUI_PRECOMPILED_H diff --git a/src/Gui/PrefWidgets.cpp b/src/Gui/PrefWidgets.cpp index 6806389442..394bfb5354 100644 --- a/src/Gui/PrefWidgets.cpp +++ b/src/Gui/PrefWidgets.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp index d573a06eeb..83882aca25 100644 --- a/src/Gui/PreferencePackManager.cpp +++ b/src/Gui/PreferencePackManager.cpp @@ -21,13 +21,12 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include -#endif + #include #include diff --git a/src/Gui/PreferencePages/DlgSettings3DViewImp.cpp b/src/Gui/PreferencePages/DlgSettings3DViewImp.cpp index 38051f4b81..0dca3e8290 100644 --- a/src/Gui/PreferencePages/DlgSettings3DViewImp.cpp +++ b/src/Gui/PreferencePages/DlgSettings3DViewImp.cpp @@ -20,15 +20,13 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include # include # include -#endif + #include #include diff --git a/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp b/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp index 17b53643f3..f808bc6adc 100644 --- a/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp +++ b/src/Gui/PreferencePages/DlgSettingsAdvanced.cpp @@ -20,7 +20,6 @@ * * ****************************************************************************/ -#include "PreCompiled.h" #include #include @@ -31,14 +30,13 @@ DlgSettingsAdvanced.define() ]]]*/ // Auto generated code (Tools/params_utils.py:567) -#ifndef _PreComp_ # include # include # include # include # include # include -#endif + #include #include // Auto generated code (Tools/params_utils.py:589) diff --git a/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp b/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp index 8be5d5aded..91dea01d2f 100644 --- a/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp +++ b/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -34,7 +31,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/PreferencePages/DlgSettingsDocumentImp.cpp b/src/Gui/PreferencePages/DlgSettingsDocumentImp.cpp index 42b76b5d4b..24aa1445da 100644 --- a/src/Gui/PreferencePages/DlgSettingsDocumentImp.cpp +++ b/src/Gui/PreferencePages/DlgSettingsDocumentImp.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include -#endif #include #include diff --git a/src/Gui/PreferencePages/DlgSettingsEditor.cpp b/src/Gui/PreferencePages/DlgSettingsEditor.cpp index e5330a0ff7..70b809cb81 100644 --- a/src/Gui/PreferencePages/DlgSettingsEditor.cpp +++ b/src/Gui/PreferencePages/DlgSettingsEditor.cpp @@ -21,10 +21,8 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + #include #include diff --git a/src/Gui/PreferencePages/DlgSettingsGeneral.cpp b/src/Gui/PreferencePages/DlgSettingsGeneral.cpp index 28571c79af..81daec9541 100644 --- a/src/Gui/PreferencePages/DlgSettingsGeneral.cpp +++ b/src/Gui/PreferencePages/DlgSettingsGeneral.cpp @@ -23,8 +23,6 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -33,7 +31,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/PreferencePages/DlgSettingsLightSources.cpp b/src/Gui/PreferencePages/DlgSettingsLightSources.cpp index 12d4630d8e..ac096778a8 100644 --- a/src/Gui/PreferencePages/DlgSettingsLightSources.cpp +++ b/src/Gui/PreferencePages/DlgSettingsLightSources.cpp @@ -21,9 +21,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -32,7 +29,6 @@ #include #include #include -#endif #include "DlgSettingsLightSources.h" #include "ui_DlgSettingsLightSources.h" diff --git a/src/Gui/PreferencePages/DlgSettingsMacroImp.cpp b/src/Gui/PreferencePages/DlgSettingsMacroImp.cpp index 9de92a3fa6..9e7696f45b 100644 --- a/src/Gui/PreferencePages/DlgSettingsMacroImp.cpp +++ b/src/Gui/PreferencePages/DlgSettingsMacroImp.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Gui/PreferencePages/DlgSettingsNavigation.cpp b/src/Gui/PreferencePages/DlgSettingsNavigation.cpp index 8a179efa14..97dd29302d 100644 --- a/src/Gui/PreferencePages/DlgSettingsNavigation.cpp +++ b/src/Gui/PreferencePages/DlgSettingsNavigation.cpp @@ -20,14 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include # include -#endif + #include #include diff --git a/src/Gui/PreferencePages/DlgSettingsNotificationArea.cpp b/src/Gui/PreferencePages/DlgSettingsNotificationArea.cpp index 53e91b3beb..e79701c226 100644 --- a/src/Gui/PreferencePages/DlgSettingsNotificationArea.cpp +++ b/src/Gui/PreferencePages/DlgSettingsNotificationArea.cpp @@ -20,11 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + #include #include diff --git a/src/Gui/PreferencePages/DlgSettingsPDF.cpp b/src/Gui/PreferencePages/DlgSettingsPDF.cpp index 97cfbfb9d8..d2f58772c0 100644 --- a/src/Gui/PreferencePages/DlgSettingsPDF.cpp +++ b/src/Gui/PreferencePages/DlgSettingsPDF.cpp @@ -1,5 +1,4 @@ -#include "PreCompiled.h" - + #include #include diff --git a/src/Gui/PreferencePages/DlgSettingsPythonConsole.cpp b/src/Gui/PreferencePages/DlgSettingsPythonConsole.cpp index 87ca89034f..c6300ffb84 100644 --- a/src/Gui/PreferencePages/DlgSettingsPythonConsole.cpp +++ b/src/Gui/PreferencePages/DlgSettingsPythonConsole.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include "DlgSettingsPythonConsole.h" #include "ui_DlgSettingsPythonConsole.h" diff --git a/src/Gui/PreferencePages/DlgSettingsReportView.cpp b/src/Gui/PreferencePages/DlgSettingsReportView.cpp index 0cf0791b9b..65f26297dc 100644 --- a/src/Gui/PreferencePages/DlgSettingsReportView.cpp +++ b/src/Gui/PreferencePages/DlgSettingsReportView.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include "DlgSettingsReportView.h" #include "ui_DlgSettingsReportView.h" diff --git a/src/Gui/PreferencePages/DlgSettingsSelection.cpp b/src/Gui/PreferencePages/DlgSettingsSelection.cpp index 315376fd9a..6a97a984f6 100644 --- a/src/Gui/PreferencePages/DlgSettingsSelection.cpp +++ b/src/Gui/PreferencePages/DlgSettingsSelection.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include diff --git a/src/Gui/PreferencePages/DlgSettingsUI.cpp b/src/Gui/PreferencePages/DlgSettingsUI.cpp index 33ae4e044f..1c9de8bc0f 100644 --- a/src/Gui/PreferencePages/DlgSettingsUI.cpp +++ b/src/Gui/PreferencePages/DlgSettingsUI.cpp @@ -20,10 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include -#endif + #include #include diff --git a/src/Gui/PreferencePages/DlgSettingsViewColor.cpp b/src/Gui/PreferencePages/DlgSettingsViewColor.cpp index 4e0e647e77..667d1e2342 100644 --- a/src/Gui/PreferencePages/DlgSettingsViewColor.cpp +++ b/src/Gui/PreferencePages/DlgSettingsViewColor.cpp @@ -20,10 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + #include "DlgSettingsViewColor.h" #include "ui_DlgSettingsViewColor.h" diff --git a/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp b/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp index 5ad31fd589..28a5369cd7 100644 --- a/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp +++ b/src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp @@ -22,15 +22,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include #include #include -#endif #include #include diff --git a/src/Gui/PreferencePages/ListWidgetDragBugFix.cpp b/src/Gui/PreferencePages/ListWidgetDragBugFix.cpp index 30b2c92d6d..490953f172 100644 --- a/src/Gui/PreferencePages/ListWidgetDragBugFix.cpp +++ b/src/Gui/PreferencePages/ListWidgetDragBugFix.cpp @@ -22,10 +22,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include "ListWidgetDragBugFix.h" diff --git a/src/Gui/ProgressBar.cpp b/src/Gui/ProgressBar.cpp index ddc1a6f06c..8e3c3879ab 100644 --- a/src/Gui/ProgressBar.cpp +++ b/src/Gui/ProgressBar.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -31,7 +30,7 @@ # include # include # include -#endif + #include "ProgressBar.h" #include "MainWindow.h" diff --git a/src/Gui/ProgressDialog.cpp b/src/Gui/ProgressDialog.cpp index 12b0e6c7f0..071a15e0c3 100644 --- a/src/Gui/ProgressDialog.cpp +++ b/src/Gui/ProgressDialog.cpp @@ -20,15 +20,14 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include # include -#endif + #include "ProgressDialog.h" #include "MainWindow.h" diff --git a/src/Gui/PropertyPage.cpp b/src/Gui/PropertyPage.cpp index 09da2764b5..9ba5935ed1 100644 --- a/src/Gui/PropertyPage.cpp +++ b/src/Gui/PropertyPage.cpp @@ -22,10 +22,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include #include diff --git a/src/Gui/PropertyView.cpp b/src/Gui/PropertyView.cpp index 09b5f5ae59..d0ef38aaab 100644 --- a/src/Gui/PropertyView.cpp +++ b/src/Gui/PropertyView.cpp @@ -20,12 +20,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include -#endif + #include #include diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp index 559f1164ad..b120ac332f 100644 --- a/src/Gui/PythonConsole.cpp +++ b/src/Gui/PythonConsole.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -34,7 +33,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/PythonConsolePy.cpp b/src/Gui/PythonConsolePy.cpp index 0a27f0fc68..9c9c7f4532 100644 --- a/src/Gui/PythonConsolePy.cpp +++ b/src/Gui/PythonConsolePy.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include "PythonConsolePy.h" #include "PythonConsole.h" diff --git a/src/Gui/PythonDebugger.cpp b/src/Gui/PythonDebugger.cpp index 7524a2bee3..3f97bb5386 100644 --- a/src/Gui/PythonDebugger.cpp +++ b/src/Gui/PythonDebugger.cpp @@ -20,11 +20,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + +#include #include #include diff --git a/src/Gui/PythonEditor.cpp b/src/Gui/PythonEditor.cpp index 7123e6b257..ff9f50434c 100644 --- a/src/Gui/PythonEditor.cpp +++ b/src/Gui/PythonEditor.cpp @@ -20,15 +20,14 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include # include -#endif + #include #include diff --git a/src/Gui/PythonTracing.cpp b/src/Gui/PythonTracing.cpp index e80afb8ed8..739ecfc4d1 100644 --- a/src/Gui/PythonTracing.cpp +++ b/src/Gui/PythonTracing.cpp @@ -21,12 +21,11 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include -#endif + #include diff --git a/src/Gui/PythonWorkbenchPyImp.cpp b/src/Gui/PythonWorkbenchPyImp.cpp index f56d84b5c8..018ddff089 100644 --- a/src/Gui/PythonWorkbenchPyImp.cpp +++ b/src/Gui/PythonWorkbenchPyImp.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + // inclusion of the generated files (generated out of PythonWorkbenchPy.pyi) #include "PythonWorkbenchPy.h" diff --git a/src/Gui/PythonWrapper.cpp b/src/Gui/PythonWrapper.cpp index e18d9b1d84..5c64d31102 100644 --- a/src/Gui/PythonWrapper.cpp +++ b/src/Gui/PythonWrapper.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -31,7 +30,7 @@ # include # include # include -#endif + #include @@ -41,6 +40,8 @@ //#undef HAVE_SHIBOKEN6 //#undef HAVE_PYSIDE6 +#include + #ifdef FC_OS_WIN32 #undef max #undef min @@ -131,10 +132,9 @@ #endif // Must be imported after PySide headers -#ifndef _PreComp_ # include # include -#endif + #include #include diff --git a/src/Gui/QuantitySpinBox.cpp b/src/Gui/QuantitySpinBox.cpp index 70f573550c..78c15746f9 100644 --- a/src/Gui/QuantitySpinBox.cpp +++ b/src/Gui/QuantitySpinBox.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include @@ -34,7 +31,6 @@ # include # include # include -#endif #include diff --git a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp index 2659960952..5da27dcbd7 100644 --- a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp +++ b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp @@ -18,7 +18,7 @@ * */ -#include "PreCompiled.h" +#include #include diff --git a/src/Gui/ReportView.cpp b/src/Gui/ReportView.cpp index e260f2a35d..e8dd976f60 100644 --- a/src/Gui/ReportView.cpp +++ b/src/Gui/ReportView.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -29,7 +28,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/SceneInspector.cpp b/src/Gui/SceneInspector.cpp index b94dc3ed61..086e7394cc 100644 --- a/src/Gui/SceneInspector.cpp +++ b/src/Gui/SceneInspector.cpp @@ -20,15 +20,14 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include # include -#endif + #include diff --git a/src/Gui/Selection/Selection.cpp b/src/Gui/Selection/Selection.cpp index 5bb307917b..9ce6685235 100644 --- a/src/Gui/Selection/Selection.cpp +++ b/src/Gui/Selection/Selection.cpp @@ -21,14 +21,13 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include -#endif + #include #include diff --git a/src/Gui/Selection/SelectionFilter.cpp b/src/Gui/Selection/SelectionFilter.cpp index 04db09786a..e3ef9508e9 100644 --- a/src/Gui/Selection/SelectionFilter.cpp +++ b/src/Gui/Selection/SelectionFilter.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #ifdef __GNUC__ # include #endif diff --git a/src/Gui/Selection/SelectionFilterPy.cpp b/src/Gui/Selection/SelectionFilterPy.cpp index 72354eb666..64afc5bfab 100644 --- a/src/Gui/Selection/SelectionFilterPy.cpp +++ b/src/Gui/Selection/SelectionFilterPy.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include #include "SelectionFilterPy.h" diff --git a/src/Gui/Selection/SelectionObject.cpp b/src/Gui/Selection/SelectionObject.cpp index f545ff377e..e80406a517 100644 --- a/src/Gui/Selection/SelectionObject.cpp +++ b/src/Gui/Selection/SelectionObject.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include diff --git a/src/Gui/Selection/SelectionObjectPyImp.cpp b/src/Gui/Selection/SelectionObjectPyImp.cpp index 686cb68121..daaac8e1ca 100644 --- a/src/Gui/Selection/SelectionObjectPyImp.cpp +++ b/src/Gui/Selection/SelectionObjectPyImp.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include #include diff --git a/src/Gui/Selection/SelectionObserverPython.cpp b/src/Gui/Selection/SelectionObserverPython.cpp index 890671873f..fd54b32625 100644 --- a/src/Gui/Selection/SelectionObserverPython.cpp +++ b/src/Gui/Selection/SelectionObserverPython.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include "SelectionObserverPython.h" #include diff --git a/src/Gui/Selection/SelectionView.cpp b/src/Gui/Selection/SelectionView.cpp index 08dac85922..3b79cb5ddb 100644 --- a/src/Gui/Selection/SelectionView.cpp +++ b/src/Gui/Selection/SelectionView.cpp @@ -20,8 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -32,7 +30,6 @@ #include #include #include -#endif #include #include diff --git a/src/Gui/Selection/SoFCSelection.cpp b/src/Gui/Selection/SoFCSelection.cpp index 4c46d3d713..a86ce98e8a 100644 --- a/src/Gui/Selection/SoFCSelection.cpp +++ b/src/Gui/Selection/SoFCSelection.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -38,7 +37,7 @@ # include # include # include -#endif + #include diff --git a/src/Gui/Selection/SoFCSelection.h b/src/Gui/Selection/SoFCSelection.h index dc3e371e39..c1f775c5aa 100644 --- a/src/Gui/Selection/SoFCSelection.h +++ b/src/Gui/Selection/SoFCSelection.h @@ -23,6 +23,8 @@ #ifndef GUI_SOFCSELECTION_H #define GUI_SOFCSELECTION_H +#include + # ifdef FC_OS_MACOSX # include # else diff --git a/src/Gui/Selection/SoFCSelectionAction.cpp b/src/Gui/Selection/SoFCSelectionAction.cpp index 6d66687b5e..e4b5d29e79 100644 --- a/src/Gui/Selection/SoFCSelectionAction.cpp +++ b/src/Gui/Selection/SoFCSelectionAction.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -60,7 +59,7 @@ # include # include # include -#endif + #include "SoFCSelectionAction.h" #include "SoFCSelection.h" diff --git a/src/Gui/Selection/SoFCSelectionContext.cpp b/src/Gui/Selection/SoFCSelectionContext.cpp index de17b97ee3..7bee675a12 100644 --- a/src/Gui/Selection/SoFCSelectionContext.cpp +++ b/src/Gui/Selection/SoFCSelectionContext.cpp @@ -20,13 +20,12 @@ * * ****************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include -#endif + #include "SoFCSelectionContext.h" #include "SoFCUnifiedSelection.h" diff --git a/src/Gui/Selection/SoFCUnifiedSelection.cpp b/src/Gui/Selection/SoFCUnifiedSelection.cpp index 1ae1897d58..17519732ac 100644 --- a/src/Gui/Selection/SoFCUnifiedSelection.cpp +++ b/src/Gui/Selection/SoFCUnifiedSelection.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include -#ifndef _PreComp_ # include # include # include @@ -59,7 +58,7 @@ # include # include # include -#endif + #ifdef FC_OS_MACOSX # include diff --git a/src/Gui/ShortcutManager.cpp b/src/Gui/ShortcutManager.cpp index 0fbf60d3fe..f8b9fc1aa3 100644 --- a/src/Gui/ShortcutManager.cpp +++ b/src/Gui/ShortcutManager.cpp @@ -20,12 +20,9 @@ * * ****************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include -#endif #include diff --git a/src/Gui/SoDatumLabel.cpp b/src/Gui/SoDatumLabel.cpp index dee7922338..40009170bf 100644 --- a/src/Gui/SoDatumLabel.cpp +++ b/src/Gui/SoDatumLabel.cpp @@ -20,8 +20,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + + + +#include + # ifdef FC_OS_WIN32 # include # undef min @@ -46,7 +49,6 @@ # include # include # include -#endif // _PreComp_ #include diff --git a/src/Gui/SoDevicePixelRatioElement.cpp b/src/Gui/SoDevicePixelRatioElement.cpp index 31cf7fcf84..78edb0b707 100644 --- a/src/Gui/SoDevicePixelRatioElement.cpp +++ b/src/Gui/SoDevicePixelRatioElement.cpp @@ -22,12 +22,11 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include # include -#endif + #include "SoDevicePixelRatioElement.h" diff --git a/src/Gui/SoFCColorBar.cpp b/src/Gui/SoFCColorBar.cpp index 34cefad4d4..33777e81e4 100644 --- a/src/Gui/SoFCColorBar.cpp +++ b/src/Gui/SoFCColorBar.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -32,7 +31,7 @@ # include # include # include -#endif + #include "SoFCColorBar.h" #include "SoFCColorGradient.h" diff --git a/src/Gui/SoFCColorBarNotifier.cpp b/src/Gui/SoFCColorBarNotifier.cpp index 92d955ce36..045557ca70 100644 --- a/src/Gui/SoFCColorBarNotifier.cpp +++ b/src/Gui/SoFCColorBarNotifier.cpp @@ -21,7 +21,7 @@ * * **************************************************************************/ -#include "PreCompiled.h" + #include "SoFCColorBarNotifier.h" #include "SoFCColorBar.h" diff --git a/src/Gui/SoFCColorGradient.cpp b/src/Gui/SoFCColorGradient.cpp index 9f7af9e366..7ea1d5c6ad 100644 --- a/src/Gui/SoFCColorGradient.cpp +++ b/src/Gui/SoFCColorGradient.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -34,7 +33,7 @@ # include # include # include -#endif + #include #include "SoFCColorGradient.h" diff --git a/src/Gui/SoFCColorLegend.cpp b/src/Gui/SoFCColorLegend.cpp index 03c04a257a..536d071aed 100644 --- a/src/Gui/SoFCColorLegend.cpp +++ b/src/Gui/SoFCColorLegend.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -32,7 +31,7 @@ # include # include # include -#endif + #include "SoFCColorLegend.h" #include "ViewProvider.h" diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp index 875d881bbf..b5485da40a 100644 --- a/src/Gui/SoFCDB.cpp +++ b/src/Gui/SoFCDB.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -40,7 +39,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/SoFCInteractiveElement.cpp b/src/Gui/SoFCInteractiveElement.cpp index 1f347e6caa..f80236c2f7 100644 --- a/src/Gui/SoFCInteractiveElement.cpp +++ b/src/Gui/SoFCInteractiveElement.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include "SoFCInteractiveElement.h" diff --git a/src/Gui/SoFCOffscreenRenderer.cpp b/src/Gui/SoFCOffscreenRenderer.cpp index 91164936d1..aa9cf4678a 100644 --- a/src/Gui/SoFCOffscreenRenderer.cpp +++ b/src/Gui/SoFCOffscreenRenderer.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include -#ifndef _PreComp_ # include # include # include @@ -35,6 +34,9 @@ # include # include # include + +#if defined(FC_OS_WIN32) +#include #endif #if !defined(FC_OS_MACOSX) diff --git a/src/Gui/SoFCOffscreenRenderer.h b/src/Gui/SoFCOffscreenRenderer.h index 3134cb71ea..8a950b3910 100644 --- a/src/Gui/SoFCOffscreenRenderer.h +++ b/src/Gui/SoFCOffscreenRenderer.h @@ -27,6 +27,8 @@ #include #include +#include + #ifdef FC_OS_MACOSX # include #else diff --git a/src/Gui/SoFCVectorizeSVGAction.cpp b/src/Gui/SoFCVectorizeSVGAction.cpp index f4a4208834..6c5bacb34b 100644 --- a/src/Gui/SoFCVectorizeSVGAction.cpp +++ b/src/Gui/SoFCVectorizeSVGAction.cpp @@ -20,14 +20,13 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include -#endif + #include diff --git a/src/Gui/SoFCVectorizeU3DAction.cpp b/src/Gui/SoFCVectorizeU3DAction.cpp index 0ae486ccb6..d294b2ab2d 100644 --- a/src/Gui/SoFCVectorizeU3DAction.cpp +++ b/src/Gui/SoFCVectorizeU3DAction.cpp @@ -20,14 +20,13 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include -#endif + #include #include diff --git a/src/Gui/SoQtOffscreenRendererPy.cpp b/src/Gui/SoQtOffscreenRendererPy.cpp index 552ca02059..a1b101a9f0 100644 --- a/src/Gui/SoQtOffscreenRendererPy.cpp +++ b/src/Gui/SoQtOffscreenRendererPy.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include #include "SoQtOffscreenRendererPy.h" diff --git a/src/Gui/SoTextLabel.cpp b/src/Gui/SoTextLabel.cpp index 037f75b6f4..fbd27669ac 100644 --- a/src/Gui/SoTextLabel.cpp +++ b/src/Gui/SoTextLabel.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include -#ifndef _PreComp_ # ifdef FC_OS_WIN32 # include # endif @@ -38,7 +37,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/SoTouchEvents.cpp b/src/Gui/SoTouchEvents.cpp index eaa6b16085..baa6a164b8 100644 --- a/src/Gui/SoTouchEvents.cpp +++ b/src/Gui/SoTouchEvents.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include diff --git a/src/Gui/SpaceballEvent.cpp b/src/Gui/SpaceballEvent.cpp index f383121761..27c9f12c87 100644 --- a/src/Gui/SpaceballEvent.cpp +++ b/src/Gui/SpaceballEvent.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include "SpaceballEvent.h" diff --git a/src/Gui/SpinBox.cpp b/src/Gui/SpinBox.cpp index 2fd840fecc..2523855d84 100644 --- a/src/Gui/SpinBox.cpp +++ b/src/Gui/SpinBox.cpp @@ -20,16 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include # include # include # include -#endif #include diff --git a/src/Gui/SplashScreen.cpp b/src/Gui/SplashScreen.cpp index 7ac9b9fc8c..614c055666 100644 --- a/src/Gui/SplashScreen.cpp +++ b/src/Gui/SplashScreen.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include @@ -34,7 +33,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Gui/SplitView3DInventor.cpp b/src/Gui/SplitView3DInventor.cpp index 29b3792784..9b821a0206 100644 --- a/src/Gui/SplitView3DInventor.cpp +++ b/src/Gui/SplitView3DInventor.cpp @@ -20,15 +20,14 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include -#endif + #include #include diff --git a/src/Gui/StartupProcess.cpp b/src/Gui/StartupProcess.cpp index 0dd9551dc6..820017cb29 100644 --- a/src/Gui/StartupProcess.cpp +++ b/src/Gui/StartupProcess.cpp @@ -21,8 +21,12 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ +#include + +#ifdef FC_OS_WIN32 +#include +#endif + #include #include #include @@ -39,7 +43,6 @@ #include #include #include -#endif #include "StartupProcess.h" #include "Application.h" diff --git a/src/Gui/StyleParameters/ParameterManager.cpp b/src/Gui/StyleParameters/ParameterManager.cpp index 9aa9894eaf..27d04f3e77 100644 --- a/src/Gui/StyleParameters/ParameterManager.cpp +++ b/src/Gui/StyleParameters/ParameterManager.cpp @@ -21,8 +21,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "ParameterManager.h" #include "Parser.h" @@ -30,14 +28,14 @@ #include #include -#ifndef _PreComp_ #include #include #include #include #include #include -#endif + +#include FC_LOG_LEVEL_INIT("Gui", true, true) diff --git a/src/Gui/StyleParameters/Parser.cpp b/src/Gui/StyleParameters/Parser.cpp index 26f664d95b..aceeed940e 100644 --- a/src/Gui/StyleParameters/Parser.cpp +++ b/src/Gui/StyleParameters/Parser.cpp @@ -21,21 +21,17 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - #include "Parser.h" #include "ParameterManager.h" #include #include -#ifndef _PreComp_ #include #include #include #include #include -#endif namespace Gui::StyleParameters { diff --git a/src/Gui/SyntaxHighlighter.cpp b/src/Gui/SyntaxHighlighter.cpp index 3f7431d53f..7b37f4cac9 100644 --- a/src/Gui/SyntaxHighlighter.cpp +++ b/src/Gui/SyntaxHighlighter.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include #include diff --git a/src/Gui/TaskDlgRelocation.cpp b/src/Gui/TaskDlgRelocation.cpp index c6008264a4..c72260dc43 100644 --- a/src/Gui/TaskDlgRelocation.cpp +++ b/src/Gui/TaskDlgRelocation.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include "Dialogs/ui_DlgLocationAngle.h" #include "Dialogs/ui_DlgLocationPos.h" diff --git a/src/Gui/TaskElementColors.cpp b/src/Gui/TaskElementColors.cpp index 7ff313927b..c8e7bc3b65 100644 --- a/src/Gui/TaskElementColors.cpp +++ b/src/Gui/TaskElementColors.cpp @@ -20,13 +20,12 @@ * * ****************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include -#endif + #include #include diff --git a/src/Gui/TaskTransform.cpp b/src/Gui/TaskTransform.cpp index f6f010372d..3d60702d56 100644 --- a/src/Gui/TaskTransform.cpp +++ b/src/Gui/TaskTransform.cpp @@ -20,12 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include -#endif #include #include diff --git a/src/Gui/TaskView/TaskAppearance.cpp b/src/Gui/TaskView/TaskAppearance.cpp index f2fba23a22..bea15c4087 100644 --- a/src/Gui/TaskView/TaskAppearance.cpp +++ b/src/Gui/TaskView/TaskAppearance.cpp @@ -21,7 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Gui/TaskView/TaskDialog.cpp b/src/Gui/TaskView/TaskDialog.cpp index b220d46557..f873149b5d 100644 --- a/src/Gui/TaskView/TaskDialog.cpp +++ b/src/Gui/TaskView/TaskDialog.cpp @@ -21,11 +21,9 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include -#endif + #include #include diff --git a/src/Gui/TaskView/TaskDialogPython.cpp b/src/Gui/TaskView/TaskDialogPython.cpp index 97357a3e89..73980d06cc 100644 --- a/src/Gui/TaskView/TaskDialogPython.cpp +++ b/src/Gui/TaskView/TaskDialogPython.cpp @@ -20,14 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ # include # include # include # include -#endif + #include #include diff --git a/src/Gui/TaskView/TaskEditControl.cpp b/src/Gui/TaskView/TaskEditControl.cpp index c6c720ce7a..5749c11619 100644 --- a/src/Gui/TaskView/TaskEditControl.cpp +++ b/src/Gui/TaskView/TaskEditControl.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Gui/TaskView/TaskImage.cpp b/src/Gui/TaskView/TaskImage.cpp index 61c60cdbcf..5337a3f128 100644 --- a/src/Gui/TaskView/TaskImage.cpp +++ b/src/Gui/TaskView/TaskImage.cpp @@ -21,8 +21,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -33,7 +31,6 @@ #include #include #include -#endif #include #include diff --git a/src/Gui/TaskView/TaskOrientation.cpp b/src/Gui/TaskView/TaskOrientation.cpp index deda8e81b7..79cd125683 100644 --- a/src/Gui/TaskView/TaskOrientation.cpp +++ b/src/Gui/TaskView/TaskOrientation.cpp @@ -21,11 +21,8 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif #include #include diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.cpp b/src/Gui/TaskView/TaskSelectLinkProperty.cpp index e37faf706e..3767768bd6 100644 --- a/src/Gui/TaskView/TaskSelectLinkProperty.cpp +++ b/src/Gui/TaskView/TaskSelectLinkProperty.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Gui/TaskView/TaskSolverMessages.cpp b/src/Gui/TaskView/TaskSolverMessages.cpp index ab9e290643..6d09a021fb 100644 --- a/src/Gui/TaskView/TaskSolverMessages.cpp +++ b/src/Gui/TaskView/TaskSolverMessages.cpp @@ -21,11 +21,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif #include #include diff --git a/src/Gui/TaskView/TaskView.cpp b/src/Gui/TaskView/TaskView.cpp index 0536d58ea9..3471d391a6 100644 --- a/src/Gui/TaskView/TaskView.cpp +++ b/src/Gui/TaskView/TaskView.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -33,7 +30,8 @@ # include # include # include -#endif + +#include #include #include diff --git a/src/Gui/TaskView/TaskWatcher.cpp b/src/Gui/TaskView/TaskWatcher.cpp index 7f93f36817..8bcfb82ac0 100644 --- a/src/Gui/TaskView/TaskWatcher.cpp +++ b/src/Gui/TaskView/TaskWatcher.cpp @@ -21,7 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Gui/TextDocumentEditorView.cpp b/src/Gui/TextDocumentEditorView.cpp index 214fe54c1e..040ecbf0a9 100644 --- a/src/Gui/TextDocumentEditorView.cpp +++ b/src/Gui/TextDocumentEditorView.cpp @@ -20,14 +20,13 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include #include #include -#endif + #include "TextDocumentEditorView.h" #include "Application.h" diff --git a/src/Gui/TextEdit.cpp b/src/Gui/TextEdit.cpp index 26d23f6497..4977e8ac48 100644 --- a/src/Gui/TextEdit.cpp +++ b/src/Gui/TextEdit.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -30,7 +29,8 @@ # include # include # include -#endif + +#include #include "CallTips.h" #include "TextEdit.h" diff --git a/src/Gui/TextureMapping.cpp b/src/Gui/TextureMapping.cpp index ecede365c4..f56bc735a8 100644 --- a/src/Gui/TextureMapping.cpp +++ b/src/Gui/TextureMapping.cpp @@ -20,16 +20,15 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include # include -#endif + #include diff --git a/src/Gui/Thumbnail.cpp b/src/Gui/Thumbnail.cpp index fed843fc83..32f54dc8a3 100644 --- a/src/Gui/Thumbnail.cpp +++ b/src/Gui/Thumbnail.cpp @@ -20,16 +20,15 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include # include -#endif + #include #include diff --git a/src/Gui/ToolBarAreaWidget.cpp b/src/Gui/ToolBarAreaWidget.cpp index 21c03a3318..24ee8c1095 100644 --- a/src/Gui/ToolBarAreaWidget.cpp +++ b/src/Gui/ToolBarAreaWidget.cpp @@ -19,11 +19,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include -#endif + #include "MainWindow.h" #include "ToolBarAreaWidget.h" diff --git a/src/Gui/ToolBarManager.cpp b/src/Gui/ToolBarManager.cpp index d8dba28c49..45076fd7bf 100644 --- a/src/Gui/ToolBarManager.cpp +++ b/src/Gui/ToolBarManager.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -33,7 +32,7 @@ # include # include # include -#endif + #include diff --git a/src/Gui/ToolBox.cpp b/src/Gui/ToolBox.cpp index 017600d3b4..e5c719940f 100644 --- a/src/Gui/ToolBox.cpp +++ b/src/Gui/ToolBox.cpp @@ -20,12 +20,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include -#endif + #include "ToolBox.h" diff --git a/src/Gui/ToolBoxManager.cpp b/src/Gui/ToolBoxManager.cpp index f1912c9493..718af4613e 100644 --- a/src/Gui/ToolBoxManager.cpp +++ b/src/Gui/ToolBoxManager.cpp @@ -20,13 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include -#endif + #include "ToolBoxManager.h" #include "Application.h" diff --git a/src/Gui/ToolHandler.cpp b/src/Gui/ToolHandler.cpp index 41c17fb2c9..5207070e48 100644 --- a/src/Gui/ToolHandler.cpp +++ b/src/Gui/ToolHandler.cpp @@ -20,15 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include -#endif // #ifndef _PreComp_ #include #include diff --git a/src/Gui/Tools.h b/src/Gui/Tools.h index 364da69ff1..24f8e90d3e 100644 --- a/src/Gui/Tools.h +++ b/src/Gui/Tools.h @@ -24,6 +24,7 @@ #ifndef GUI_TOOLS_H #define GUI_TOOLS_H +#include #include #include diff --git a/src/Gui/TransactionObject.cpp b/src/Gui/TransactionObject.cpp index f3706824fa..053a104ca5 100644 --- a/src/Gui/TransactionObject.cpp +++ b/src/Gui/TransactionObject.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include "Application.h" #include "Document.h" diff --git a/src/Gui/Transform.cpp b/src/Gui/Transform.cpp index 78734b9b67..3d3e1b3d6b 100644 --- a/src/Gui/Transform.cpp +++ b/src/Gui/Transform.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include #include diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index c218cc9435..8a3fbd876b 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -21,9 +21,8 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -41,7 +40,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/TreeParams.cpp b/src/Gui/TreeParams.cpp index 89e50c6138..23baad32dd 100644 --- a/src/Gui/TreeParams.cpp +++ b/src/Gui/TreeParams.cpp @@ -20,7 +20,7 @@ * * ****************************************************************************/ -#include "PreCompiled.h" + #include "Tree.h" /*[[[cog diff --git a/src/Gui/TreeView.cpp b/src/Gui/TreeView.cpp index 91f7a054ac..caeb8870bc 100644 --- a/src/Gui/TreeView.cpp +++ b/src/Gui/TreeView.cpp @@ -21,10 +21,9 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include "TreeView.h" #include "Application.h" diff --git a/src/Gui/UiLoader.cpp b/src/Gui/UiLoader.cpp index 5a40467240..7545176b0d 100644 --- a/src/Gui/UiLoader.cpp +++ b/src/Gui/UiLoader.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -29,7 +28,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/Utilities.cpp b/src/Gui/Utilities.cpp index f87e7e9313..0ca910fadf 100644 --- a/src/Gui/Utilities.cpp +++ b/src/Gui/Utilities.cpp @@ -20,14 +20,13 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include -#endif + #include diff --git a/src/Gui/VectorListEditor.cpp b/src/Gui/VectorListEditor.cpp index b921a3076d..184eb9188d 100644 --- a/src/Gui/VectorListEditor.cpp +++ b/src/Gui/VectorListEditor.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include -#endif #include "VectorListEditor.h" #include "ui_VectorListEditor.h" diff --git a/src/Gui/View.cpp b/src/Gui/View.cpp index bbd0010ac5..395a3fdd0e 100644 --- a/src/Gui/View.cpp +++ b/src/Gui/View.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" + #include "View.h" #include "Application.h" diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp index 653f905481..2919ec127e 100644 --- a/src/Gui/View3DInventor.cpp +++ b/src/Gui/View3DInventor.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -48,7 +47,7 @@ # include # include # include -#endif + #include diff --git a/src/Gui/View3DInventorRiftViewer.cpp b/src/Gui/View3DInventorRiftViewer.cpp index c37a945176..03ee928869 100644 --- a/src/Gui/View3DInventorRiftViewer.cpp +++ b/src/Gui/View3DInventorRiftViewer.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #if BUILD_VR diff --git a/src/Gui/View3DInventorSelection.cpp b/src/Gui/View3DInventorSelection.cpp index 8f144856b5..c0e153087b 100644 --- a/src/Gui/View3DInventorSelection.cpp +++ b/src/Gui/View3DInventorSelection.cpp @@ -20,13 +20,12 @@ * * ****************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include -#endif + #include "Application.h" #include "Document.h" diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index b23c6388be..56568ef78e 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" +#include #include -#ifndef _PreComp_ # ifdef FC_OS_WIN32 # include # endif @@ -90,7 +89,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h index 7d510620d4..c720fbe37c 100644 --- a/src/Gui/View3DInventorViewer.h +++ b/src/Gui/View3DInventorViewer.h @@ -39,6 +39,8 @@ #include #include +#include + #ifdef FC_OS_MACOSX # include #else diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp index 478744e6a1..d80dcd5fb3 100644 --- a/src/Gui/View3DPy.cpp +++ b/src/Gui/View3DPy.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -35,7 +32,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/View3DSettings.cpp b/src/Gui/View3DSettings.cpp index 57c67331a8..5fc20ec315 100644 --- a/src/Gui/View3DSettings.cpp +++ b/src/Gui/View3DSettings.cpp @@ -20,14 +20,13 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include -#endif + #include #include diff --git a/src/Gui/View3DViewerPy.cpp b/src/Gui/View3DViewerPy.cpp index 4ec0acc5c1..25ef1f424d 100644 --- a/src/Gui/View3DViewerPy.cpp +++ b/src/Gui/View3DViewerPy.cpp @@ -20,12 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include -#endif #include #include diff --git a/src/Gui/ViewParams.cpp b/src/Gui/ViewParams.cpp index 062b97f991..0c4206e409 100644 --- a/src/Gui/ViewParams.cpp +++ b/src/Gui/ViewParams.cpp @@ -20,7 +20,7 @@ * * ****************************************************************************/ -#include "PreCompiled.h" + #include #include "ViewParams.h" diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp index 05f374370d..065ed97e1c 100644 --- a/src/Gui/ViewProvider.cpp +++ b/src/Gui/ViewProvider.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -34,7 +33,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderAnnotation.cpp b/src/Gui/ViewProviderAnnotation.cpp index 5e110f90c6..189a940ba8 100644 --- a/src/Gui/ViewProviderAnnotation.cpp +++ b/src/Gui/ViewProviderAnnotation.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -41,7 +40,7 @@ # include # include # include -#endif + # include #include diff --git a/src/Gui/ViewProviderBuilder.cpp b/src/Gui/ViewProviderBuilder.cpp index ee8c4b6cdf..30b59a5420 100644 --- a/src/Gui/ViewProviderBuilder.cpp +++ b/src/Gui/ViewProviderBuilder.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include diff --git a/src/Gui/ViewProviderCoordinateSystem.cpp b/src/Gui/ViewProviderCoordinateSystem.cpp index 5541779578..ba2a565f18 100644 --- a/src/Gui/ViewProviderCoordinateSystem.cpp +++ b/src/Gui/ViewProviderCoordinateSystem.cpp @@ -21,14 +21,13 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderDatum.cpp b/src/Gui/ViewProviderDatum.cpp index 00d8d3d692..4dd0683308 100644 --- a/src/Gui/ViewProviderDatum.cpp +++ b/src/Gui/ViewProviderDatum.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -30,7 +27,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/ViewProviderDocumentObject.cpp b/src/Gui/ViewProviderDocumentObject.cpp index 5b4e608a81..a353301708 100644 --- a/src/Gui/ViewProviderDocumentObject.cpp +++ b/src/Gui/ViewProviderDocumentObject.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -31,7 +30,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderDocumentObjectGroup.cpp b/src/Gui/ViewProviderDocumentObjectGroup.cpp index 3cbf0c2ac6..d84d0bfc1a 100644 --- a/src/Gui/ViewProviderDocumentObjectGroup.cpp +++ b/src/Gui/ViewProviderDocumentObjectGroup.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include #include diff --git a/src/Gui/ViewProviderDocumentObjectPyImp.cpp b/src/Gui/ViewProviderDocumentObjectPyImp.cpp index cceaa813e5..5997a86ef2 100644 --- a/src/Gui/ViewProviderDocumentObjectPyImp.cpp +++ b/src/Gui/ViewProviderDocumentObjectPyImp.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include #include "Document.h" diff --git a/src/Gui/ViewProviderDragger.cpp b/src/Gui/ViewProviderDragger.cpp index 20a257d15d..2c02ec1354 100644 --- a/src/Gui/ViewProviderDragger.cpp +++ b/src/Gui/ViewProviderDragger.cpp @@ -20,9 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -30,7 +27,6 @@ #include #include #include -#endif #include #include diff --git a/src/Gui/ViewProviderExtension.cpp b/src/Gui/ViewProviderExtension.cpp index b2787019a3..e048d32665 100644 --- a/src/Gui/ViewProviderExtension.cpp +++ b/src/Gui/ViewProviderExtension.cpp @@ -21,12 +21,11 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include "ViewProviderExtension.h" #include "ViewProviderExtensionPy.h" diff --git a/src/Gui/ViewProviderExtensionPyImp.cpp b/src/Gui/ViewProviderExtensionPyImp.cpp index 13992779da..331fd4f95d 100644 --- a/src/Gui/ViewProviderExtensionPyImp.cpp +++ b/src/Gui/ViewProviderExtensionPyImp.cpp @@ -21,11 +21,10 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + // inclusion of the generated files (generated out of PropertyContainerPy.pyi) #include "ViewProviderExtensionPy.h" diff --git a/src/Gui/ViewProviderExtern.cpp b/src/Gui/ViewProviderExtern.cpp index 6ed09f8afc..79a59aa92b 100644 --- a/src/Gui/ViewProviderExtern.cpp +++ b/src/Gui/ViewProviderExtern.cpp @@ -20,13 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderFeature.cpp b/src/Gui/ViewProviderFeature.cpp index 30e92bee2d..fe7da67307 100644 --- a/src/Gui/ViewProviderFeature.cpp +++ b/src/Gui/ViewProviderFeature.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include diff --git a/src/Gui/ViewProviderFeaturePython.cpp b/src/Gui/ViewProviderFeaturePython.cpp index 7edac104a5..5a37b881ff 100644 --- a/src/Gui/ViewProviderFeaturePython.cpp +++ b/src/Gui/ViewProviderFeaturePython.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -31,7 +30,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderGeoFeatureGroup.cpp b/src/Gui/ViewProviderGeoFeatureGroup.cpp index d60a2fc90d..79c3a82f68 100644 --- a/src/Gui/ViewProviderGeoFeatureGroup.cpp +++ b/src/Gui/ViewProviderGeoFeatureGroup.cpp @@ -21,7 +21,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include "ViewProviderGeoFeatureGroup.h" diff --git a/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp b/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp index 608847e413..7610493478 100644 --- a/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp +++ b/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp @@ -22,11 +22,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include -#endif + #include #include diff --git a/src/Gui/ViewProviderGeometryObject.cpp b/src/Gui/ViewProviderGeometryObject.cpp index e297ee2f2b..d401848ca2 100644 --- a/src/Gui/ViewProviderGeometryObject.cpp +++ b/src/Gui/ViewProviderGeometryObject.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include @@ -36,7 +35,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Gui/ViewProviderGeometryObjectPyImp.cpp b/src/Gui/ViewProviderGeometryObjectPyImp.cpp index afa173a5ad..fb7c48c5a4 100644 --- a/src/Gui/ViewProviderGeometryObjectPyImp.cpp +++ b/src/Gui/ViewProviderGeometryObjectPyImp.cpp @@ -21,11 +21,10 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include -#endif + #include #include diff --git a/src/Gui/ViewProviderGroupExtension.cpp b/src/Gui/ViewProviderGroupExtension.cpp index 3577f10a45..c8f24853b6 100644 --- a/src/Gui/ViewProviderGroupExtension.cpp +++ b/src/Gui/ViewProviderGroupExtension.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include #include diff --git a/src/Gui/ViewProviderImagePlane.cpp b/src/Gui/ViewProviderImagePlane.cpp index b177877bc5..b3374bbe9b 100644 --- a/src/Gui/ViewProviderImagePlane.cpp +++ b/src/Gui/ViewProviderImagePlane.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -37,7 +36,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderInventorObject.cpp b/src/Gui/ViewProviderInventorObject.cpp index 38cb578659..c42761632f 100644 --- a/src/Gui/ViewProviderInventorObject.cpp +++ b/src/Gui/ViewProviderInventorObject.cpp @@ -20,15 +20,14 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderLine.cpp b/src/Gui/ViewProviderLine.cpp index 82111780a0..b63e1ef656 100644 --- a/src/Gui/ViewProviderLine.cpp +++ b/src/Gui/ViewProviderLine.cpp @@ -21,16 +21,15 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp index 240bd9381c..ee5d9345dc 100644 --- a/src/Gui/ViewProviderLink.cpp +++ b/src/Gui/ViewProviderLink.cpp @@ -20,9 +20,8 @@ * * ****************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -54,7 +53,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderLinkPyImp.cpp b/src/Gui/ViewProviderLinkPyImp.cpp index 288fb26735..3fd86cb3b9 100644 --- a/src/Gui/ViewProviderLinkPyImp.cpp +++ b/src/Gui/ViewProviderLinkPyImp.cpp @@ -20,11 +20,10 @@ * * ****************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include diff --git a/src/Gui/ViewProviderMaterialObject.cpp b/src/Gui/ViewProviderMaterialObject.cpp index 7f22cd0272..ed3501d344 100644 --- a/src/Gui/ViewProviderMaterialObject.cpp +++ b/src/Gui/ViewProviderMaterialObject.cpp @@ -20,12 +20,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include "ViewProviderMaterialObject.h" #include "Application.h" diff --git a/src/Gui/ViewProviderOriginGroup.cpp b/src/Gui/ViewProviderOriginGroup.cpp index 3bc77727fb..77fa94bcde 100644 --- a/src/Gui/ViewProviderOriginGroup.cpp +++ b/src/Gui/ViewProviderOriginGroup.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include "ViewProviderOriginGroup.h" diff --git a/src/Gui/ViewProviderOriginGroupExtension.cpp b/src/Gui/ViewProviderOriginGroupExtension.cpp index 25478d949f..e966292ef4 100644 --- a/src/Gui/ViewProviderOriginGroupExtension.cpp +++ b/src/Gui/ViewProviderOriginGroupExtension.cpp @@ -21,12 +21,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include -#endif + #include #include diff --git a/src/Gui/ViewProviderPart.cpp b/src/Gui/ViewProviderPart.cpp index 79f501a7de..0a5ba20177 100644 --- a/src/Gui/ViewProviderPart.cpp +++ b/src/Gui/ViewProviderPart.cpp @@ -20,11 +20,10 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include #include diff --git a/src/Gui/ViewProviderPlacement.cpp b/src/Gui/ViewProviderPlacement.cpp index 0f3511c2c8..c544a8f39c 100644 --- a/src/Gui/ViewProviderPlacement.cpp +++ b/src/Gui/ViewProviderPlacement.cpp @@ -20,13 +20,12 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include -#endif + #include diff --git a/src/Gui/ViewProviderPlane.cpp b/src/Gui/ViewProviderPlane.cpp index 8ee2da6e55..a211952364 100644 --- a/src/Gui/ViewProviderPlane.cpp +++ b/src/Gui/ViewProviderPlane.cpp @@ -21,9 +21,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -35,7 +32,6 @@ # include # include # include -#endif #include #include diff --git a/src/Gui/ViewProviderPoint.cpp b/src/Gui/ViewProviderPoint.cpp index 22c27aaed1..f25a0babc6 100644 --- a/src/Gui/ViewProviderPoint.cpp +++ b/src/Gui/ViewProviderPoint.cpp @@ -21,16 +21,15 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include # include # include # include -#endif + #include "ViewProviderPoint.h" #include "ViewProviderCoordinateSystem.h" diff --git a/src/Gui/ViewProviderPyImp.cpp b/src/Gui/ViewProviderPyImp.cpp index 603a8ae429..c159fa8c8a 100644 --- a/src/Gui/ViewProviderPyImp.cpp +++ b/src/Gui/ViewProviderPyImp.cpp @@ -20,8 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -29,7 +28,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderSuppressibleExtension.cpp b/src/Gui/ViewProviderSuppressibleExtension.cpp index 6c084775b8..dfdbcc2d73 100644 --- a/src/Gui/ViewProviderSuppressibleExtension.cpp +++ b/src/Gui/ViewProviderSuppressibleExtension.cpp @@ -20,7 +20,7 @@ * * ***************************************************************************/ -#include "PreCompiled.h" + #include #include diff --git a/src/Gui/ViewProviderTextDocument.cpp b/src/Gui/ViewProviderTextDocument.cpp index 7d3c36d632..baa80ab059 100644 --- a/src/Gui/ViewProviderTextDocument.cpp +++ b/src/Gui/ViewProviderTextDocument.cpp @@ -20,12 +20,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderTextureExtension.cpp b/src/Gui/ViewProviderTextureExtension.cpp index 4ec1d1b5de..eeba50561a 100644 --- a/src/Gui/ViewProviderTextureExtension.cpp +++ b/src/Gui/ViewProviderTextureExtension.cpp @@ -21,15 +21,14 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + #include #include #include #include #include #include -#endif + #include "ViewProviderTextureExtension.h" #include diff --git a/src/Gui/ViewProviderVRMLObject.cpp b/src/Gui/ViewProviderVRMLObject.cpp index b851f8b97e..30ecb139dd 100644 --- a/src/Gui/ViewProviderVRMLObject.cpp +++ b/src/Gui/ViewProviderVRMLObject.cpp @@ -20,9 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -32,7 +31,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/ViewProviderVarSet.cpp b/src/Gui/ViewProviderVarSet.cpp index e43af5873a..200be1dafa 100644 --- a/src/Gui/ViewProviderVarSet.cpp +++ b/src/Gui/ViewProviderVarSet.cpp @@ -20,10 +20,9 @@ * * ****************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include -#endif + #include diff --git a/src/Gui/WaitCursor.cpp b/src/Gui/WaitCursor.cpp index 61000bb4de..31a6bf31e2 100644 --- a/src/Gui/WaitCursor.cpp +++ b/src/Gui/WaitCursor.cpp @@ -20,10 +20,8 @@ * * ***************************************************************************/ +#include -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include @@ -31,7 +29,6 @@ # ifdef FC_OS_WIN32 # include # endif -#endif #include "WaitCursor.h" diff --git a/src/Gui/WhatsThis.cpp b/src/Gui/WhatsThis.cpp index 0d253dd7dd..bccfe36bec 100644 --- a/src/Gui/WhatsThis.cpp +++ b/src/Gui/WhatsThis.cpp @@ -21,11 +21,10 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include "WhatsThis.h" #include "Action.h" diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp index d77f91315e..ccc27860f5 100644 --- a/src/Gui/WidgetFactory.cpp +++ b/src/Gui/WidgetFactory.cpp @@ -21,11 +21,11 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + +#include #ifdef FC_OS_WIN32 #undef max diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp index a4d1f1505e..2fe6a37d44 100644 --- a/src/Gui/Widgets.cpp +++ b/src/Gui/Widgets.cpp @@ -21,8 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -38,7 +37,7 @@ # include # include # include -#endif + #include #include diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp index dd19ce1f7b..f44f6e1c24 100644 --- a/src/Gui/Window.cpp +++ b/src/Gui/Window.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" + #include #include diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp index 8f84d3111e..276428afc1 100644 --- a/src/Gui/Workbench.cpp +++ b/src/Gui/Workbench.cpp @@ -21,11 +21,10 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include -#endif + #include "Workbench.h" #include "WorkbenchManipulator.h" diff --git a/src/Gui/WorkbenchFactory.cpp b/src/Gui/WorkbenchFactory.cpp index 2025322cee..35a4bf4e1b 100644 --- a/src/Gui/WorkbenchFactory.cpp +++ b/src/Gui/WorkbenchFactory.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" + #include "WorkbenchFactory.h" #include "Workbench.h" diff --git a/src/Gui/WorkbenchManager.cpp b/src/Gui/WorkbenchManager.cpp index 3828e826a0..784a3f321c 100644 --- a/src/Gui/WorkbenchManager.cpp +++ b/src/Gui/WorkbenchManager.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" + #include diff --git a/src/Gui/WorkbenchManipulator.cpp b/src/Gui/WorkbenchManipulator.cpp index 560a9e2ad5..96c7a89d1e 100644 --- a/src/Gui/WorkbenchManipulator.cpp +++ b/src/Gui/WorkbenchManipulator.cpp @@ -22,7 +22,7 @@ **************************************************************************/ -#include "PreCompiled.h" + #include "WorkbenchManipulator.h" using namespace Gui; diff --git a/src/Gui/WorkbenchManipulatorPython.cpp b/src/Gui/WorkbenchManipulatorPython.cpp index dafcdf0361..e58ae33543 100644 --- a/src/Gui/WorkbenchManipulatorPython.cpp +++ b/src/Gui/WorkbenchManipulatorPython.cpp @@ -22,7 +22,7 @@ **************************************************************************/ -#include "PreCompiled.h" + #include "WorkbenchManipulatorPython.h" #include "MenuManager.h" #include "ToolBarManager.h" diff --git a/src/Gui/WorkbenchPyImp.cpp b/src/Gui/WorkbenchPyImp.cpp index 542ccec2b2..b7a859beec 100644 --- a/src/Gui/WorkbenchPyImp.cpp +++ b/src/Gui/WorkbenchPyImp.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" + #include "Workbench.h" #include "WorkbenchManager.h" diff --git a/src/Gui/WorkbenchSelector.cpp b/src/Gui/WorkbenchSelector.cpp index 72e02d42fd..04f1ae13e3 100644 --- a/src/Gui/WorkbenchSelector.cpp +++ b/src/Gui/WorkbenchSelector.cpp @@ -20,9 +20,8 @@ ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ + # include # include # include @@ -32,7 +31,7 @@ # include # include # include -#endif + #include "Base/Tools.h" #include "Action.h" diff --git a/src/Gui/propertyeditor/PropertyEditor.cpp b/src/Gui/propertyeditor/PropertyEditor.cpp index c5664ee36f..26531779af 100644 --- a/src/Gui/propertyeditor/PropertyEditor.cpp +++ b/src/Gui/propertyeditor/PropertyEditor.cpp @@ -20,10 +20,6 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -32,7 +28,6 @@ #include #include #include -#endif #include #include diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp index 23b43e80ef..5c22239324 100644 --- a/src/Gui/propertyeditor/PropertyItem.cpp +++ b/src/Gui/propertyeditor/PropertyItem.cpp @@ -21,9 +21,6 @@ ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include #include @@ -39,7 +36,6 @@ #include #include #include -#endif #include "PropertyItem.h" #include "PropertyView.h" diff --git a/src/Gui/propertyeditor/PropertyItemDelegate.cpp b/src/Gui/propertyeditor/PropertyItemDelegate.cpp index c9f355340d..7f226260ad 100644 --- a/src/Gui/propertyeditor/PropertyItemDelegate.cpp +++ b/src/Gui/propertyeditor/PropertyItemDelegate.cpp @@ -20,17 +20,12 @@ * * ***************************************************************************/ - -#include "PreCompiled.h" - -#ifndef _PreComp_ # include # include # include # include # include # include -#endif #include diff --git a/src/Gui/propertyeditor/PropertyModel.cpp b/src/Gui/propertyeditor/PropertyModel.cpp index b6f1771054..9ecd4543b0 100644 --- a/src/Gui/propertyeditor/PropertyModel.cpp +++ b/src/Gui/propertyeditor/PropertyModel.cpp @@ -20,12 +20,8 @@ * * ***************************************************************************/ -#include "PreCompiled.h" - -#ifndef _PreComp_ #include #include -#endif #include diff --git a/src/Gui/resource.cpp b/src/Gui/resource.cpp index 9239a9b24b..31fc73251a 100644 --- a/src/Gui/resource.cpp +++ b/src/Gui/resource.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ -#include "PreCompiled.h" + #include "BitmapFactory.h" #include "WidgetFactory.h" diff --git a/tests/src/Gui/StyleParameters/StyleParametersApplicationTest.cpp b/tests/src/Gui/StyleParameters/StyleParametersApplicationTest.cpp index cacdfeea91..935b1681ed 100644 --- a/tests/src/Gui/StyleParameters/StyleParametersApplicationTest.cpp +++ b/tests/src/Gui/StyleParameters/StyleParametersApplicationTest.cpp @@ -23,6 +23,8 @@ #include +#include + #include "src/App/InitApplication.h" #include