From d4f753a9f85ca28943a596feb53ea4ba1da5d1f0 Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Mon, 20 Dec 2021 16:34:46 +0100 Subject: [PATCH] Moved detection files to their own folder --- CMakeLists.txt | 8 ++++---- src/{common/detectGTK.c => detection/gtk.c} | 0 src/{common/detectPlasma.c => detection/plasma.c} | 0 .../detectTerminalShell.c => detection/terminalShell.c} | 0 src/{common/detectWMDE.c => detection/wmde.c} | 0 src/fastfetch.h | 8 ++++---- tests/performance.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename src/{common/detectGTK.c => detection/gtk.c} (100%) rename src/{common/detectPlasma.c => detection/plasma.c} (100%) rename src/{common/detectTerminalShell.c => detection/terminalShell.c} (100%) rename src/{common/detectWMDE.c => detection/wmde.c} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d183ca92..b54d86fe1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,10 +146,10 @@ set(SRCS src/common/format.c src/common/parsing.c src/common/settings.c - src/common/detectPlasma.c - src/common/detectGTK.c - src/common/detectWMDE.c - src/common/detectTerminalShell.c + src/detection/plasma.c + src/detection/gtk.c + src/detection/wmde.c + src/detection/terminalShell.c src/modules/break.c src/modules/custom.c src/modules/title.c diff --git a/src/common/detectGTK.c b/src/detection/gtk.c similarity index 100% rename from src/common/detectGTK.c rename to src/detection/gtk.c diff --git a/src/common/detectPlasma.c b/src/detection/plasma.c similarity index 100% rename from src/common/detectPlasma.c rename to src/detection/plasma.c diff --git a/src/common/detectTerminalShell.c b/src/detection/terminalShell.c similarity index 100% rename from src/common/detectTerminalShell.c rename to src/detection/terminalShell.c diff --git a/src/common/detectWMDE.c b/src/detection/wmde.c similarity index 100% rename from src/common/detectWMDE.c rename to src/detection/wmde.c diff --git a/src/fastfetch.h b/src/fastfetch.h index 3811975c0..40ec31320 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -389,18 +389,18 @@ FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, con void ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result); #endif -//common/detectPlasma.c +//detection/plasma.c const FFPlasmaResult* ffDetectPlasma(FFinstance* instance); -//common/detectGTK.c +//detection/gtk.c const FFGTKResult* ffDetectGTK2(FFinstance* instance); const FFGTKResult* ffDetectGTK4(FFinstance* instance); const FFGTKResult* ffDetectGTK3(FFinstance* instance); -//common/detectWMDE.c +//detection/wmde.c const FFWMDEResult* ffDetectWMDE(FFinstance* instance); -//common/detectTerminalShell.c +//detection/terminalShell.c const FFTerminalShellResult* ffDetectTerminalShell(FFinstance* instance); /********************/ diff --git a/tests/performance.c b/tests/performance.c index 96108599f..7fdfa2a59 100644 --- a/tests/performance.c +++ b/tests/performance.c @@ -27,7 +27,7 @@ int main(int argc, char** argv) FASTFETCH_TEST_PERFORMANCE( puts("Configuration"); - ffStrbufSetS(&instance.config.color, instance.config.logo->colors[0]); + ffStrbufSet(&instance.config.color, &instance.config.logoColors[0]); instance.config.showErrors = true; instance.config.recache = argc == 1; instance.config.cacheSave = false;