From 686a025416562405133cf5ddcdf8659953c67948 Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 28 Feb 2022 01:09:13 +0100 Subject: [PATCH] [Base] Quantity, Rotation, Stream: remove unused includes --- src/Base/Quantity.cpp | 3 --- src/Base/QuantityPyImp.cpp | 4 +--- src/Base/Rotation.cpp | 8 +++----- src/Base/RotationPyImp.cpp | 6 +++--- src/Base/Sequencer.cpp | 5 +---- src/Base/Sequencer.h | 2 +- src/Base/StackWalker.cpp | 4 +++- src/Base/StackWalker.h | 4 +--- src/Base/Stream.cpp | 6 +----- src/Base/Stream.h | 4 +--- 10 files changed, 15 insertions(+), 31 deletions(-) diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp index 66b7f2f768..9b8fe17663 100644 --- a/src/Base/Quantity.cpp +++ b/src/Base/Quantity.cpp @@ -22,17 +22,14 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include # ifdef FC_OS_WIN32 # define _USE_MATH_DEFINES # endif // FC_OS_WIN32 -# include #endif #include "Quantity.h" #include "Exception.h" #include "UnitsApi.h" -#include "Console.h" #include /** \defgroup Units Units system diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp index 5b8cd31381..a4354fe2ce 100644 --- a/src/Base/QuantityPyImp.cpp +++ b/src/Base/QuantityPyImp.cpp @@ -22,14 +22,12 @@ #include "PreCompiled.h" -#include "Base/Quantity.h" -#include "Base/Vector3D.h" - // inclusion of the generated files (generated out of QuantityPy.xml) #include "QuantityPy.h" #include "UnitPy.h" #include "QuantityPy.cpp" + using namespace Base; // returns a string which represents the object e.g. when printed in python diff --git a/src/Base/Rotation.cpp b/src/Base/Rotation.cpp index 7c1aedc2e2..a3bb128e8b 100644 --- a/src/Base/Rotation.cpp +++ b/src/Base/Rotation.cpp @@ -22,15 +22,13 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -# include -#endif #include +#include "Base/Exception.h" + #include "Rotation.h" #include "Matrix.h" -#include "Base/Exception.h" + using namespace Base; diff --git a/src/Base/RotationPyImp.cpp b/src/Base/RotationPyImp.cpp index ea467a678b..4ad979aeef 100644 --- a/src/Base/RotationPyImp.cpp +++ b/src/Base/RotationPyImp.cpp @@ -23,14 +23,14 @@ #include "PreCompiled.h" -#include -#include #include +#include // inclusion of the generated files (generated out of RotationPy.xml) -#include "VectorPy.h" #include "RotationPy.h" #include "RotationPy.cpp" +#include "VectorPy.h" + using namespace Base; diff --git a/src/Base/Sequencer.cpp b/src/Base/Sequencer.cpp index fec662f41d..5bfae5b28e 100644 --- a/src/Base/Sequencer.cpp +++ b/src/Base/Sequencer.cpp @@ -24,15 +24,12 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include # include # include #endif #include "Sequencer.h" -#include "Console.h" -#include + using namespace Base; diff --git a/src/Base/Sequencer.h b/src/Base/Sequencer.h index 2ca2899444..d60040e516 100644 --- a/src/Base/Sequencer.h +++ b/src/Base/Sequencer.h @@ -24,12 +24,12 @@ #ifndef BASE_SEQUENCER_H #define BASE_SEQUENCER_H -#include #include #include #include "Exception.h" + namespace Base { diff --git a/src/Base/StackWalker.cpp b/src/Base/StackWalker.cpp index 64712ff401..b713be014a 100644 --- a/src/Base/StackWalker.cpp +++ b/src/Base/StackWalker.cpp @@ -79,11 +79,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * **********************************************************************/ + #include + #include #include #include -#include + #pragma comment(lib, "version.lib") // for "VerQueryValue" #pragma warning(disable:4826) diff --git a/src/Base/StackWalker.h b/src/Base/StackWalker.h index 6e80971dc5..92efba154a 100644 --- a/src/Base/StackWalker.h +++ b/src/Base/StackWalker.h @@ -32,11 +32,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * **********************************************************************/ -// #pragma once is supported starting with _MCS_VER 1000, -// so we need not to check the version (because we only support _MSC_VER >= 1100)! + #pragma once -#include #ifndef FC_GLOBAL_H #include #endif diff --git a/src/Base/Stream.cpp b/src/Base/Stream.cpp index 1d55cfff53..8c7b94b6b0 100644 --- a/src/Base/Stream.cpp +++ b/src/Base/Stream.cpp @@ -26,11 +26,7 @@ #ifndef _PreComp_ # include # include -# include # include -# include -# include -# include # include #ifdef __GNUC__ # include @@ -40,7 +36,7 @@ #include "Stream.h" #include "Swap.h" #include -#include + using namespace Base; diff --git a/src/Base/Stream.h b/src/Base/Stream.h index b68edd4641..399a555a71 100644 --- a/src/Base/Stream.h +++ b/src/Base/Stream.h @@ -24,19 +24,17 @@ #ifndef BASE_STREAM_H #define BASE_STREAM_H - #ifdef __GNUC__ # include #endif #include -#include #include -#include #include #include #include "FileInfo.h" + class QByteArray; class QIODevice; class QBuffer;