From 55dc4f33a77b6cb3cbbc1bea84262df8724782a7 Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 21 Mar 2022 18:16:56 +0100 Subject: [PATCH] [JtReader] remove unused includes - also sort some headers out to PreCompiled.h --- src/Mod/JtReader/App/AppJtReaderPy.cpp | 10 +++------- src/Mod/JtReader/App/FcLodHandler.cpp | 7 ------- src/Mod/JtReader/App/JrJt/JtReader.cpp | 15 ++++++--------- src/Mod/JtReader/App/JtReader.cpp | 11 +++++++---- src/Mod/JtReader/App/PreCompiled.h | 6 +++++- src/Mod/JtReader/App/TestJtReader.cpp | 5 +---- 6 files changed, 22 insertions(+), 32 deletions(-) diff --git a/src/Mod/JtReader/App/AppJtReaderPy.cpp b/src/Mod/JtReader/App/AppJtReaderPy.cpp index 025ffa45c9..53ac9056a5 100644 --- a/src/Mod/JtReader/App/AppJtReaderPy.cpp +++ b/src/Mod/JtReader/App/AppJtReaderPy.cpp @@ -22,24 +22,20 @@ #include "PreCompiled.h" +#include +#include #include #include #include - -#include -#include - #include -#include #include -#include #include "TestJtReader.h" + using std::vector; using namespace MeshCore; - //using namespace JtReader; /* module functions */ diff --git a/src/Mod/JtReader/App/FcLodHandler.cpp b/src/Mod/JtReader/App/FcLodHandler.cpp index 268107012f..4a03139969 100644 --- a/src/Mod/JtReader/App/FcLodHandler.cpp +++ b/src/Mod/JtReader/App/FcLodHandler.cpp @@ -20,20 +20,13 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif #include #include "FcLodHandler.h" - - - - void FcLodHandler::startLod() { Base::Console().Log("FcLodHandler::startLod()"); diff --git a/src/Mod/JtReader/App/JrJt/JtReader.cpp b/src/Mod/JtReader/App/JrJt/JtReader.cpp index e65519bfbc..0161924646 100644 --- a/src/Mod/JtReader/App/JrJt/JtReader.cpp +++ b/src/Mod/JtReader/App/JrJt/JtReader.cpp @@ -1,20 +1,17 @@ #include "JtReader.h" -#include -#include -#include #include -#include +#include +#include +#include - -#include "TOC_Entry.h" #include "GUID.h" -#include "UChar.h" #include "I32.h" -#include "TOC_Entry.h" #include "LodHandler.h" -#include "Segment_Header.h" #include "Element_Header.h" +#include "Segment_Header.h" +#include "TOC_Entry.h" +#include "UChar.h" using namespace std; diff --git a/src/Mod/JtReader/App/JtReader.cpp b/src/Mod/JtReader/App/JtReader.cpp index 502b1e41c5..70e2df2c9f 100644 --- a/src/Mod/JtReader/App/JtReader.cpp +++ b/src/Mod/JtReader/App/JtReader.cpp @@ -3,16 +3,19 @@ * LGPL * ***************************************************************************/ -#include +#include "PreCompiled.h" +#ifndef _PreComp_ #include #include #include +#include +#endif + #include #include -#include #include -#include -#include +#include + using std::string; using std::vector; diff --git a/src/Mod/JtReader/App/PreCompiled.h b/src/Mod/JtReader/App/PreCompiled.h index 150201e5a1..7b5664a1ed 100644 --- a/src/Mod/JtReader/App/PreCompiled.h +++ b/src/Mod/JtReader/App/PreCompiled.h @@ -36,6 +36,7 @@ // STL #include +#include #include #include #include @@ -44,8 +45,11 @@ #include #include #include +#include #include -#include + +// sys +#include #endif //_PreComp_ diff --git a/src/Mod/JtReader/App/TestJtReader.cpp b/src/Mod/JtReader/App/TestJtReader.cpp index 3e65377db2..d81f428219 100644 --- a/src/Mod/JtReader/App/TestJtReader.cpp +++ b/src/Mod/JtReader/App/TestJtReader.cpp @@ -22,12 +22,9 @@ #include "PreCompiled.h" #ifndef _PreComp_ +#include #endif - -#include -#include - #include #include