GTK / QT: refactor directory structures

CMakeLists.txt

@@ -333,7 +333,7 @@ if(LINUX)
         src/detection/displayserver/linux/xlib.c
         src/detection/font/font_linux.c
         src/detection/gpu/gpu_linux.c
-        src/detection/gtk.c
+        src/detection/gtk_qt/gtk.c
         src/detection/host/host_linux.c
         src/detection/localip/localip_linux.c
         src/detection/gamepad/gamepad_linux.c
@@ -344,7 +344,7 @@ if(LINUX)
         src/detection/packages/packages_linux.c
         src/detection/poweradapter/poweradapter_nosupport.c
         src/detection/processes/processes_linux.c
-        src/detection/qt.c
+        src/detection/gtk_qt/qt.c
         src/detection/sound/sound_linux.c
         src/detection/swap/swap_linux.c
         src/detection/temps/temps_linux.c
@@ -419,7 +419,7 @@ elseif(BSD)
         src/detection/displayserver/linux/xlib.c
         src/detection/font/font_linux.c
         src/detection/gpu/gpu_linux.c
-        src/detection/gtk.c
+        src/detection/gtk_qt/gtk.c
         src/detection/host/host_bsd.c
         src/detection/localip/localip_linux.c
         src/detection/gamepad/gamepad_nosupport.c
@@ -430,7 +430,7 @@ elseif(BSD)
         src/detection/packages/packages_linux.c
         src/detection/poweradapter/poweradapter_nosupport.c
         src/detection/processes/processes_bsd.c
-        src/detection/qt.c
+        src/detection/gtk_qt/qt.c
         src/detection/sound/sound_linux.c
         src/detection/swap/swap_bsd.c
         src/detection/temps/temps_linux.c

src/common/init.c

@@ -1,8 +1,6 @@
 #include "fastfetch.h"
 #include "common/parsing.h"
 #include "common/thread.h"
-#include "detection/qt.h"
-#include "detection/gtk.h"
 #include "detection/displayserver/displayserver.h"
 #include "util/textModifier.h"
 
@@ -220,6 +218,8 @@ FF_THREAD_ENTRY_DECL_WRAPPER(ffConnectDisplayServer, FFinstance*)
 
 #if !(defined(__APPLE__) || defined(_WIN32))
 
+#include "detection/gtk_qt/gtk_qt.h"
+
 #define FF_DETECT_QT_GTK 1
 
 FF_THREAD_ENTRY_DECL_WRAPPER(ffDetectQt, FFinstance*)

src/detection/cursor/cursor_linux.c

@@ -3,7 +3,7 @@
 #include "common/properties.h"
 #include "common/parsing.h"
 #include "common/settings.h"
-#include "detection/gtk.h"
+#include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 #include "util/stringUtils.h"
 

src/detection/font/font_linux.c

@@ -1,6 +1,5 @@
-#include "detection/qt.h"
-#include "detection/gtk.h"
 #include "common/font.h"
+#include "detection/gtk_qt/gtk_qt.h"
 #include "font.h"
 
 void ffDetectFontImpl(const FFinstance* instance, FFFontResult* result)

src/detection/gtk_qt/gtk.c

@@ -1,5 +1,5 @@
 #include "fastfetch.h"
-#include "detection/gtk.h"
+#include "detection/gtk_qt/gtk_qt.h"
 #include "common/properties.h"
 #include "common/thread.h"
 #include "common/settings.h"

src/detection/gtk_qt/gtk_qt.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_gtk
-#define FF_INCLUDED_detection_gtk
+#ifndef FF_INCLUDED_detection_gtkqt_gtkqt
+#define FF_INCLUDED_detection_gtkqt_gtkqt
 
 #include "fastfetch.h"
 
@@ -14,8 +14,17 @@ typedef struct FFGTKResult
     FFstrbuf cursorSize;
 } FFGTKResult;
 
+typedef struct FFQtResult
+{
+    FFstrbuf widgetStyle;
+    FFstrbuf colorScheme;
+    FFstrbuf icons;
+    FFstrbuf font;
+} FFQtResult;
+
 const FFGTKResult* ffDetectGTK2(const FFinstance* instance);
 const FFGTKResult* ffDetectGTK4(const FFinstance* instance);
 const FFGTKResult* ffDetectGTK3(const FFinstance* instance);
+const FFQtResult* ffDetectQt(const FFinstance* instance);
 
 #endif

src/detection/gtk_qt/qt.c

@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "detection/qt.h"
 #include "common/properties.h"
 #include "common/thread.h"
+#include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
 #include <stdlib.h>

src/detection/qt.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#ifndef FF_INCLUDED_detection_qt
-#define FF_INCLUDED_detection_qt
-
-#include "fastfetch.h"
-
-typedef struct FFQtResult
-{
-    FFstrbuf widgetStyle;
-    FFstrbuf colorScheme;
-    FFstrbuf icons;
-    FFstrbuf font;
-} FFQtResult;
-
-const FFQtResult* ffDetectQt(const FFinstance* instance);
-
-#endif

src/detection/wmtheme/wmtheme_linux.c

@@ -2,7 +2,7 @@
 #include "common/properties.h"
 #include "common/parsing.h"
 #include "common/settings.h"
-#include "detection/gtk.h"
+#include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 #include "util/stringUtils.h"
 

src/modules/icons.c

@@ -1,8 +1,7 @@
 #include "fastfetch.h"
 #include "common/printing.h"
 #include "common/parsing.h"
-#include "detection/qt.h"
-#include "detection/gtk.h"
+#include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
 #define FF_ICONS_MODULE_NAME "Icons"

src/modules/theme.c

@@ -1,8 +1,7 @@
 #include "fastfetch.h"
 #include "common/printing.h"
 #include "common/parsing.h"
-#include "detection/qt.h"
-#include "detection/gtk.h"
+#include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
 #define FF_THEME_MODULE_NAME "Theme"