refactor: use correct header include order

2024-04-24 20:20:29 +02:00
parent 1c72f1ce52
commit 4721060d76
23 changed files with 135 additions and 106 deletions
@@ -27,16 +27,17 @@
 #ifndef SDBUS_CXX_CONVENIENCEAPICLASSES_H_
 #define SDBUS_CXX_CONVENIENCEAPICLASSES_H_

-#include <sdbus-c++/VTableItems.h>
 #include <sdbus-c++/Message.h>
 #include <sdbus-c++/TypeTraits.h>
 #include <sdbus-c++/Types.h>
+#include <sdbus-c++/VTableItems.h>
+
+#include <chrono>
+#include <cstdint>
+#include <future>
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
-#include <chrono>
-#include <future>
-#include <cstdint>

 // Forward declarations
 namespace sdbus {
@@ -27,18 +27,19 @@
 #ifndef SDBUS_CPP_CONVENIENCEAPICLASSES_INL_
 #define SDBUS_CPP_CONVENIENCEAPICLASSES_INL_

+#include <sdbus-c++/Error.h>
 #include <sdbus-c++/IObject.h>
 #include <sdbus-c++/IProxy.h>
 #include <sdbus-c++/Message.h>
 #include <sdbus-c++/MethodResult.h>
-#include <sdbus-c++/Types.h>
 #include <sdbus-c++/TypeTraits.h>
-#include <sdbus-c++/Error.h>
-#include <type_traits>
+#include <sdbus-c++/Types.h>
+
+#include <cassert>
+#include <exception>
 #include <string>
 #include <tuple>
-#include <exception>
-#include <cassert>
+#include <type_traits>

 namespace sdbus {

@@ -28,11 +28,12 @@
 #define SDBUS_CXX_ICONNECTION_H_

 #include <sdbus-c++/TypeTraits.h>
-#include <string>
-#include <memory>
+
 #include <chrono>
 #include <cstdint>
+#include <memory>
 #include <optional>
+#include <string>

 struct sd_bus;
 struct sd_event;
@@ -27,13 +27,14 @@
 #ifndef SDBUS_CXX_IOBJECT_H_
 #define SDBUS_CXX_IOBJECT_H_

-#include <sdbus-c++/VTableItems.h>
 #include <sdbus-c++/ConvenienceApiClasses.h>
-#include <sdbus-c++/TypeTraits.h>
 #include <sdbus-c++/Flags.h>
+#include <sdbus-c++/TypeTraits.h>
+#include <sdbus-c++/VTableItems.h>
+
 #include <functional>
-#include <string>
 #include <memory>
+#include <string>
 #include <vector>

 // Forward declarations
@@ -385,7 +386,7 @@ namespace sdbus {

 }

-#include <sdbus-c++/VTableItems.inl>
 #include <sdbus-c++/ConvenienceApiClasses.inl>
+#include <sdbus-c++/VTableItems.inl>

 #endif /* SDBUS_CXX_IOBJECT_H_ */
@@ -29,11 +29,12 @@

 #include <sdbus-c++/ConvenienceApiClasses.h>
 #include <sdbus-c++/TypeTraits.h>
-#include <string>
-#include <memory>
-#include <functional>
+
 #include <chrono>
+#include <functional>
 #include <future>
+#include <memory>
+#include <string>

 // Forward declarations
 namespace sdbus {
@@ -27,24 +27,24 @@
 #ifndef SDBUS_CXX_MESSAGE_H_
 #define SDBUS_CXX_MESSAGE_H_

-#include <sdbus-c++/TypeTraits.h>
 #include <sdbus-c++/Error.h>
+#include <sdbus-c++/TypeTraits.h>
+
+#include <algorithm>
 #include <array>
-#include <string>
-#include <utility>
-#include <vector>
+#include <cassert>
+#include <cstdint>
+#include <functional>
+#include <map>
 #if __cplusplus >= 202002L
 #include <span>
 #endif
-#include <map>
+#include <string>
+#include <sys/types.h>
 #include <unordered_map>
 #include <utility>
-#include <cstdint>
-#include <cassert>
-#include <functional>
-#include <sys/types.h>
-#include <algorithm>
 #include <variant>
+#include <vector>

 // Forward declarations
 namespace sdbus {
@@ -28,9 +28,10 @@
 #define SDBUS_CXX_METHODRESULT_H_

 #include <sdbus-c++/Message.h>
+
 #include <cassert>

-// Forward declaration
+// Forward declarations
 namespace sdbus {
    class Error;
 }
@@ -27,21 +27,20 @@
 #ifndef SDBUS_CXX_TYPETRAITS_H_
 #define SDBUS_CXX_TYPETRAITS_H_

-#include <type_traits>
-#include <string>
-#include <vector>
 #include <array>
-#include <variant>
+#include <cstdint>
+#include <functional>
+#include <map>
+#include <memory>
 #if __cplusplus >= 202002L
 #include <span>
 #endif
-#include <map>
-#include <unordered_map>
-#include <cstdint>
-#include <functional>
-#include <memory>
+#include <string>
 #include <tuple>
+#include <type_traits>
+#include <unordered_map>
 #include <variant>
+#include <vector>

 // Forward declarations
 namespace sdbus {
@@ -29,11 +29,12 @@

 #include <sdbus-c++/Message.h>
 #include <sdbus-c++/TypeTraits.h>
+
+#include <memory>
 #include <string>
+#include <tuple>
 #include <type_traits>
 #include <typeinfo>
-#include <memory>
-#include <tuple>
 #include <utility>

 namespace sdbus {
@@ -26,11 +26,12 @@
 #ifndef SDBUS_CXX_VTABLEITEMS_H_
 #define SDBUS_CXX_VTABLEITEMS_H_

-#include <sdbus-c++/TypeTraits.h>
 #include <sdbus-c++/Flags.h>
+#include <sdbus-c++/TypeTraits.h>
+
 #include <string>
-#include <vector>
 #include <variant>
+#include <vector>

 namespace sdbus {

@@ -26,10 +26,11 @@
 #ifndef SDBUS_CPP_VTABLEITEMS_INL_
 #define SDBUS_CPP_VTABLEITEMS_INL_

-#include <sdbus-c++/TypeTraits.h>
 #include <sdbus-c++/Error.h>
-#include <type_traits>
+#include <sdbus-c++/TypeTraits.h>
+
 #include <string>
+#include <type_traits>
 #include <vector>

 namespace sdbus {