From 5c73125693ee0f29f81a6dc28fea66ac2c4190ab Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Mon, 25 Jul 2022 13:44:55 +0200
Subject: [PATCH] Refactor: move font functions to own header

---
 src/common/font.c          |  1 +
 src/common/font.h          | 23 +++++++++++++++++++++++
 src/fastfetch.h            | 15 ---------------
 src/modules/font.c         |  1 +
 src/modules/terminalfont.c |  1 +
 5 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 src/common/font.h

diff --git a/src/common/font.c b/src/common/font.c
index bc5af5a03..3915fa18d 100644
--- a/src/common/font.c
+++ b/src/common/font.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/font.h"
 
 #include <string.h>
 
diff --git a/src/common/font.h b/src/common/font.h
new file mode 100644
index 000000000..a9d85b0dc
--- /dev/null
+++ b/src/common/font.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_font
+#define FF_INCLUDED_common_font
+
+#include "util/FFstrbuf.h"
+#include "util/FFlist.h"
+
+typedef struct FFfont
+{
+    FFstrbuf pretty;
+    FFstrbuf name;
+    FFstrbuf size;
+    FFlist styles;
+} FFfont;
+
+void ffFontInitQt(FFfont* font, const char* data);
+void ffFontInitPango(FFfont* font, const char* data);
+void ffFontInitCopy(FFfont* font, const char* name);
+void ffFontInitValues(FFfont* font, const char* name, const char* size);
+void ffFontDestroy(FFfont* font);
+
+#endif
diff --git a/src/fastfetch.h b/src/fastfetch.h
index 42f2ce5a5..4f29a798e 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -357,14 +357,6 @@ typedef union FFvariant
 
 #define FF_VARIANT_NULL ((FFvariant){.strValue = NULL})
 
-typedef struct FFfont
-{
-    FFstrbuf pretty;
-    FFstrbuf name;
-    FFstrbuf size;
-    FFlist styles;
-} FFfont;
-
 //////////////////////
 // Common functions //
 //////////////////////
@@ -379,13 +371,6 @@ void ffListFeatures();
 //common/threading.c
 void ffStartDetectionThreads(FFinstance* instance);
 
-//common/font.c
-void ffFontInitQt(FFfont* font, const char* data);
-void ffFontInitPango(FFfont* font, const char* data);
-void ffFontInitCopy(FFfont* font, const char* name);
-void ffFontInitValues(FFfont* font, const char* name, const char* size);
-void ffFontDestroy(FFfont* font);
-
 //common/format.c
 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg);
 void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments);
diff --git a/src/modules/font.c b/src/modules/font.c
index 92af25655..fedf47034 100644
--- a/src/modules/font.c
+++ b/src/modules/font.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/font.h"
 #include "common/printing.h"
 
 #define FF_FONT_MODULE_NAME "Font"
diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c
index 96b7c8ace..e9e7d5347 100644
--- a/src/modules/terminalfont.c
+++ b/src/modules/terminalfont.c
@@ -1,6 +1,7 @@
 #include "fastfetch.h"
 #include "common/properties.h"
 #include "common/printing.h"
+#include "common/font.h"
 
 #define FF_TERMFONT_MODULE_NAME "Terminal Font"
 #define FF_TERMFONT_NUM_FORMAT_ARGS 5