chore: move function to private

x-tools-author · Dec 5, 2023 · 685e5a0 · 685e5a0
1 parent 37bfd70
commit 685e5a0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/src/assistants/fontawesome/src/sakfontawesome.cc b/src/assistants/fontawesome/src/sakfontawesome.cc
@@ -75,6 +75,7 @@ SAKFontAwesome *SAKFontAwesome::instance()
     static SAKFontAwesome *instance = nullptr;
     if (!instance) {
         instance = new SAKFontAwesome(qApp);
+        instance->addApplicationFonts();
     }
 
     return instance;
@@ -85,22 +86,6 @@ QList<SAKFontAwesomeIconContext> SAKFontAwesome::supportedIcons() const
     return m_supportedIcons;
 }
 
-void SAKFontAwesome::addApplicationFonts()
-{
-    QString path = fontAwesomePath() + "/otfs/";
-    QString name = path + QString("Font Awesome 6 Brands-Regular-400.otf");
-    int fontId = QFontDatabase::addApplicationFont(name);
-    qInfo() << "Install font:" << QFontDatabase::applicationFontFamilies(fontId);
-
-    name = path + QString("Font Awesome 6 Free-Regular-400.otf");
-    fontId = QFontDatabase::addApplicationFont(name);
-    qInfo() << "Install font:" << QFontDatabase::applicationFontFamilies(fontId);
-
-    name = path + QString("Font Awesome 6 Free-Solid-900.otf");
-    fontId = QFontDatabase::addApplicationFont(name);
-    qInfo() << QFontDatabase::applicationFontFamilies(fontId);
-}
-
 QString SAKFontAwesome::familyToString(int family)
 {
     switch (family) {
@@ -122,3 +107,19 @@ QString SAKFontAwesome::fontAwesomePath() const
     path += "/fonts/" + QString(SAK_FONTAWESOME_DIR);
     return path;
 }
+
+void SAKFontAwesome::addApplicationFonts()
+{
+    QString path = fontAwesomePath() + "/otfs/";
+    QString name = path + QString("Font Awesome 6 Brands-Regular-400.otf");
+    int fontId = QFontDatabase::addApplicationFont(name);
+    qInfo() << "Install font:" << QFontDatabase::applicationFontFamilies(fontId);
+
+    name = path + QString("Font Awesome 6 Free-Regular-400.otf");
+    fontId = QFontDatabase::addApplicationFont(name);
+    qInfo() << "Install font:" << QFontDatabase::applicationFontFamilies(fontId);
+
+    name = path + QString("Font Awesome 6 Free-Solid-900.otf");
+    fontId = QFontDatabase::addApplicationFont(name);
+    qInfo() << QFontDatabase::applicationFontFamilies(fontId);
+}
diff --git a/src/assistants/fontawesome/src/sakfontawesome.h b/src/assistants/fontawesome/src/sakfontawesome.h
@@ -9,6 +9,7 @@
 #ifndef SAKFONTAWESOME_H
 #define SAKFONTAWESOME_H
 
+#include <QIcon>
 #include <QList>
 #include <QObject>
 
@@ -23,7 +24,6 @@ class SAKFontAwesome : public QObject
 public:
     static SAKFontAwesome *instance();
 
-    void addApplicationFonts();
     QList<SAKFontAwesomeIconContext> supportedIcons() const;
     QString familyToString(int family);
 
@@ -32,6 +32,7 @@ class SAKFontAwesome : public QObject
 
 private:
     QString fontAwesomePath() const;
+    void addApplicationFonts();
 };
 
 #endif // SAKFONTAWESOME_H
diff --git a/src/assistants/fontawesome/src/sakfontawesomeassistant.cc b/src/assistants/fontawesome/src/sakfontawesomeassistant.cc
@@ -18,7 +18,6 @@ SAKFontAwesomeAssistant::SAKFontAwesomeAssistant(QWidget *parent)
     , ui(new Ui::SAKFontAwesomeAssistant)
 {
     ui->setupUi(this);
-    SAKFontAwesome::instance()->addApplicationFonts();
     auto *l = new FlowLayout();
     ui->widget->setLayout(l);