From 4b6fa2049142eb36e54c50f2928379e0c3638736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanislav=20Angelovi=C4=8D?=
 <stanislav.angelovic@protonmail.com>
Date: Tue, 9 Jan 2024 23:31:47 +0100
Subject: [PATCH] refactor: use correct header include order

---
 include/sdbus-c++/ConvenienceApiClasses.h   | 11 ++++++-----
 include/sdbus-c++/ConvenienceApiClasses.inl | 11 ++++++-----
 include/sdbus-c++/IConnection.h             |  5 +++--
 include/sdbus-c++/IObject.h                 |  9 +++++----
 include/sdbus-c++/IProxy.h                  |  7 ++++---
 include/sdbus-c++/Message.h                 | 19 ++++++++++---------
 include/sdbus-c++/MethodResult.h            |  3 ++-
 include/sdbus-c++/TypeTraits.h              | 16 ++++++++--------
 include/sdbus-c++/Types.h                   |  5 +++--
 include/sdbus-c++/VTableItems.h             |  5 +++--
 include/sdbus-c++/VTableItems.inl           |  5 +++--
 src/Connection.cpp                          | 16 +++++++++-------
 src/Connection.h                            | 13 ++++++++-----
 src/Error.cpp                               |  8 +++++---
 src/IConnection.h                           | 12 +++++++-----
 src/Message.cpp                             | 15 +++++++++------
 src/Object.cpp                              | 18 ++++++++++--------
 src/Object.h                                | 16 +++++++++-------
 src/Proxy.cpp                               | 14 ++++++++------
 src/Proxy.h                                 | 12 +++++++-----
 src/ScopeGuard.h                            |  2 +-
 src/Types.cpp                               | 16 +++++++++-------
 src/VTableUtils.h                           |  2 +-
 23 files changed, 136 insertions(+), 104 deletions(-)

