From 4531349539ec0c5b18ae54e16d493835eccd35df Mon Sep 17 00:00:00 2001 From: Uwe Date: Wed, 14 Dec 2022 03:56:01 +0100 Subject: [PATCH] [Test] enable precompiled headers - also remove unused headers --- src/Mod/Test/Gui/AppTestGui.cpp | 9 +++++---- src/Mod/Test/Gui/CMakeLists.txt | 6 ++++++ src/Mod/Test/Gui/PreCompiled.cpp | 1 - src/Mod/Test/Gui/PreCompiled.h | 28 +++------------------------- src/Mod/Test/Gui/UnitTestImp.cpp | 6 +----- src/Mod/Test/Gui/UnitTestPy.cpp | 3 --- 6 files changed, 15 insertions(+), 38 deletions(-) diff --git a/src/Mod/Test/Gui/AppTestGui.cpp b/src/Mod/Test/Gui/AppTestGui.cpp index fe65b5b73f..37a24992ec 100644 --- a/src/Mod/Test/Gui/AppTestGui.cpp +++ b/src/Mod/Test/Gui/AppTestGui.cpp @@ -22,13 +22,14 @@ #include "PreCompiled.h" -#include "UnitTestPy.h" -#include "UnitTestImp.h" - -#include #include #include #include +#include + +#include "UnitTestImp.h" +#include "UnitTestPy.h" + class ILoggerBlockerTest : public Base::ILogger { diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt index 2166f03f09..48d972d1f1 100644 --- a/src/Mod/Test/Gui/CMakeLists.txt +++ b/src/Mod/Test/Gui/CMakeLists.txt @@ -47,6 +47,12 @@ SET(TestGuiIcon_SVG Resources/icons/TestWorkbench.svg ) +if(FREECAD_USE_PCH) + add_definitions(-D_PreComp_) + GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${TestGui_SRCS}) + ADD_MSVC_PRECOMPILED_HEADER(QtUnitGui PreCompiled.h PreCompiled.cpp PCH_SRCS) +endif(FREECAD_USE_PCH) + add_library(QtUnitGui SHARED ${TestGui_SRCS} ${TestGuiPy_SRCS} ${TestGuiIcon_SVG}) target_link_libraries(QtUnitGui ${TestGui_LIBS}) diff --git a/src/Mod/Test/Gui/PreCompiled.cpp b/src/Mod/Test/Gui/PreCompiled.cpp index 285f33c03f..01419be663 100644 --- a/src/Mod/Test/Gui/PreCompiled.cpp +++ b/src/Mod/Test/Gui/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Test/Gui/PreCompiled.h b/src/Mod/Test/Gui/PreCompiled.h index 0120e431d8..8e0550904d 100644 --- a/src/Mod/Test/Gui/PreCompiled.h +++ b/src/Mod/Test/Gui/PreCompiled.h @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #ifndef __PRECOMPILED_GUI__ #define __PRECOMPILED_GUI__ @@ -35,31 +34,10 @@ # pragma warning( disable : 4786 ) // specifier longer then 255 chars #endif -// standard -#include -#include - -// STL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef FC_OS_WIN32 -# include -#endif - // Qt Toolkit -#ifndef __QtAll__ -# include -#endif +#include +#include +#include #endif //_PreComp_ diff --git a/src/Mod/Test/Gui/UnitTestImp.cpp b/src/Mod/Test/Gui/UnitTestImp.cpp index 7c95cb39bf..e2e8919509 100644 --- a/src/Mod/Test/Gui/UnitTestImp.cpp +++ b/src/Mod/Test/Gui/UnitTestImp.cpp @@ -20,24 +20,20 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include -# include #endif -#include #include #include + #include "UnitTestImp.h" #include "ui_UnitTest.h" -#include "UnitTestPy.h" using namespace TestGui; - /* TRANSLATOR TestGui::UnitTestDialog */ UnitTestDialog* UnitTestDialog::_instance=nullptr; diff --git a/src/Mod/Test/Gui/UnitTestPy.cpp b/src/Mod/Test/Gui/UnitTestPy.cpp index 81d7750667..2fc55515dc 100644 --- a/src/Mod/Test/Gui/UnitTestPy.cpp +++ b/src/Mod/Test/Gui/UnitTestPy.cpp @@ -20,16 +20,13 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include # include #endif -#include #include -#include #include "UnitTestPy.h" #include "UnitTestImp.h"