From f3ae226c8cdec278e662cbf399afa81a7630b375 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 11 Sep 2021 14:42:11 +0200
Subject: [PATCH] Split header file

---
 CMakeLists.txt                        |  6 +++---
 README.md                             |  3 ++-
 icon.h                                | 14 ++++++++++++++
 iconfwd.h                             | 15 +++++++++++++++
 qtforkawesome.cpp => renderer.cpp     |  2 +-
 qtforkawesome.h => renderer.h         | 13 ++++---------
 tests/{rendering.cpp => renderer.cpp} |  5 +++--
 7 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100644 icon.h
 create mode 100644 iconfwd.h
 rename qtforkawesome.cpp => renderer.cpp (98%)
 rename qtforkawesome.h => renderer.h (77%)
 rename tests/{rendering.cpp => renderer.cpp} (94%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 839d1a7..b881ad0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,9 @@ set(META_ADD_DEFAULT_CPP_UNIT_TEST_APPLICATION OFF)
 project(${META_PROJECT_NAME})
 
 # add project files
-set(HEADER_FILES qtforkawesome.h)
-set(SRC_FILES qtforkawesome.cpp)
-set(QT_TESTS rendering)
+set(HEADER_FILES renderer.h icon.h iconfwd.h)
+set(SRC_FILES renderer.cpp)
+set(QT_TESTS renderer)
 set(DOC_FILES README.md)
 
 # find/download ForkAwesome's font file and icon definitions
diff --git a/README.md b/README.md
index c3702af..dcc93ff 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,8 @@ The installation provides a CMake find module and a pkg-config file. Once
 configured, the library is fairly simple to use:
 
 ```
-#include <qtforkawesome/qtforkawesome.h>
+#include <qtforkawesome/icon.h>
+#include <qtforkawesome/renderer.h>
 
 auto renderer = QtForkAwesome::Renderer();
 renderer.pixmap(QtForkAwesome::Icon::Globe, QSize(64, 64), Qt::black);
diff --git a/icon.h b/icon.h
new file mode 100644
index 0000000..989f893
--- /dev/null
+++ b/icon.h
@@ -0,0 +1,14 @@
+#ifndef QT_FORK_AWESOME_ICON
+#define QT_FORK_AWESOME_ICON
+
+#include "./iconfwd.h"
+
+namespace QtForkAwesome {
+
+enum class Icon : IconBaseType {
+#include "private/icons.h"
+};
+
+} // namespace QtForkAwesome
+
+#endif // QT_FORK_AWESOME_ICON
diff --git a/iconfwd.h b/iconfwd.h
new file mode 100644
index 0000000..376c0a3
--- /dev/null
+++ b/iconfwd.h
@@ -0,0 +1,15 @@
+#ifndef QT_FORK_AWESOME_ICONFWD
+#define QT_FORK_AWESOME_ICONFWD
+
+#include <QChar>
+
+#include <type_traits>
+
+namespace QtForkAwesome {
+
+using IconBaseType = std::remove_reference_t<decltype(QChar().unicode())>;
+enum class Icon : IconBaseType;
+
+} // namespace QtForkAwesome
+
+#endif // QT_FORK_AWESOME_ICONFWD
diff --git a/qtforkawesome.cpp b/renderer.cpp
similarity index 98%
rename from qtforkawesome.cpp
rename to renderer.cpp
index d7ddad5..a88aeda 100644
--- a/qtforkawesome.cpp
+++ b/renderer.cpp
@@ -1,4 +1,4 @@
-#include "./qtforkawesome.h"
+#include "./renderer.h"
 
 #include "resources/config.h"
 
diff --git a/qtforkawesome.h b/renderer.h
similarity index 77%
rename from qtforkawesome.h
rename to renderer.h
index f0fb2d5..e810c83 100644
--- a/qtforkawesome.h
+++ b/renderer.h
@@ -1,7 +1,8 @@
-#ifndef QT_FORK_AWESOME_MAIN
-#define QT_FORK_AWESOME_MAIN
+#ifndef QT_FORK_AWESOME_RENDERER
+#define QT_FORK_AWESOME_RENDERER
 
 #include "./global.h"
+#include "./iconfwd.h"
 
 #include <QString>
 
@@ -16,12 +17,6 @@ QT_FORWARD_DECLARE_CLASS(QPixmap)
 
 namespace QtForkAwesome {
 
-using IconBaseType = std::remove_reference_t<decltype(QChar().unicode())>;
-
-enum class Icon : IconBaseType {
-#include "private/icons.h"
-};
-
 class QT_FORK_AWESOME_EXPORT Renderer {
     struct InternalData;
 
@@ -40,4 +35,4 @@ private:
 
 } // namespace QtForkAwesome
 
-#endif // QT_FORK_AWESOME_MAIN
+#endif // QT_FORK_AWESOME_RENDERER
diff --git a/tests/rendering.cpp b/tests/renderer.cpp
similarity index 94%
rename from tests/rendering.cpp
rename to tests/renderer.cpp
index a3a24f1..6ee7b0d 100644
--- a/tests/rendering.cpp
+++ b/tests/renderer.cpp
@@ -1,4 +1,5 @@
-#include "../qtforkawesome.h"
+#include "../icon.h"
+#include "../renderer.h"
 
 #include <c++utilities/tests/testutils.h>
 
@@ -34,4 +35,4 @@ void RendererTests::testRender()
 }
 
 QTEST_MAIN(RendererTests)
-#include "rendering.moc"
+#include "renderer.moc"