From b264408d853304301c8a68cb29af87a3974120e4 Mon Sep 17 00:00:00 2001
From: Dirk Olbrich <github@dirkolbrich.de>
Date: Tue, 24 Oct 2023 11:47:44 +0200
Subject: [PATCH] ifcparse: fix clang-tidy warnung unused-includes

---
 src/ifcparse/Argument.h              | 3 ---
 src/ifcparse/IfcCharacterDecoder.h   | 1 -
 src/ifcparse/IfcEntityInstanceData.h | 1 -
 src/ifcparse/IfcFile.h               | 1 -
 src/ifcparse/IfcGlobalId.cpp         | 2 --
 src/ifcparse/IfcHierarchyHelper.h    | 1 +
 src/ifcparse/IfcLogger.cpp           | 1 -
 src/ifcparse/IfcLogger.h             | 3 ---
 src/ifcparse/IfcParse.cpp            | 1 +
 src/ifcparse/IfcParse.h              | 5 -----
 src/ifcparse/IfcSIPrefix.h           | 3 ++-
 src/ifcparse/IfcSchema.cpp           | 4 ++--
 src/ifcparse/IfcSpfHeader.cpp        | 1 +
 src/ifcparse/IfcSpfHeader.h          | 1 -
 src/ifcparse/IfcSpfStream.h          | 1 -
 src/ifcparse/IfcUtil.cpp             | 1 -
 src/ifcparse/IfcWrite.cpp            | 2 --
 src/ifcparse/IfcWrite.h              | 3 +--
 src/ifcparse/parse_ifcxml.cpp        | 1 +
 19 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/ifcparse/Argument.h b/src/ifcparse/Argument.h
index 0b60c9b312..c296c59b39 100644
--- a/src/ifcparse/Argument.h
+++ b/src/ifcparse/Argument.h
@@ -23,12 +23,9 @@
 #include "ArgumentType.h"
 #include "ifc_parse_api.h"
 
-#include <algorithm>
 #include <boost/dynamic_bitset.hpp>
 #include <boost/logic/tribool.hpp>
 #include <boost/shared_ptr.hpp>
-#include <set>
-#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/src/ifcparse/IfcCharacterDecoder.h b/src/ifcparse/IfcCharacterDecoder.h
index a21a6e0171..5c31f63b8c 100644
--- a/src/ifcparse/IfcCharacterDecoder.h
+++ b/src/ifcparse/IfcCharacterDecoder.h
@@ -29,7 +29,6 @@
 
 #include "IfcSpfStream.h"
 
