From cd5c46ba183310e4c661569c23d178640c64ae5f Mon Sep 17 00:00:00 2001 From: Andrea Date: Mon, 10 Mar 2025 21:52:48 +0100 Subject: [PATCH 1/2] Remove unnecessary check (duplicated) before including the library, it is uselessly checked if the variable __QtAll__ and __InventorAll__ have been defined. The same check is performed again once the library is included --- src/Mod/Assembly/Gui/PreCompiled.h | 4 ---- src/Mod/Cloud/Gui/PreCompiled.h | 2 -- src/Mod/Import/Gui/PreCompiled.h | 2 -- src/Mod/Material/Gui/PreCompiled.h | 7 +------ src/Mod/Measure/Gui/PreCompiled.h | 4 ---- src/Mod/Mesh/Gui/Command.cpp | 4 +--- src/Mod/Mesh/Gui/PreCompiled.h | 6 +----- src/Mod/Part/Gui/PreCompiled.h | 4 ---- src/Mod/PartDesign/Gui/PreCompiled.h | 4 ---- src/Mod/Sketcher/Gui/PreCompiled.h | 4 ---- src/Mod/Spreadsheet/Gui/PreCompiled.h | 2 -- src/Tools/_TEMPLATE_/Gui/PreCompiled.h | 2 -- 12 files changed, 3 insertions(+), 42 deletions(-) diff --git a/src/Mod/Assembly/Gui/PreCompiled.h b/src/Mod/Assembly/Gui/PreCompiled.h index 62ee8128b2..59d045527d 100644 --- a/src/Mod/Assembly/Gui/PreCompiled.h +++ b/src/Mod/Assembly/Gui/PreCompiled.h @@ -41,16 +41,12 @@ #include // Qt -#ifndef __QtAll__ #include -#endif #include // all of Inventor -#ifndef __InventorAll__ #include -#endif #endif //_PreComp_ diff --git a/src/Mod/Cloud/Gui/PreCompiled.h b/src/Mod/Cloud/Gui/PreCompiled.h index 55f8d2ee92..e4ac1e867d 100644 --- a/src/Mod/Cloud/Gui/PreCompiled.h +++ b/src/Mod/Cloud/Gui/PreCompiled.h @@ -58,9 +58,7 @@ #endif // Qt Toolkit -#ifndef __QtAll__ #include -#endif #endif //_PreComp_ diff --git a/src/Mod/Import/Gui/PreCompiled.h b/src/Mod/Import/Gui/PreCompiled.h index 854f2d6324..ea56537c6e 100644 --- a/src/Mod/Import/Gui/PreCompiled.h +++ b/src/Mod/Import/Gui/PreCompiled.h @@ -89,9 +89,7 @@ #endif // Qt Toolkit -#ifndef __QtAll__ #include -#endif #endif //_PreComp_ diff --git a/src/Mod/Material/Gui/PreCompiled.h b/src/Mod/Material/Gui/PreCompiled.h index 2b1db3466b..85b68f8801 100644 --- a/src/Mod/Material/Gui/PreCompiled.h +++ b/src/Mod/Material/Gui/PreCompiled.h @@ -53,18 +53,13 @@ #include #include -// OpenCasCade -// #include // Qt Toolkit -#ifndef __QtAll__ #include -#endif // Inventor includes OpenGL -#ifndef __InventorAll__ # include -#endif + #endif //_PreComp_ diff --git a/src/Mod/Measure/Gui/PreCompiled.h b/src/Mod/Measure/Gui/PreCompiled.h index 49d4ca833c..a2a4065edf 100644 --- a/src/Mod/Measure/Gui/PreCompiled.h +++ b/src/Mod/Measure/Gui/PreCompiled.h @@ -82,14 +82,10 @@ #include // Qt Toolkit -#ifndef __QtAll__ #include -#endif // Inventor includes OpenGL -#ifndef __InventorAll__ #include -#endif #endif //_PreComp_ diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp index f014aa55c5..25ac6603a3 100644 --- a/src/Mod/Mesh/Gui/Command.cpp +++ b/src/Mod/Mesh/Gui/Command.cpp @@ -23,7 +23,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ #ifdef FC_OS_WIN32 -#include +# include #endif #include @@ -35,9 +35,7 @@ #include #endif -#ifndef __InventorAll__ #include -#endif #include #include diff --git a/src/Mod/Mesh/Gui/PreCompiled.h b/src/Mod/Mesh/Gui/PreCompiled.h index 57b27a3171..de6bf994a1 100644 --- a/src/Mod/Mesh/Gui/PreCompiled.h +++ b/src/Mod/Mesh/Gui/PreCompiled.h @@ -52,14 +52,10 @@ #include // Qt Toolkit -#ifndef __QtAll__ #include -#endif // Inventor -#ifndef __InventorAll__ -#include -#endif + #elif defined(FC_OS_WIN32) #ifndef NOMINMAX diff --git a/src/Mod/Part/Gui/PreCompiled.h b/src/Mod/Part/Gui/PreCompiled.h index 4758d16e94..2f667b09ab 100644 --- a/src/Mod/Part/Gui/PreCompiled.h +++ b/src/Mod/Part/Gui/PreCompiled.h @@ -83,14 +83,10 @@ #include // Qt Toolkit -#ifndef __QtAll__ # include -#endif // Inventor includes OpenGL -#ifndef __InventorAll__ # include -#endif #endif //_PreComp_ diff --git a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h index 99ed7a3261..20cba24151 100644 --- a/src/Mod/PartDesign/Gui/PreCompiled.h +++ b/src/Mod/PartDesign/Gui/PreCompiled.h @@ -56,14 +56,10 @@ #include // Qt -#ifndef __QtAll__ # include -#endif // Inventor -#ifndef __InventorAll__ # include -#endif #endif // _PreComp_ #endif // __PRECOMPILED_GUI__ diff --git a/src/Mod/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h index 28ff06cedf..8d2c1892ce 100644 --- a/src/Mod/Sketcher/Gui/PreCompiled.h +++ b/src/Mod/Sketcher/Gui/PreCompiled.h @@ -71,16 +71,12 @@ #include // Qt -#ifndef __QtAll__ #include -#endif #include // all of Inventor -#ifndef __InventorAll__ #include -#endif #endif //_PreComp_ diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.h b/src/Mod/Spreadsheet/Gui/PreCompiled.h index 3d83053a37..2166289b3f 100644 --- a/src/Mod/Spreadsheet/Gui/PreCompiled.h +++ b/src/Mod/Spreadsheet/Gui/PreCompiled.h @@ -47,9 +47,7 @@ #endif // Qt Toolkit -#ifndef __QtAll__ #include -#endif #endif //_PreComp_ diff --git a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h index 46cef8ca92..1feab1e177 100644 --- a/src/Tools/_TEMPLATE_/Gui/PreCompiled.h +++ b/src/Tools/_TEMPLATE_/Gui/PreCompiled.h @@ -61,9 +61,7 @@ #endif // Qt Toolkit -#ifndef __QtAll__ #include -#endif #endif //_PreComp_ From af8dd75185d3ffea51ed9e6c4288fb298200620b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 20:58:52 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/Mod/Mesh/Gui/Command.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp index 25ac6603a3..6411e6ac8d 100644 --- a/src/Mod/Mesh/Gui/Command.cpp +++ b/src/Mod/Mesh/Gui/Command.cpp @@ -23,7 +23,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ #ifdef FC_OS_WIN32 -# include +#include #endif #include