Adapt to changes in qtforkawesome

model/syncthingicons.cpp

@@ -2,6 +2,8 @@
 
 #include <qtutilities/misc/compat.h>
 
+#include <qtforkawesome/icon.h>
+
 #include <QFile>
 #include <QGuiApplication>
 #include <QPainter>

model/syncthingicons.h

@@ -3,7 +3,7 @@
 
 #include "./global.h"
 
-#include <qtforkawesome/qtforkawesome.h>
+#include <qtforkawesome/renderer.h>
 
 #include <QIcon>
 #include <QSize>

plasmoid/lib/syncthingapplet.cpp

@@ -19,6 +19,8 @@
 #include "resources/config.h"
 #include "resources/qtconfig.h"
 
+#include <qtforkawesome/utils.h>
+
 #include <qtutilities/misc/desktoputils.h>
 #include <qtutilities/misc/dialogutils.h>
 #include <qtutilities/resources/resources.h>
@@ -264,17 +266,9 @@ void SyncthingApplet::updateStatusIconAndTooltip()
 
 QIcon SyncthingApplet::loadForkAwesomeIcon(const QString &name) const
 {
-    using namespace QtForkAwesome;
-    static const auto mapping = QMap<QString, Icon>({
-        { QStringLiteral("cloud-download"), Icon::CloudDownload },
-        { QStringLiteral("cloud-upload"), Icon::CloudUpload },
-        { QStringLiteral("file"), Icon::FileO },
-        { QStringLiteral("folder"), Icon::FolderO },
-        { QStringLiteral("hdd"), Icon::HddO },
-    });
-    const auto icon = mapping.find(name);
-    return icon != mapping.cend()
-        ? QIcon(IconManager::instance().forkAwesomeRenderer().pixmap(*icon, QSize(32, 32), QGuiApplication::palette().color(QPalette::WindowText)))
+    const auto icon = QtForkAwesome::iconFromId(name);
+    return QtForkAwesome::isIconValid(icon)
+        ? QIcon(IconManager::instance().forkAwesomeRenderer().pixmap(icon, QSize(32, 32), QGuiApplication::palette().color(QPalette::WindowText)))
         : QIcon();
 }
 

tray/gui/traywidget.cpp

@@ -22,6 +22,8 @@
 
 #include "ui_traywidget.h"
 
+#include <qtforkawesome/icon.h>
+
 #include <qtutilities/aboutdialog/aboutdialog.h>
 #include <qtutilities/misc/desktoputils.h>
 #include <qtutilities/misc/dialogutils.h>