-#include <sstream>
 #include <string>
 
 namespace IfcUtil {
diff --git a/src/ifcparse/IfcEntityInstanceData.h b/src/ifcparse/IfcEntityInstanceData.h
index ae65c3f49e..095f702191 100644
--- a/src/ifcparse/IfcEntityInstanceData.h
+++ b/src/ifcparse/IfcEntityInstanceData.h
@@ -24,7 +24,6 @@
 
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-#include <vector>
 
 class Argument;
 class aggregate_of_instance;
diff --git a/src/ifcparse/IfcFile.h b/src/ifcparse/IfcFile.h
index 679bce3f35..680d5bc615 100644
--- a/src/ifcparse/IfcFile.h
+++ b/src/ifcparse/IfcFile.h
@@ -32,7 +32,6 @@
 #include <boost/unordered_map.hpp>
 #include <iterator>
 #include <map>
-#include <set>
 
 namespace IfcParse {
 
diff --git a/src/ifcparse/IfcGlobalId.cpp b/src/ifcparse/IfcGlobalId.cpp
index 697dc40363..8b613d6a7d 100644
--- a/src/ifcparse/IfcGlobalId.cpp
+++ b/src/ifcparse/IfcGlobalId.cpp
@@ -19,9 +19,7 @@
 
 #include "IfcGlobalId.h"
 
-#include "IfcBaseClass.h"
 #include "IfcException.h"
-#include "IfcLogger.h"
 
 #include <algorithm>
 #include <boost/lexical_cast.hpp>
diff --git a/src/ifcparse/IfcHierarchyHelper.h b/src/ifcparse/IfcHierarchyHelper.h
index 9472769212..1357d12627 100644
--- a/src/ifcparse/IfcHierarchyHelper.h
+++ b/src/ifcparse/IfcHierarchyHelper.h
@@ -29,6 +29,7 @@
 #define IFCHIERARCHYHELPER_H
 
 #include "ifc_parse_api.h"
+#include "IfcLogger.h"
 
 #include <map>
 
diff --git a/src/ifcparse/IfcLogger.cpp b/src/ifcparse/IfcLogger.cpp
index 03fde3dde2..06f8dd07da 100644
--- a/src/ifcparse/IfcLogger.cpp
+++ b/src/ifcparse/IfcLogger.cpp
@@ -20,7 +20,6 @@
 #include "IfcLogger.h"
 
 #include "Argument.h"
-#include "IfcException.h"
 
 #include <algorithm>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/src/ifcparse/IfcLogger.h b/src/ifcparse/IfcLogger.h
index f7f0dec73b..f183a8f9e7 100644
--- a/src/ifcparse/IfcLogger.h
+++ b/src/ifcparse/IfcLogger.h
@@ -23,15 +23,12 @@
 #include "ifc_parse_api.h"
 #include "IfcBaseClass.h"
 
-#include <algorithm>
 #include <boost/optional.hpp>
 #include <boost/scope_exit.hpp>
 #include <exception>
 #include <map>
-#include <set>
 #include <sstream>
 #include <string>
-#include <vector>
 
 class IFC_PARSE_API Logger {
   public:
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
index 261f7ed0af..b71c499fa9 100644
--- a/src/ifcparse/IfcParse.cpp
+++ b/src/ifcparse/IfcParse.cpp
@@ -23,6 +23,7 @@
 #include "IfcCharacterDecoder.h"
 #include "IfcException.h"
 #include "IfcFile.h"
+#include "IfcLogger.h"
 #include "IfcSchema.h"
 #include "IfcSIPrefix.h"
 #include "IfcSpfStream.h"
diff --git a/src/ifcparse/IfcParse.h b/src/ifcparse/IfcParse.h
index 137dbe2606..cf08648167 100644
--- a/src/ifcparse/IfcParse.h
+++ b/src/ifcparse/IfcParse.h
@@ -38,17 +38,12 @@
 #include "ifc_parse_api.h"
 #include "IfcBaseClass.h"
 #include "IfcCharacterDecoder.h"
-#include "IfcLogger.h"
 #include "IfcSpfStream.h"
-#include "macros.h"
 
 #include <boost/dynamic_bitset.hpp>
 #include <boost/shared_ptr.hpp>
 #include <cstring>
-#include <fstream>
 #include <iostream>
-#include <map>
-#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/src/ifcparse/IfcSIPrefix.h b/src/ifcparse/IfcSIPrefix.h
index 2285d61661..f790b1cd5f 100644
--- a/src/ifcparse/IfcSIPrefix.h
+++ b/src/ifcparse/IfcSIPrefix.h
@@ -21,7 +21,8 @@
 #define IFCSIPREFIX
 
 #include "ifc_parse_api.h"
-#include "IfcParse.h"
+
+#include <string>
 
 namespace IfcParse {
 IFC_PARSE_API double IfcSIPrefixToValue(const std::string& prefix);
diff --git a/src/ifcparse/IfcSchema.cpp b/src/ifcparse/IfcSchema.cpp
index ad22761c54..40c46bbf3d 100644
--- a/src/ifcparse/IfcSchema.cpp
+++ b/src/ifcparse/IfcSchema.cpp
@@ -21,6 +21,8 @@
 
 #include "IfcBaseClass.h"
 
+#include <map>
+
 #ifdef HAS_SCHEMA_2x3
 #include "Ifc2x3.h"
 #endif
@@ -58,8 +60,6 @@
 #include "Ifc4x3_add2.h"
 #endif
 
-#include <map>
-
 bool IfcParse::declaration::is(const std::string& name) const {
     const std::string* name_ptr = &name;
     if (std::any_of(name.begin(), name.end(), [](char c) { return std::islower(c); })) {
diff --git a/src/ifcparse/IfcSpfHeader.cpp b/src/ifcparse/IfcSpfHeader.cpp
index 78749101c6..019bfc539e 100644
--- a/src/ifcparse/IfcSpfHeader.cpp
+++ b/src/ifcparse/IfcSpfHeader.cpp
@@ -20,6 +20,7 @@
 #include "IfcSpfHeader.h"
 
 #include "IfcFile.h"
+#include "IfcLogger.h"
 
 static const char* const ISO_10303_21 = "ISO-10303-21";
 static const char* const HEADER = "HEADER";
diff --git a/src/ifcparse/IfcSpfHeader.h b/src/ifcparse/IfcSpfHeader.h
index 8c26c8d2b2..ccb8891267 100644
--- a/src/ifcparse/IfcSpfHeader.h
+++ b/src/ifcparse/IfcSpfHeader.h
@@ -21,7 +21,6 @@
 #define IFCSPFHEADER_H
 
 #include "ifc_parse_api.h"
-#include "IfcSpfStream.h"
 #include "IfcWrite.h"
 
 namespace IfcParse {
diff --git a/src/ifcparse/IfcSpfStream.h b/src/ifcparse/IfcSpfStream.h
index d049cfc305..4bc269092c 100644
--- a/src/ifcparse/IfcSpfStream.h
+++ b/src/ifcparse/IfcSpfStream.h
@@ -29,7 +29,6 @@
 
 #include "ifc_parse_api.h"
 
-#include <fstream>
 #include <string>
 
 #ifdef USE_MMAP
diff --git a/src/ifcparse/IfcUtil.cpp b/src/ifcparse/IfcUtil.cpp
index 64e9582ae1..41fdae812c 100644
--- a/src/ifcparse/IfcUtil.cpp
+++ b/src/ifcparse/IfcUtil.cpp
@@ -60,7 +60,6 @@
 #include <algorithm>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/optional.hpp>
-#include <iostream>
 
 void aggregate_of_instance::push(IfcUtil::IfcBaseClass* l) {
     if (l) {
diff --git a/src/ifcparse/IfcWrite.cpp b/src/ifcparse/IfcWrite.cpp
index c92581f965..3796edf8ad 100644
--- a/src/ifcparse/IfcWrite.cpp
+++ b/src/ifcparse/IfcWrite.cpp
@@ -20,8 +20,6 @@
 #include "IfcWrite.h"
 
 #include "IfcCharacterDecoder.h"
-#include "IfcFile.h"
-#include "IfcParse.h"
 
 #include <boost/algorithm/string.hpp>
 #include <iomanip>
diff --git a/src/ifcparse/IfcWrite.h b/src/ifcparse/IfcWrite.h
index 7be4ada1af..b25f2eb5b2 100644
--- a/src/ifcparse/IfcWrite.h
+++ b/src/ifcparse/IfcWrite.h
@@ -28,9 +28,9 @@
 #ifndef IFCWRITE_H
 #define IFCWRITE_H
 
+#include "aggregate_of_instance.h"
 #include "ifc_parse_api.h"
 #include "IfcBaseClass.h"
-#include "IfcParse.h"
 
 #include <boost/dynamic_bitset.hpp>
 #include <boost/optional.hpp>
@@ -38,7 +38,6 @@
 #include <boost/type_traits/remove_pointer.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/variant.hpp>
-// #include <boost/logic/tribool.hpp>
 
 namespace IfcWrite {
 
diff --git a/src/ifcparse/parse_ifcxml.cpp b/src/ifcparse/parse_ifcxml.cpp
index a12c3640ad..e943ccbb1a 100644
--- a/src/ifcparse/parse_ifcxml.cpp
+++ b/src/ifcparse/parse_ifcxml.cpp
@@ -22,6 +22,7 @@
 #ifdef WITH_IFCXML
 
 #include "IfcFile.h"
+#include "IfcLogger.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/transformed.hpp>