diff --git a/include/sdbus-c++/ConvenienceApiClasses.h b/include/sdbus-c++/ConvenienceApiClasses.h
index c5f8b59..f4cc2a2 100644
--- a/include/sdbus-c++/ConvenienceApiClasses.h
+++ b/include/sdbus-c++/ConvenienceApiClasses.h
@@ -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 {
diff --git a/include/sdbus-c++/ConvenienceApiClasses.inl b/include/sdbus-c++/ConvenienceApiClasses.inl
index 82275c7..7a8e946 100644
--- a/include/sdbus-c++/ConvenienceApiClasses.inl
+++ b/include/sdbus-c++/ConvenienceApiClasses.inl
@@ -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 {
 
diff --git a/include/sdbus-c++/IConnection.h b/include/sdbus-c++/IConnection.h
index 1065710..c0c871d 100644
--- a/include/sdbus-c++/IConnection.h
+++ b/include/sdbus-c++/IConnection.h
@@ -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;
diff --git a/include/sdbus-c++/IObject.h b/include/sdbus-c++/IObject.h
index cdc0390..b5435ec 100644
--- a/include/sdbus-c++/IObject.h
+++ b/include/sdbus-c++/IObject.h
@@ -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_ */
diff --git a/include/sdbus-c++/IProxy.h b/include/sdbus-c++/IProxy.h
index 608a4cb..16eccb9 100644
--- a/include/sdbus-c++/IProxy.h
+++ b/include/sdbus-c++/IProxy.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 {
diff --git a/include/sdbus-c++/Message.h b/include/sdbus-c++/Message.h
index 184c64b..e36721b 100644
--- a/include/sdbus-c++/Message.h
+++ b/include/sdbus-c++/Message.h
@@ -27,22 +27,23 @@
 #ifndef SDBUS_CXX_MESSAGE_H_
 #define SDBUS_CXX_MESSAGE_H_
 
-#include <sdbus-c++/TypeTraits.h>
 #include <sdbus-c++/Error.h>
-#include <string>
-#include <vector>
+#include <sdbus-c++/TypeTraits.h>
+
+#include <algorithm>
 #include <array>
+#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 <vector>
 
 // Forward declarations
 namespace sdbus {
diff --git a/include/sdbus-c++/MethodResult.h b/include/sdbus-c++/MethodResult.h
index 75b8f20..c984664 100644
--- a/include/sdbus-c++/MethodResult.h
+++ b/include/sdbus-c++/MethodResult.h
@@ -28,9 +28,10 @@
 #define SDBUS_CXX_METHODRESULT_H_
 
 #include <sdbus-c++/Message.h>
+
 #include <cassert>
 
-// Forward declaration
+// Forward declarations
 namespace sdbus {
     class Error;
 }
diff --git a/include/sdbus-c++/TypeTraits.h b/include/sdbus-c++/TypeTraits.h
index 71d4aeb..c5f3b69 100644
--- a/include/sdbus-c++/TypeTraits.h
+++ b/include/sdbus-c++/TypeTraits.h
@@ -27,20 +27,20 @@
 #ifndef SDBUS_CXX_TYPETRAITS_H_
 #define SDBUS_CXX_TYPETRAITS_H_
 
-#include <type_traits>
-#include <string>
-#include <vector>
 #include <array>
+#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 {
diff --git a/include/sdbus-c++/Types.h b/include/sdbus-c++/Types.h
index 920b84c..d9e4f3a 100644
--- a/include/sdbus-c++/Types.h
+++ b/include/sdbus-c++/Types.h
@@ -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 {
diff --git a/include/sdbus-c++/VTableItems.h b/include/sdbus-c++/VTableItems.h
index 726fd9f..73a95e7 100644
--- a/include/sdbus-c++/VTableItems.h
+++ b/include/sdbus-c++/VTableItems.h
@@ -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 {
 
diff --git a/include/sdbus-c++/VTableItems.inl b/include/sdbus-c++/VTableItems.inl
index a989bac..0d2f3ac 100644
--- a/include/sdbus-c++/VTableItems.inl
+++ b/include/sdbus-c++/VTableItems.inl
@@ -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 {
diff --git a/src/Connection.cpp b/src/Connection.cpp
index 1d757a3..a5ddb92 100644
--- a/src/Connection.cpp
+++ b/src/Connection.cpp
@@ -25,20 +25,22 @@
  */
 
 #include "Connection.h"
-#include "SdBus.h"
+
+#include "sdbus-c++/Error.h"
+#include "sdbus-c++/Message.h"
+
 #include "MessageUtils.h"
-#include "Utils.h"
-#include <sdbus-c++/Message.h>
-#include <sdbus-c++/Error.h>
 #include "ScopeGuard.h"
+#include "SdBus.h"
+#include "Utils.h"
+
+#include <poll.h>
+#include <sys/eventfd.h>
 #include SDBUS_HEADER
 #ifndef SDBUS_basu // sd_event integration is not supported in basu-based sdbus-c++
 #include <systemd/sd-event.h>
 #endif
 #include <unistd.h>
-#include <poll.h>
-#include <sys/eventfd.h>
-#include <cstdint>
 
 namespace sdbus::internal {
 
diff --git a/src/Connection.h b/src/Connection.h
index fef5110..1833e0c 100644
--- a/src/Connection.h
+++ b/src/Connection.h
@@ -27,15 +27,18 @@
 #ifndef SDBUS_CXX_INTERNAL_CONNECTION_H_
 #define SDBUS_CXX_INTERNAL_CONNECTION_H_
 
-#include <sdbus-c++/IConnection.h>
-#include <sdbus-c++/Message.h>
+#include "sdbus-c++/IConnection.h"
+
+#include "sdbus-c++/Message.h"
+
 #include "IConnection.h"
-#include "ScopeGuard.h"
 #include "ISdBus.h"
-#include SDBUS_HEADER
+#include "ScopeGuard.h"
+
 #include <memory>
-#include <thread>
 #include <string>
+#include SDBUS_HEADER
+#include <thread>
 #include <vector>
 
 struct sd_event_source;
diff --git a/src/Error.cpp b/src/Error.cpp
index 11625cb..1720700 100644
--- a/src/Error.cpp
+++ b/src/Error.cpp
@@ -24,10 +24,12 @@
  * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sdbus-c++/Error.h>
-#include SDBUS_HEADER
+#include "sdbus-c++/Error.h"
+
 #include "ScopeGuard.h"
 
+#include SDBUS_HEADER
+
 namespace sdbus
 {
     sdbus::Error createError(int errNo, const std::string& customMsg)
@@ -40,4 +42,4 @@ namespace sdbus
         std::string message(customMsg + " (" + sdbusError.message + ")");
         return sdbus::Error(name, message);
     }
-}
+} // namespace sdbus
diff --git a/src/IConnection.h b/src/IConnection.h
index 46c111a..b73227f 100644
--- a/src/IConnection.h
+++ b/src/IConnection.h
@@ -27,12 +27,14 @@
 #ifndef SDBUS_CXX_INTERNAL_ICONNECTION_H_
 #define SDBUS_CXX_INTERNAL_ICONNECTION_H_
 
-#include <sdbus-c++/IConnection.h>
-#include <sdbus-c++/TypeTraits.h>
-#include SDBUS_HEADER
-#include <string>
-#include <memory>
+#include "sdbus-c++/IConnection.h"
+
+#include "sdbus-c++/TypeTraits.h"
+
 #include <functional>
+#include <memory>
+#include <string>
+#include SDBUS_HEADER
 #include <vector>
 
 // Forward declaration
diff --git a/src/Message.cpp b/src/Message.cpp
index 11b34f6..f61f2d9 100644
--- a/src/Message.cpp
+++ b/src/Message.cpp
@@ -24,15 +24,18 @@
  * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sdbus-c++/Message.h>
-#include <sdbus-c++/Types.h>
-#include <sdbus-c++/Error.h>
-#include "MessageUtils.h"
-#include "ISdBus.h"
+#include "sdbus-c++/Message.h"
+
+#include "sdbus-c++/Error.h"
+#include "sdbus-c++/Types.h"
+
 #include "IConnection.h"
+#include "ISdBus.h"
+#include "MessageUtils.h"
 #include "ScopeGuard.h"
-#include SDBUS_HEADER
+
 #include <cassert>
+#include SDBUS_HEADER
 
 namespace sdbus {
 
diff --git a/src/Object.cpp b/src/Object.cpp
index 8d8e592..57c6999 100644
--- a/src/Object.cpp
+++ b/src/Object.cpp
@@ -25,19 +25,21 @@
  */
 
 #include "Object.h"
-#include "MessageUtils.h"
-#include <sdbus-c++/IConnection.h>
-#include <sdbus-c++/Message.h>
-#include <sdbus-c++/Error.h>
-#include <sdbus-c++/MethodResult.h>
-#include <sdbus-c++/Flags.h>
-#include "ScopeGuard.h"
+
+#include "sdbus-c++/Error.h"
+#include "sdbus-c++/Flags.h"
+#include "sdbus-c++/IConnection.h"
+#include "sdbus-c++/Message.h"
+
 #include "IConnection.h"
+#include "MessageUtils.h"
+#include "ScopeGuard.h"
 #include "Utils.h"
 #include "VTableUtils.h"
+
+#include <cassert>
 #include SDBUS_HEADER
 #include <utility>
-#include <cassert>
 
 namespace sdbus::internal {
 
diff --git a/src/Object.h b/src/Object.h
index afb38d0..c51ccce 100644
--- a/src/Object.h
+++ b/src/Object.h
@@ -27,15 +27,17 @@
 #ifndef SDBUS_CXX_INTERNAL_OBJECT_H_
 #define SDBUS_CXX_INTERNAL_OBJECT_H_
 
-#include <sdbus-c++/IObject.h>
+#include "sdbus-c++/IObject.h"
+
 #include "IConnection.h"
-#include SDBUS_HEADER
-#include <string>
-#include <list>
-#include <vector>
-#include <functional>
-#include <memory>
+
 #include <cassert>
+#include <functional>
+#include <list>
+#include <memory>
+#include <string>
+#include SDBUS_HEADER
+#include <vector>
 
 namespace sdbus::internal {
 
diff --git a/src/Proxy.cpp b/src/Proxy.cpp
index 278bc97..c20a94a 100644
--- a/src/Proxy.cpp
+++ b/src/Proxy.cpp
@@ -25,16 +25,18 @@
  */
 
 #include "Proxy.h"
+
+#include "sdbus-c++/Error.h"
+#include "sdbus-c++/IConnection.h"
+#include "sdbus-c++/Message.h"
+
 #include "IConnection.h"
 #include "MessageUtils.h"
-#include "Utils.h"
-#include "sdbus-c++/Message.h"
-#include "sdbus-c++/IConnection.h"
-#include "sdbus-c++/Error.h"
 #include "ScopeGuard.h"
-#include SDBUS_HEADER
+#include "Utils.h"
+
 #include <cassert>
-#include <chrono>
+#include SDBUS_HEADER
 #include <utility>
 
 namespace sdbus::internal {
diff --git a/src/Proxy.h b/src/Proxy.h
index ddd71b4..029b20a 100644
--- a/src/Proxy.h
+++ b/src/Proxy.h
@@ -27,14 +27,16 @@
 #ifndef SDBUS_CXX_INTERNAL_PROXY_H_
 #define SDBUS_CXX_INTERNAL_PROXY_H_
 
-#include <sdbus-c++/IProxy.h>
+#include "sdbus-c++/IProxy.h"
+
 #include "IConnection.h"
-#include SDBUS_HEADER
-#include <string>
-#include <memory>
+
 #include <deque>
-#include <vector>
+#include <memory>
 #include <mutex>
+#include <string>
+#include SDBUS_HEADER
+#include <vector>
 
 namespace sdbus::internal {
 
diff --git a/src/ScopeGuard.h b/src/ScopeGuard.h
index 6f33437..f698d5b 100644
--- a/src/ScopeGuard.h
+++ b/src/ScopeGuard.h
@@ -27,8 +27,8 @@
 #ifndef SDBUS_CPP_INTERNAL_SCOPEGUARD_H_
 #define SDBUS_CPP_INTERNAL_SCOPEGUARD_H_
 
-#include <utility>
 #include <exception>
+#include <utility>
 
 // Straightforward, modern, easy-to-use RAII utility to perform work on scope exit in an exception-safe manner.
 //
diff --git a/src/Types.cpp b/src/Types.cpp
index f14da50..141589f 100644
--- a/src/Types.cpp
+++ b/src/Types.cpp
@@ -24,13 +24,15 @@
  * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <sdbus-c++/Types.h>
-#include <sdbus-c++/Error.h>
+#include "sdbus-c++/Types.h"
+
+#include "sdbus-c++/Error.h"
+
 #include "MessageUtils.h"
-#include SDBUS_HEADER
-#include <cassert>
+
 #include <cerrno>
 #include <system_error>
+#include SDBUS_HEADER
 #include <unistd.h>
 
 namespace sdbus {
@@ -67,7 +69,7 @@ bool Variant::isEmpty() const
     return msg_.isEmpty();
 }
 
-void UnixFd::close()
+void UnixFd::close() // NOLINT(readability-make-member-function-const)
 {
     if (fd_ >= 0)
     {
@@ -82,7 +84,7 @@ int UnixFd::checkedDup(int fd)
         return fd;
     }
 
-    int ret = ::dup(fd);
+    int ret = ::dup(fd); // NOLINT(android-cloexec-dup) // TODO: verify
     if (ret < 0)
     {
         throw std::system_error(errno, std::generic_category(), "dup failed");
@@ -90,4 +92,4 @@ int UnixFd::checkedDup(int fd)
     return ret;
 }
 
-}
+} // namespace sdbus
diff --git a/src/VTableUtils.h b/src/VTableUtils.h
index 466887d..2436d75 100644
--- a/src/VTableUtils.h
+++ b/src/VTableUtils.h
@@ -27,8 +27,8 @@
 #ifndef SDBUS_CXX_INTERNAL_VTABLEUTILS_H_
 #define SDBUS_CXX_INTERNAL_VTABLEUTILS_H_
 
-#include SDBUS_HEADER
 #include <stdbool.h>
+#include SDBUS_HEADER
 
 #ifdef __cplusplus
 extern "C" {