diff --git a/src/Mod/Material/App/AppMaterial.cpp b/src/Mod/Material/App/AppMaterial.cpp index a6bc448cf1..4a82d772a6 100644 --- a/src/Mod/Material/App/AppMaterial.cpp +++ b/src/Mod/Material/App/AppMaterial.cpp @@ -19,10 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include #include diff --git a/src/Mod/Material/App/Array2DPyImp.cpp b/src/Mod/Material/App/Array2DPyImp.cpp index 549dc673aa..4d80370ef5 100644 --- a/src/Mod/Material/App/Array2DPyImp.cpp +++ b/src/Mod/Material/App/Array2DPyImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Mod/Material/App/Array3DPyImp.cpp b/src/Mod/Material/App/Array3DPyImp.cpp index c6ee68510a..ad40e1a679 100644 --- a/src/Mod/Material/App/Array3DPyImp.cpp +++ b/src/Mod/Material/App/Array3DPyImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Mod/Material/App/CMakeLists.txt b/src/Mod/Material/App/CMakeLists.txt index 1fe10bfbf6..473a67df8b 100644 --- a/src/Mod/Material/App/CMakeLists.txt +++ b/src/Mod/Material/App/CMakeLists.txt @@ -114,7 +114,6 @@ SET(Materials_SRCS ModelManagerLocal.h ModelUuids.cpp ModelUuids.h - PreCompiled.cpp PreCompiled.h PropertyMaterial.cpp PropertyMaterial.h @@ -134,13 +133,14 @@ if(BUILD_MATERIAL_EXTERNAL) ) endif(BUILD_MATERIAL_EXTERNAL) +add_library(Materials SHARED ${Materials_SRCS}) + if(FREECAD_USE_PCH) - add_definitions(-D_PreComp_) - GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Materials_SRCS}) - ADD_MSVC_PRECOMPILED_HEADER(Materials PreCompiled.h PreCompiled.cpp PCH_SRCS) + target_precompile_headers(Materials PRIVATE + $<$:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h"> + ) endif(FREECAD_USE_PCH) -add_library(Materials SHARED ${Materials_SRCS}) target_include_directories( Materials PRIVATE diff --git a/src/Mod/Material/App/ExternalManager.cpp b/src/Mod/Material/App/ExternalManager.cpp index ad4b358fcc..9512c19559 100644 --- a/src/Mod/Material/App/ExternalManager.cpp +++ b/src/Mod/Material/App/ExternalManager.cpp @@ -19,10 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include #include diff --git a/src/Mod/Material/App/Library.cpp b/src/Mod/Material/App/Library.cpp index 98d3bd54d4..c9b49b88dc 100644 --- a/src/Mod/Material/App/Library.cpp +++ b/src/Mod/Material/App/Library.cpp @@ -19,10 +19,7 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include diff --git a/src/Mod/Material/App/MaterialConfigLoader.cpp b/src/Mod/Material/App/MaterialConfigLoader.cpp index c2271b2456..19cb504342 100644 --- a/src/Mod/Material/App/MaterialConfigLoader.cpp +++ b/src/Mod/Material/App/MaterialConfigLoader.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -30,7 +28,7 @@ #include #include #include -#endif + #include diff --git a/src/Mod/Material/App/MaterialFilter.cpp b/src/Mod/Material/App/MaterialFilter.cpp index 7ab64f3d81..c491fbd31a 100644 --- a/src/Mod/Material/App/MaterialFilter.cpp +++ b/src/Mod/Material/App/MaterialFilter.cpp @@ -19,10 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include "Exceptions.h" diff --git a/src/Mod/Material/App/MaterialFilterOptionsPyImp.cpp b/src/Mod/Material/App/MaterialFilterOptionsPyImp.cpp index 3e7f21b6d5..d04d130772 100644 --- a/src/Mod/Material/App/MaterialFilterOptionsPyImp.cpp +++ b/src/Mod/Material/App/MaterialFilterOptionsPyImp.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" - #include #include diff --git a/src/Mod/Material/App/MaterialFilterPyImp.cpp b/src/Mod/Material/App/MaterialFilterPyImp.cpp index 2b467e5587..b214b3d8c4 100644 --- a/src/Mod/Material/App/MaterialFilterPyImp.cpp +++ b/src/Mod/Material/App/MaterialFilterPyImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include diff --git a/src/Mod/Material/App/MaterialLibrary.cpp b/src/Mod/Material/App/MaterialLibrary.cpp index c15a3a97d2..8fd391b22f 100644 --- a/src/Mod/Material/App/MaterialLibrary.cpp +++ b/src/Mod/Material/App/MaterialLibrary.cpp @@ -19,12 +19,10 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include -#endif + #include diff --git a/src/Mod/Material/App/MaterialLibraryPyImp.cpp b/src/Mod/Material/App/MaterialLibraryPyImp.cpp index 7001d9dc6b..9ae8377c8a 100644 --- a/src/Mod/Material/App/MaterialLibraryPyImp.cpp +++ b/src/Mod/Material/App/MaterialLibraryPyImp.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" - #include #include diff --git a/src/Mod/Material/App/MaterialLoader.cpp b/src/Mod/Material/App/MaterialLoader.cpp index fbe0c4639d..815fe8488b 100644 --- a/src/Mod/Material/App/MaterialLoader.cpp +++ b/src/Mod/Material/App/MaterialLoader.cpp @@ -19,15 +19,13 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include #include #include -#endif + #include #include diff --git a/src/Mod/Material/App/MaterialManager.cpp b/src/Mod/Material/App/MaterialManager.cpp index b4ca984a6f..4b97f7a7de 100644 --- a/src/Mod/Material/App/MaterialManager.cpp +++ b/src/Mod/Material/App/MaterialManager.cpp @@ -19,10 +19,8 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + #include #include diff --git a/src/Mod/Material/App/MaterialManagerExternal.cpp b/src/Mod/Material/App/MaterialManagerExternal.cpp index 8ebfdc2d08..80835c74a6 100644 --- a/src/Mod/Material/App/MaterialManagerExternal.cpp +++ b/src/Mod/Material/App/MaterialManagerExternal.cpp @@ -19,10 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include diff --git a/src/Mod/Material/App/MaterialManagerLocal.cpp b/src/Mod/Material/App/MaterialManagerLocal.cpp index dc5e50fbff..d3d5cc9f76 100644 --- a/src/Mod/Material/App/MaterialManagerLocal.cpp +++ b/src/Mod/Material/App/MaterialManagerLocal.cpp @@ -19,10 +19,7 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif #include #include diff --git a/src/Mod/Material/App/MaterialManagerPyImp.cpp b/src/Mod/Material/App/MaterialManagerPyImp.cpp index cb898bda1a..577301486e 100644 --- a/src/Mod/Material/App/MaterialManagerPyImp.cpp +++ b/src/Mod/Material/App/MaterialManagerPyImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include "Exceptions.h" #include "MaterialFilter.h" diff --git a/src/Mod/Material/App/MaterialPropertyPyImp.cpp b/src/Mod/Material/App/MaterialPropertyPyImp.cpp index d6bced53c8..7fa338ef81 100644 --- a/src/Mod/Material/App/MaterialPropertyPyImp.cpp +++ b/src/Mod/Material/App/MaterialPropertyPyImp.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" - #include "Model.h" #include "PyVariants.h" #include "ModelPropertyPy.h" diff --git a/src/Mod/Material/App/MaterialPyImp.cpp b/src/Mod/Material/App/MaterialPyImp.cpp index 66ae0479e7..b6506a4c98 100644 --- a/src/Mod/Material/App/MaterialPyImp.cpp +++ b/src/Mod/Material/App/MaterialPyImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include diff --git a/src/Mod/Material/App/MaterialValue.cpp b/src/Mod/Material/App/MaterialValue.cpp index f8514c2845..eaa383a92a 100644 --- a/src/Mod/Material/App/MaterialValue.cpp +++ b/src/Mod/Material/App/MaterialValue.cpp @@ -19,11 +19,9 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif + #include #include diff --git a/src/Mod/Material/App/Materials.cpp b/src/Mod/Material/App/Materials.cpp index 11afb9f78f..40cb847bbc 100644 --- a/src/Mod/Material/App/Materials.cpp +++ b/src/Mod/Material/App/Materials.cpp @@ -19,11 +19,9 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif + #include diff --git a/src/Mod/Material/App/Model.cpp b/src/Mod/Material/App/Model.cpp index 28a1b7ad81..fe6955eea8 100644 --- a/src/Mod/Material/App/Model.cpp +++ b/src/Mod/Material/App/Model.cpp @@ -19,10 +19,8 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + #include diff --git a/src/Mod/Material/App/ModelLibrary.cpp b/src/Mod/Material/App/ModelLibrary.cpp index ecbd09f755..7d327b2520 100644 --- a/src/Mod/Material/App/ModelLibrary.cpp +++ b/src/Mod/Material/App/ModelLibrary.cpp @@ -19,11 +19,8 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif #include diff --git a/src/Mod/Material/App/ModelLoader.cpp b/src/Mod/Material/App/ModelLoader.cpp index 671cb8db3d..c52ca5484f 100644 --- a/src/Mod/Material/App/ModelLoader.cpp +++ b/src/Mod/Material/App/ModelLoader.cpp @@ -19,12 +19,9 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include -#endif #include #include diff --git a/src/Mod/Material/App/ModelManager.cpp b/src/Mod/Material/App/ModelManager.cpp index 99d3c1f561..9ab164abe4 100644 --- a/src/Mod/Material/App/ModelManager.cpp +++ b/src/Mod/Material/App/ModelManager.cpp @@ -19,10 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include diff --git a/src/Mod/Material/App/ModelManagerExternal.cpp b/src/Mod/Material/App/ModelManagerExternal.cpp index 583458a83e..ae15e73e31 100644 --- a/src/Mod/Material/App/ModelManagerExternal.cpp +++ b/src/Mod/Material/App/ModelManagerExternal.cpp @@ -19,10 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include diff --git a/src/Mod/Material/App/ModelManagerLocal.cpp b/src/Mod/Material/App/ModelManagerLocal.cpp index 9f59ad4657..8442a1fa9a 100644 --- a/src/Mod/Material/App/ModelManagerLocal.cpp +++ b/src/Mod/Material/App/ModelManagerLocal.cpp @@ -19,10 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include diff --git a/src/Mod/Material/App/ModelManagerPyImp.cpp b/src/Mod/Material/App/ModelManagerPyImp.cpp index 1aa23a6c2e..529166897a 100644 --- a/src/Mod/Material/App/ModelManagerPyImp.cpp +++ b/src/Mod/Material/App/ModelManagerPyImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include "Model.h" #include "ModelLibrary.h" diff --git a/src/Mod/Material/App/ModelPropertyPyImp.cpp b/src/Mod/Material/App/ModelPropertyPyImp.cpp index 90974e770b..cf401bab31 100644 --- a/src/Mod/Material/App/ModelPropertyPyImp.cpp +++ b/src/Mod/Material/App/ModelPropertyPyImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include "Model.h" #include "ModelPropertyPy.h" diff --git a/src/Mod/Material/App/ModelPyImp.cpp b/src/Mod/Material/App/ModelPyImp.cpp index a9838ed649..9aae1dc0fe 100644 --- a/src/Mod/Material/App/ModelPyImp.cpp +++ b/src/Mod/Material/App/ModelPyImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include "Model.h" #include "ModelLibrary.h" diff --git a/src/Mod/Material/App/ModelUuids.cpp b/src/Mod/Material/App/ModelUuids.cpp index dd563848c2..bea9599f30 100644 --- a/src/Mod/Material/App/ModelUuids.cpp +++ b/src/Mod/Material/App/ModelUuids.cpp @@ -19,10 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "ModelUuids.h" using namespace Materials; diff --git a/src/Mod/Material/App/PreCompiled.cpp b/src/Mod/Material/App/PreCompiled.cpp deleted file mode 100644 index 48eade6cc8..0000000000 --- a/src/Mod/Material/App/PreCompiled.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2023 David Carter * - * * - * This file is part of FreeCAD. * - * * - * FreeCAD is free software: you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation, either version 2.1 of the * - * License, or (at your option) any later version. * - * * - * FreeCAD 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 * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with FreeCAD. If not, see * - * . * - * * - **************************************************************************/ - -#include "PreCompiled.h" diff --git a/src/Mod/Material/App/PreCompiled.h b/src/Mod/Material/App/PreCompiled.h index 0abd286cbc..05b5feb1c2 100644 --- a/src/Mod/Material/App/PreCompiled.h +++ b/src/Mod/Material/App/PreCompiled.h @@ -28,7 +28,6 @@ #include #endif -#ifdef _PreComp_ // standard #include @@ -57,6 +56,5 @@ #include #include -#endif //_PreComp_ #endif // MATERIAL_PRECOMPILED_H diff --git a/src/Mod/Material/App/PropertyMaterial.cpp b/src/Mod/Material/App/PropertyMaterial.cpp index 086f0dd040..02363183ad 100644 --- a/src/Mod/Material/App/PropertyMaterial.cpp +++ b/src/Mod/Material/App/PropertyMaterial.cpp @@ -19,11 +19,9 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif + #include diff --git a/src/Mod/Material/App/PyVariants.cpp b/src/Mod/Material/App/PyVariants.cpp index c1599e3661..39702bc100 100644 --- a/src/Mod/Material/App/PyVariants.cpp +++ b/src/Mod/Material/App/PyVariants.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" - #include #include "PyVariants.h" diff --git a/src/Mod/Material/App/UUIDsPyImp.cpp b/src/Mod/Material/App/UUIDsPyImp.cpp index 4ff55ee7b8..68145ed7d3 100644 --- a/src/Mod/Material/App/UUIDsPyImp.cpp +++ b/src/Mod/Material/App/UUIDsPyImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include "ModelUuids.h" diff --git a/src/Mod/Material/Gui/AppMatGui.cpp b/src/Mod/Material/Gui/AppMatGui.cpp index e3500fca45..077c7b082a 100644 --- a/src/Mod/Material/Gui/AppMatGui.cpp +++ b/src/Mod/Material/Gui/AppMatGui.cpp @@ -20,10 +20,6 @@ **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include #include diff --git a/src/Mod/Material/Gui/AppearancePreview.cpp b/src/Mod/Material/Gui/AppearancePreview.cpp index 2c6eaa599f..5c77131d10 100644 --- a/src/Mod/Material/Gui/AppearancePreview.cpp +++ b/src/Mod/Material/Gui/AppearancePreview.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include @@ -31,7 +29,6 @@ #include #include #include -#endif #include diff --git a/src/Mod/Material/Gui/Array2D.cpp b/src/Mod/Material/Gui/Array2D.cpp index 85cdcb71e6..b4cf17bb29 100644 --- a/src/Mod/Material/Gui/Array2D.cpp +++ b/src/Mod/Material/Gui/Array2D.cpp @@ -19,11 +19,9 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/Array3D.cpp b/src/Mod/Material/Gui/Array3D.cpp index fc4397b3dd..c9d3fb052a 100644 --- a/src/Mod/Material/Gui/Array3D.cpp +++ b/src/Mod/Material/Gui/Array3D.cpp @@ -19,12 +19,10 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include -#endif + #include diff --git a/src/Mod/Material/Gui/ArrayDelegate.cpp b/src/Mod/Material/Gui/ArrayDelegate.cpp index 0ceebb9519..5706a6766d 100644 --- a/src/Mod/Material/Gui/ArrayDelegate.cpp +++ b/src/Mod/Material/Gui/ArrayDelegate.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -31,7 +29,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/ArrayModel.cpp b/src/Mod/Material/Gui/ArrayModel.cpp index c8c72ecc86..bff4e1aa73 100644 --- a/src/Mod/Material/Gui/ArrayModel.cpp +++ b/src/Mod/Material/Gui/ArrayModel.cpp @@ -19,11 +19,9 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/BaseDelegate.cpp b/src/Mod/Material/Gui/BaseDelegate.cpp index cf7b8cf375..8bad500e78 100644 --- a/src/Mod/Material/Gui/BaseDelegate.cpp +++ b/src/Mod/Material/Gui/BaseDelegate.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -32,7 +30,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/CMakeLists.txt b/src/Mod/Material/Gui/CMakeLists.txt index 69b886e1e8..3be19ef563 100644 --- a/src/Mod/Material/Gui/CMakeLists.txt +++ b/src/Mod/Material/Gui/CMakeLists.txt @@ -115,7 +115,6 @@ SET(MatGui_SRCS ModelSelect.cpp ModelSelect.h ModelSelect.ui - PreCompiled.cpp PreCompiled.h TextEdit.cpp TextEdit.h @@ -136,12 +135,6 @@ if(BUILD_MATERIAL_EXTERNAL) ) endif(BUILD_MATERIAL_EXTERNAL) -if(FREECAD_USE_PCH) - add_definitions(-D_PreComp_) - GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${MatGui_SRCS}) - ADD_MSVC_PRECOMPILED_HEADER(MatGui PreCompiled.h PreCompiled.cpp PCH_SRCS) -endif(FREECAD_USE_PCH) - SET(MatGuiIcon_SVG Resources/icons/list.svg Resources/icons/Material_Edit.svg @@ -168,6 +161,12 @@ add_library(MatGui SHARED ${Material_Ui_Files} ) +if(FREECAD_USE_PCH) + target_precompile_headers(MatGui PRIVATE + $<$:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h"> + ) +endif(FREECAD_USE_PCH) + target_include_directories( MatGui PRIVATE diff --git a/src/Mod/Material/Gui/Command.cpp b/src/Mod/Material/Gui/Command.cpp index 3390541ff9..59ca2f6d04 100644 --- a/src/Mod/Material/Gui/Command.cpp +++ b/src/Mod/Material/Gui/Command.cpp @@ -19,10 +19,8 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp index 0c83cf8a0d..0d93272c25 100644 --- a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp +++ b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp @@ -20,12 +20,9 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include -#endif #include #include diff --git a/src/Mod/Material/Gui/DlgInspectAppearance.cpp b/src/Mod/Material/Gui/DlgInspectAppearance.cpp index 0316b5ae62..fd77be6925 100644 --- a/src/Mod/Material/Gui/DlgInspectAppearance.cpp +++ b/src/Mod/Material/Gui/DlgInspectAppearance.cpp @@ -19,11 +19,9 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/DlgInspectMaterial.cpp b/src/Mod/Material/Gui/DlgInspectMaterial.cpp index f1eb8c7537..dbbe50a933 100644 --- a/src/Mod/Material/Gui/DlgInspectMaterial.cpp +++ b/src/Mod/Material/Gui/DlgInspectMaterial.cpp @@ -19,13 +19,11 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/DlgMaterialImp.cpp b/src/Mod/Material/Gui/DlgMaterialImp.cpp index 6addf027f6..cc187c46fb 100644 --- a/src/Mod/Material/Gui/DlgMaterialImp.cpp +++ b/src/Mod/Material/Gui/DlgMaterialImp.cpp @@ -20,14 +20,11 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include #include -#endif #include #include diff --git a/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.cpp b/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.cpp index 92b4c4b9bd..86ff5f941c 100644 --- a/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.cpp +++ b/src/Mod/Material/Gui/DlgSettingsDefaultMaterial.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include diff --git a/src/Mod/Material/Gui/DlgSettingsExternal.cpp b/src/Mod/Material/Gui/DlgSettingsExternal.cpp index ecb4423e46..8d1d7f996c 100644 --- a/src/Mod/Material/Gui/DlgSettingsExternal.cpp +++ b/src/Mod/Material/Gui/DlgSettingsExternal.cpp @@ -19,10 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include diff --git a/src/Mod/Material/Gui/DlgSettingsMaterial.cpp b/src/Mod/Material/Gui/DlgSettingsMaterial.cpp index 560c4ad3d8..883c869cf9 100644 --- a/src/Mod/Material/Gui/DlgSettingsMaterial.cpp +++ b/src/Mod/Material/Gui/DlgSettingsMaterial.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include "DlgSettingsMaterial.h" #include "ui_DlgSettingsMaterial.h" diff --git a/src/Mod/Material/Gui/ImageEdit.cpp b/src/Mod/Material/Gui/ImageEdit.cpp index 5a0367b85a..bf52b36bad 100644 --- a/src/Mod/Material/Gui/ImageEdit.cpp +++ b/src/Mod/Material/Gui/ImageEdit.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -30,7 +28,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/ListDelegate.cpp b/src/Mod/Material/Gui/ListDelegate.cpp index b725216818..e5608403fd 100644 --- a/src/Mod/Material/Gui/ListDelegate.cpp +++ b/src/Mod/Material/Gui/ListDelegate.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -31,7 +29,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/ListEdit.cpp b/src/Mod/Material/Gui/ListEdit.cpp index 162cbc0710..763d2f16bd 100644 --- a/src/Mod/Material/Gui/ListEdit.cpp +++ b/src/Mod/Material/Gui/ListEdit.cpp @@ -19,11 +19,9 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif + #include diff --git a/src/Mod/Material/Gui/ListModel.cpp b/src/Mod/Material/Gui/ListModel.cpp index 19a065c389..ffbee79f79 100644 --- a/src/Mod/Material/Gui/ListModel.cpp +++ b/src/Mod/Material/Gui/ListModel.cpp @@ -19,10 +19,8 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/MaterialDelegate.cpp b/src/Mod/Material/Gui/MaterialDelegate.cpp index 397e247548..5079169c15 100644 --- a/src/Mod/Material/Gui/MaterialDelegate.cpp +++ b/src/Mod/Material/Gui/MaterialDelegate.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -33,7 +31,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/MaterialSave.cpp b/src/Mod/Material/Gui/MaterialSave.cpp index 6c360dbb37..92ebb97958 100644 --- a/src/Mod/Material/Gui/MaterialSave.cpp +++ b/src/Mod/Material/Gui/MaterialSave.cpp @@ -19,12 +19,10 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/MaterialTreeWidget.cpp b/src/Mod/Material/Gui/MaterialTreeWidget.cpp index 18b8da7e5c..02035f9157 100644 --- a/src/Mod/Material/Gui/MaterialTreeWidget.cpp +++ b/src/Mod/Material/Gui/MaterialTreeWidget.cpp @@ -19,11 +19,9 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif + #include diff --git a/src/Mod/Material/Gui/MaterialTreeWidgetPyImp.cpp b/src/Mod/Material/Gui/MaterialTreeWidgetPyImp.cpp index c985d70364..7611085626 100644 --- a/src/Mod/Material/Gui/MaterialTreeWidgetPyImp.cpp +++ b/src/Mod/Material/Gui/MaterialTreeWidgetPyImp.cpp @@ -19,7 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" #include diff --git a/src/Mod/Material/Gui/MaterialsEditor.cpp b/src/Mod/Material/Gui/MaterialsEditor.cpp index e4f63a4809..de6c02561e 100644 --- a/src/Mod/Material/Gui/MaterialsEditor.cpp +++ b/src/Mod/Material/Gui/MaterialsEditor.cpp @@ -19,8 +19,6 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include @@ -32,7 +30,7 @@ #include #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/ModelSelect.cpp b/src/Mod/Material/Gui/ModelSelect.cpp index cc4a81b575..6d2ca38437 100644 --- a/src/Mod/Material/Gui/ModelSelect.cpp +++ b/src/Mod/Material/Gui/ModelSelect.cpp @@ -19,13 +19,11 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include #include #include -#endif + #include #include diff --git a/src/Mod/Material/Gui/PreCompiled.cpp b/src/Mod/Material/Gui/PreCompiled.cpp deleted file mode 100644 index 48eade6cc8..0000000000 --- a/src/Mod/Material/Gui/PreCompiled.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2023 David Carter * - * * - * This file is part of FreeCAD. * - * * - * FreeCAD is free software: you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation, either version 2.1 of the * - * License, or (at your option) any later version. * - * * - * FreeCAD 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 * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with FreeCAD. If not, see * - * . * - * * - **************************************************************************/ - -#include "PreCompiled.h" diff --git a/src/Mod/Material/Gui/PreCompiled.h b/src/Mod/Material/Gui/PreCompiled.h index d514bb4604..9ff1775908 100644 --- a/src/Mod/Material/Gui/PreCompiled.h +++ b/src/Mod/Material/Gui/PreCompiled.h @@ -28,7 +28,6 @@ #include #endif -#ifdef _PreComp_ // standard #include @@ -49,6 +48,5 @@ # include -#endif //_PreComp_ #endif // MATGUI_PRECOMPILED_H diff --git a/src/Mod/Material/Gui/TaskMigrateExternal.cpp b/src/Mod/Material/Gui/TaskMigrateExternal.cpp index 11295e4ae1..d69150009a 100644 --- a/src/Mod/Material/Gui/TaskMigrateExternal.cpp +++ b/src/Mod/Material/Gui/TaskMigrateExternal.cpp @@ -20,10 +20,6 @@ * * ***************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include diff --git a/src/Mod/Material/Gui/TextEdit.cpp b/src/Mod/Material/Gui/TextEdit.cpp index aee64ea7b9..aa7660276e 100644 --- a/src/Mod/Material/Gui/TextEdit.cpp +++ b/src/Mod/Material/Gui/TextEdit.cpp @@ -19,11 +19,9 @@ * * **************************************************************************/ -#include "PreCompiled.h" -#ifndef _PreComp_ #include #include -#endif + #include diff --git a/src/Mod/Material/Gui/Workbench.cpp b/src/Mod/Material/Gui/Workbench.cpp index ac79812837..ac9dadc3c6 100644 --- a/src/Mod/Material/Gui/Workbench.cpp +++ b/src/Mod/Material/Gui/Workbench.cpp @@ -20,7 +20,6 @@ **************************************************************************/ -#include "PreCompiled.h" #include #include diff --git a/src/Mod/Material/Gui/WorkbenchManipulator.cpp b/src/Mod/Material/Gui/WorkbenchManipulator.cpp index 1fcdfc443f..691865b837 100644 --- a/src/Mod/Material/Gui/WorkbenchManipulator.cpp +++ b/src/Mod/Material/Gui/WorkbenchManipulator.cpp @@ -22,7 +22,6 @@ **************************************************************************/ -#include "PreCompiled.h" #include "WorkbenchManipulator.h" #include #include diff --git a/tests/src/Mod/Material/App/TestMaterialCards.cpp b/tests/src/Mod/Material/App/TestMaterialCards.cpp index a4c9c4be50..d51aa9912f 100644 --- a/tests/src/Mod/Material/App/TestMaterialCards.cpp +++ b/tests/src/Mod/Material/App/TestMaterialCards.cpp @@ -22,10 +22,6 @@ #include -#include -#ifndef _PreComp_ -#endif - #include #include diff --git a/tests/src/Mod/Material/App/TestMaterialFilter.cpp b/tests/src/Mod/Material/App/TestMaterialFilter.cpp index 568e7a134a..fdeba3e1ba 100644 --- a/tests/src/Mod/Material/App/TestMaterialFilter.cpp +++ b/tests/src/Mod/Material/App/TestMaterialFilter.cpp @@ -22,10 +22,6 @@ #include "gtest/gtest.h" -#include -#ifndef _PreComp_ -#endif - #include #include diff --git a/tests/src/Mod/Material/App/TestMaterialProperties.cpp b/tests/src/Mod/Material/App/TestMaterialProperties.cpp index 6fd60c6709..63dfe33cd7 100644 --- a/tests/src/Mod/Material/App/TestMaterialProperties.cpp +++ b/tests/src/Mod/Material/App/TestMaterialProperties.cpp @@ -22,10 +22,6 @@ #include -#include -#ifndef _PreComp_ -#endif - #include #include diff --git a/tests/src/Mod/Material/App/TestMaterialValue.cpp b/tests/src/Mod/Material/App/TestMaterialValue.cpp index 9a6cbe79ef..8978993c15 100644 --- a/tests/src/Mod/Material/App/TestMaterialValue.cpp +++ b/tests/src/Mod/Material/App/TestMaterialValue.cpp @@ -22,10 +22,6 @@ #include -#include -#ifndef _PreComp_ -#endif - #include #include diff --git a/tests/src/Mod/Material/App/TestMaterials.cpp b/tests/src/Mod/Material/App/TestMaterials.cpp index 7c3b31a6cf..f29b6b1c6b 100644 --- a/tests/src/Mod/Material/App/TestMaterials.cpp +++ b/tests/src/Mod/Material/App/TestMaterials.cpp @@ -22,10 +22,6 @@ #include -#include -#ifndef _PreComp_ -#endif - #include #include #include diff --git a/tests/src/Mod/Material/App/TestModel.cpp b/tests/src/Mod/Material/App/TestModel.cpp index dde62d476d..e2de2e3733 100644 --- a/tests/src/Mod/Material/App/TestModel.cpp +++ b/tests/src/Mod/Material/App/TestModel.cpp @@ -22,10 +22,6 @@ #include -#include -#ifndef _PreComp_ -#endif - #include #include diff --git a/tests/src/Mod/Material/App/TestModelProperties.cpp b/tests/src/Mod/Material/App/TestModelProperties.cpp index 59fab7a253..05ae6f33a8 100644 --- a/tests/src/Mod/Material/App/TestModelProperties.cpp +++ b/tests/src/Mod/Material/App/TestModelProperties.cpp @@ -22,10 +22,6 @@ #include -#include -#ifndef _PreComp_ -#endif - #include #include