Organize include order of headers

Nightkingale · Apr 30, 2024 · f6ff2c5 · f6ff2c5
1 parent 48536d7
commit f6ff2c5
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 23 deletions.
diff --git a/source/cfg.cpp b/source/cfg.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 
 #include "cfg.hpp"
-
 #include "utc.hpp"
 #include "wupsxx/storage.hpp"
 

diff --git a/source/config_screen.cpp b/source/config_screen.cpp
@@ -2,16 +2,14 @@
 
 #include <memory>               // make_unique()
 
-#include "wupsxx/bool_item.hpp"
-#include "wupsxx/int_item.hpp"
-#include "wupsxx/text_item.hpp"
-
-#include "config_screen.hpp"
-
 #include "cfg.hpp"
+#include "config_screen.hpp"
 #include "http_client.hpp"
 #include "nintendo_glyphs.hpp"
 #include "utils.hpp"
+#include "wupsxx/bool_item.hpp"
+#include "wupsxx/int_item.hpp"
+#include "wupsxx/text_item.hpp"
 
 
 using wups::bool_item;

diff --git a/source/core.cpp b/source/core.cpp
@@ -12,18 +12,15 @@
 #include <thread>
 #include <vector>
 
-// WUT/WUPS headers
+// WUT/WUPS and unix headers
 #include <coreinit/time.h>
 #include <nn/ccr.h>             // CCRSysSetSystemTime()
 #include <nn/pdm.h>             // __OSSetAbsoluteSystemTime()
-
-// unix headers
 #include <sys/select.h>         // select()
 #include <sys/socket.h>         // connect(), send(), recv()
 
-#include "core.hpp"
-
 #include "cfg.hpp"
+#include "core.hpp"
 #include "limited_async.hpp"
 #include "log.hpp"
 #include "ntp.hpp"

diff --git a/source/http_client.cpp b/source/http_client.cpp
@@ -9,7 +9,6 @@
 #include <sys/socket.h>         // connect()
 
 #include "http_client.hpp"
-
 #include "utils.hpp"
 
 

diff --git a/source/log.cpp b/source/log.cpp
@@ -2,9 +2,8 @@
 
 #include <notifications/notifications.h>
 
-#include "log.hpp"
-
 #include "cfg.hpp"
+#include "log.hpp"
 
 
 void

diff --git a/source/main.cpp b/source/main.cpp
@@ -6,14 +6,14 @@
 
 // WUT/WUPS headers
 #include <notifications/notifications.h>
-#include <wups.h>
 #include <whb/log_udp.h>
+#include <wups.h>
 
 // local headers
 #include "cfg.hpp"
 #include "config_screen.hpp"
-#include "preview_screen.hpp"
 #include "core.hpp"
+#include "preview_screen.hpp"
 #include "wupsxx/config.hpp"
 
 

diff --git a/source/preview_screen.cpp b/source/preview_screen.cpp
@@ -4,12 +4,11 @@
 #include <memory>
 #include <vector>
 
-#include "preview_screen.hpp"
-
 #include "cfg.hpp"
 #include "core.hpp"
 #include "log.hpp"
 #include "nintendo_glyphs.hpp"
+#include "preview_screen.hpp"
 #include "utils.hpp"
 
 

diff --git a/source/wupsxx/bool_item.cpp b/source/wupsxx/bool_item.cpp
@@ -4,9 +4,8 @@
 #include <stdexcept>
 
 #include "bool_item.hpp"
-#include "storage.hpp"
-
 #include "nintendo_glyphs.hpp"
+#include "storage.hpp"
 
 
 namespace wups {

diff --git a/source/wupsxx/int_item.cpp b/source/wupsxx/int_item.cpp
@@ -4,11 +4,10 @@
 #include <cstdio>
 #include <stdexcept>
 
+#include "nintendo_glyphs.hpp"
 #include "wupsxx/int_item.hpp"
 #include "wupsxx/storage.hpp"
 
-#include "nintendo_glyphs.hpp"
-
 
 namespace wups {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,6 @@
		#include <sys/socket.h> // connect()

		#include "http_client.hpp"

		#include "utils.hpp"


Expand Down