Refactor: move terminal/shell detection to own header

src/detection/displayserver.h

@@ -3,6 +3,8 @@
 #ifndef FF_INCLUDED_detection_displayserver
 #define FF_INCLUDED_detection_displayserver
 
+#include "fastfetch.h"
+
 typedef struct FFResolutionResult
 {
     uint32_t width;

src/detection/gtk.h

@@ -3,7 +3,7 @@
 #ifndef FF_INCLUDED_detection_gtk
 #define FF_INCLUDED_detection_gtk
 
-#include "util/FFstrbuf.h"
+#include "fastfetch.h"
 
 typedef struct FFGTKResult
 {

src/detection/os.h

@@ -3,7 +3,7 @@
 #ifndef FF_INCLUDED_detection_os
 #define FF_INCLUDED_detection_os
 
-#include "util/FFstrbuf.h"
+#include "fastfetch.h"
 
 typedef struct FFOSResult
 {

src/detection/qt.h

@@ -3,7 +3,7 @@
 #ifndef FF_INCLUDED_detection_qt
 #define FF_INCLUDED_detection_qt
 
-#include "util/FFstrbuf.h"
+#include "fastfetch.h"
 
 typedef struct FFQtResult
 {

src/detection/terminalShell.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "detection/terminalshell.h"
 #include "common/io.h"
 #include "common/parsing.h"
 #include "common/processing.h"

src/detection/terminalshell.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_terminalshell
+#define FF_INCLUDED_detection_terminalshell
+
+#include "fastfetch.h"
+
+typedef struct FFTerminalShellResult
+{
+    FFstrbuf shellProcessName;
+    FFstrbuf shellExe;
+    const char* shellExeName; //pointer to a char in shellExe
+    FFstrbuf shellVersion;
+
+    FFstrbuf terminalProcessName;
+    FFstrbuf terminalExe;
+    const char* terminalExeName; //pointer to a char in terminalExe
+
+    FFstrbuf userShellExe;
+    const char* userShellExeName; //pointer to a char in userShellExe
+    FFstrbuf userShellVersion;
+} FFTerminalShellResult;
+
+const FFTerminalShellResult* ffDetectTerminalShell(FFinstance* instance);
+
+#endif

src/detection/title.h

@@ -3,7 +3,7 @@
 #ifndef FF_INCLUDED_detection_title
 #define FF_INCLUDED_detection_title
 
-#include "util/FFstrbuf.h"
+#include "fastfetch.h"
 
 typedef struct FFTitleResult
 {

src/fastfetch.h

@@ -173,22 +173,6 @@ typedef struct FFinstance
     FFstate state;
 } FFinstance;
 
-typedef struct FFTerminalShellResult
-{
-    FFstrbuf shellProcessName;
-    FFstrbuf shellExe;
-    const char* shellExeName; //pointer to a char in shellExe
-    FFstrbuf shellVersion;
-
-    FFstrbuf terminalProcessName;
-    FFstrbuf terminalExe;
-    const char* terminalExeName; //pointer to a char in terminalExe
-
-    FFstrbuf userShellExe;
-    const char* userShellExeName; //pointer to a char in userShellExe
-    FFstrbuf userShellVersion;
-} FFTerminalShellResult;
-
 typedef struct FFGPUResult
 {
     FFstrbuf vendor;
@@ -279,9 +263,6 @@ void ffLogoBuiltinListAutocompletion();
 // Detection functions //
 /////////////////////////
 
-//detection/terminalShell.c
-const FFTerminalShellResult* ffDetectTerminalShell(FFinstance* instance);
-
 //detection/temps.c (currently unused)
 const FFTempsResult* ffDetectTemps(const FFinstance* instance);
 

src/logo/logo.c

@@ -2,6 +2,7 @@
 #include "common/io.h"
 #include "common/printing.h"
 #include "detection/os.h"
+#include "detection/terminalshell.h"
 
 #include <ctype.h>
 #include <string.h>

src/modules/shell.c

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "detection/terminalshell.h"
 
 #define FF_SHELL_MODULE_NAME "Shell"
 #define FF_SHELL_NUM_FORMAT_ARGS 7

src/modules/terminal.c

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "detection/terminalshell.h"
 
 #include <string.h>
 

src/modules/terminalfont.c

@@ -5,6 +5,7 @@
 #include "common/settings.h"
 #include "common/processing.h"
 #include "detection/displayserver.h"
+#include "detection/terminalshell.h"
 
 #define FF_TERMFONT_MODULE_NAME "Terminal Font"
 #define FF_TERMFONT_NUM_FORMAT_ARGS 5