diff --git a/src/common/init.c b/src/common/init.c index 22dcb336b..d24f06dd7 100644 --- a/src/common/init.c +++ b/src/common/init.c @@ -1,5 +1,6 @@ #include "fastfetch.h" #include "common/caching.h" +#include "detection/qt.h" #include #include diff --git a/src/detection/qt.c b/src/detection/qt.c index 4c679779d..52a5b5b52 100644 --- a/src/detection/qt.c +++ b/src/detection/qt.c @@ -1,4 +1,5 @@ #include "fastfetch.h" +#include "detection/qt.h" #include "common/properties.h" #include diff --git a/src/detection/qt.h b/src/detection/qt.h new file mode 100644 index 000000000..70390e290 --- /dev/null +++ b/src/detection/qt.h @@ -0,0 +1,18 @@ +#pragma once + +#ifndef FF_INCLUDED_detection_qt +#define FF_INCLUDED_detection_qt + +#include "util/FFstrbuf.h" + +typedef struct FFQtResult +{ + FFstrbuf widgetStyle; + FFstrbuf colorScheme; + FFstrbuf icons; + FFstrbuf font; +} FFQtResult; + +const FFQtResult* ffDetectQt(FFinstance* instance); + +#endif diff --git a/src/fastfetch.h b/src/fastfetch.h index e2711d78e..6320a6d91 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -173,14 +173,6 @@ typedef struct FFinstance FFstate state; } FFinstance; -typedef struct FFQtResult -{ - FFstrbuf widgetStyle; - FFstrbuf colorScheme; - FFstrbuf icons; - FFstrbuf font; -} FFQtResult; - typedef struct FFGTKResult { FFstrbuf theme; @@ -314,9 +306,6 @@ void ffLogoBuiltinListAutocompletion(); // Detection functions // ///////////////////////// -//detection/plasma.c -const FFQtResult* ffDetectQt(FFinstance* instance); - //detection/gtk.c const FFGTKResult* ffDetectGTK2(FFinstance* instance); const FFGTKResult* ffDetectGTK4(FFinstance* instance); diff --git a/src/modules/font.c b/src/modules/font.c index 588cac6af..67d82c1e2 100644 --- a/src/modules/font.c +++ b/src/modules/font.c @@ -2,6 +2,7 @@ #include "common/font.h" #include "common/printing.h" #include "common/parsing.h" +#include "detection/qt.h" #define FF_FONT_MODULE_NAME "Font" #define FF_FONT_NUM_FORMAT_ARGS 21 diff --git a/src/modules/icons.c b/src/modules/icons.c index 3583239ca..e05b1c120 100644 --- a/src/modules/icons.c +++ b/src/modules/icons.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "common/printing.h" #include "common/parsing.h" +#include "detection/qt.h" #define FF_ICONS_MODULE_NAME "Icons" #define FF_ICONS_NUM_FORMAT_ARGS 5 diff --git a/src/modules/theme.c b/src/modules/theme.c index ad1b40d19..e2d362e78 100644 --- a/src/modules/theme.c +++ b/src/modules/theme.c @@ -1,6 +1,7 @@ #include "fastfetch.h" #include "common/printing.h" #include "common/parsing.h" +#include "detection/qt.h" #define FF_THEME_MODULE_NAME "Theme" #define FF_THEME_NUM_FORMAT_ARGS 7