From db8729ec742d838d2f01a0aeeb97ee2f1768ffa8 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sat, 1 Oct 2022 05:14:05 +0200
Subject: [PATCH] StringHasher: sanitize includes

- try to fix CI warning "Found C system header after other header."
- remove unneeded includes
- sort includes
---
 src/App/StringHasher.cpp | 39 +++++++++++++++++----------------------
 src/App/StringHasher.h   |  7 ++++---
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/App/StringHasher.cpp b/src/App/StringHasher.cpp
index a39f433ec2..0b2ade7f89 100644
--- a/src/App/StringHasher.cpp
+++ b/src/App/StringHasher.cpp
@@ -20,33 +20,28 @@
  *                                                                          *
  ****************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include <deque>
-#include <boost/io/ios_state.hpp>
-#include <boost/iostreams/device/array.hpp>
-#include <boost/iostreams/stream.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/bimap.hpp>
-#include <boost/bimap/unordered_set_of.hpp>
-#include <boost/bimap/set_of.hpp>
-#include <QHash>
 #include <QCryptographicHash>
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/Writer.h>
+#include <QHash>
+
 #include <Base/Reader.h>
-#include <App/StringHasher.h>
-#include <App/StringHasherPy.h>
-#include <App/StringIDPy.h>
-#include <App/MappedElement.h>
-#include <App/DocumentParams.h>
+#include <Base/Writer.h>
+
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/bimap.hpp>
+#include <boost/bimap/set_of.hpp>
+#include <boost/bimap/unordered_set_of.hpp>
+#include <boost/iostreams/stream.hpp>
+
+#include "StringHasher.h"
+#include "StringHasherPy.h"
+#include "DocumentParams.h"
+#include "MappedElement.h"
+#include "StringIDPy.h"
+
 
 FC_LOG_LEVEL_INIT("App",true,true)
 
diff --git a/src/App/StringHasher.h b/src/App/StringHasher.h
index d601d2deaa..e68babfb5a 100644
--- a/src/App/StringHasher.h
+++ b/src/App/StringHasher.h
@@ -23,16 +23,17 @@
 #ifndef APP_STRINGID_H
 #define APP_STRINGID_H
 
-#include <memory>
 #include <bitset>
+#include <memory>
 
 #include <QByteArray>
 #include <QVector>
 
-#include <CXX/Objects.hxx>
+#include <Base/Bitmask.h>
 #include <Base/Handle.h>
 #include <Base/Persistence.h>
-#include <Base/Bitmask.h>
+#include <CXX/Objects.hxx>
+
 
 namespace Data{
 class MappedName;