recolor the git icon everywhere, let kateprivate export iconthemes, we want that always

addons/git-blame/kategitblameplugin.cpp

@@ -13,6 +13,7 @@
 
 #include <KActionCollection>
 #include <KConfigGroup>
+#include <KIconLoader>
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KSharedConfig>
@@ -307,7 +308,7 @@ void KateGitBlamePluginView::sendMessage(const QString &text, bool error)
     QVariantMap genericMessage;
     genericMessage.insert(QStringLiteral("type"), error ? QStringLiteral("Error") : QStringLiteral("Info"));
     genericMessage.insert(QStringLiteral("category"), i18n("Git"));
-    genericMessage.insert(QStringLiteral("categoryIcon"), QIcon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
+    genericMessage.insert(QStringLiteral("categoryIcon"), KDE::icon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
     genericMessage.insert(QStringLiteral("text"), text);
     Q_EMIT message(genericMessage);
 }
@@ -567,7 +568,7 @@ void KateGitBlamePluginView::createToolView()
     m_toolView.reset(m_mainWindow->createToolView(plugin,
                                                   QStringLiteral("commitfilesview"),
                                                   KTextEditor::MainWindow::Left,
-                                                  QIcon::fromTheme(QStringLiteral(":/icons/icons/sc-apps-git.svg")),
+                                                  KDE::icon(QStringLiteral(":/icons/icons/sc-apps-git.svg")),
                                                   i18n("Commit")));
 
     m_commitFilesView = new CommitDiffTreeView(m_toolView.get());

addons/project/CMakeLists.txt

@@ -4,7 +4,6 @@ find_package(
   QUIET
   COMPONENTS
     GuiAddons
-    IconThemes
     NewStuff
 )
 
@@ -25,7 +24,6 @@ target_link_libraries(
         Qt::Concurrent
         KF5::GuiAddons
         KF5::I18n
-        KF5::IconThemes
         KF5::NewStuff
         KF5::TextEditor
 )

addons/project/branchesdialog.cpp

@@ -23,6 +23,7 @@
 #include <KTextEditor/Message>
 #include <KTextEditor/View>
 
+#include <KIconLoader>
 #include <KLocalizedString>
 
 #include <drawing_utils.h>
@@ -129,7 +130,7 @@ void BranchesDialog::sendMessage(const QString &plainText, bool warn)
     QVariantMap genericMessage;
     genericMessage.insert(QStringLiteral("type"), warn ? QStringLiteral("Error") : QStringLiteral("Info"));
     genericMessage.insert(QStringLiteral("category"), i18n("Git"));
-    genericMessage.insert(QStringLiteral("categoryIcon"), QIcon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
+    genericMessage.insert(QStringLiteral("categoryIcon"), KDE::icon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
     genericMessage.insert(QStringLiteral("text"), plainText);
     Q_EMIT m_pluginView->message(genericMessage);
 }

addons/project/gitwidget.cpp

@@ -43,6 +43,7 @@
 #include <QtConcurrentRun>
 
 #include <KActionCollection>
+#include <KIconLoader>
 #include <KLocalizedString>
 #include <KMessageBox>
 
@@ -456,7 +457,7 @@ void GitWidget::sendMessage(const QString &plainText, bool warn)
     QVariantMap genericMessage;
     genericMessage.insert(QStringLiteral("type"), warn ? QStringLiteral("Error") : QStringLiteral("Info"));
     genericMessage.insert(QStringLiteral("category"), i18n("Git"));
-    genericMessage.insert(QStringLiteral("categoryIcon"), QIcon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
+    genericMessage.insert(QStringLiteral("categoryIcon"), KDE::icon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
     genericMessage.insert(QStringLiteral("text"), plainText);
     Q_EMIT m_pluginView->message(genericMessage);
 }

addons/project/kateprojectview.cpp

@@ -20,6 +20,7 @@
 
 #include <KAcceleratorManager>
 #include <KActionCollection>
+#include <KIconLoader>
 #include <KLineEdit>
 #include <KLocalizedString>
 
@@ -77,7 +78,7 @@ KateProjectView::KateProjectView(KateProjectPluginView *pluginView, KateProject
         BranchCheckoutDialog bd(mainWindow->window(), m_pluginView, m_project->baseDir());
         bd.openDialog();
     });
-    currBranchAct->setIcon(QIcon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
+    currBranchAct->setIcon(KDE::icon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
     m_branchBtn->setDefaultAction(currBranchAct);
 
     checkAndRefreshGit();
@@ -154,7 +155,7 @@ void KateProjectView::showFileGitHistory(const QString &file)
         QVariantMap genericMessage;
         genericMessage.insert(QStringLiteral("type"), warn ? QStringLiteral("Error") : QStringLiteral("Info"));
         genericMessage.insert(QStringLiteral("category"), i18n("Git"));
-        genericMessage.insert(QStringLiteral("categoryIcon"), QIcon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
+        genericMessage.insert(QStringLiteral("categoryIcon"), KDE::icon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
         genericMessage.insert(QStringLiteral("text"), s);
         Q_EMIT m_pluginView->message(genericMessage);
     });

apps/lib/CMakeLists.txt

@@ -30,10 +30,11 @@ find_package(
   QUIET
   REQUIRED
   COMPONENTS
+    Crash
+    DBusAddons
+    IconThemes
     TextEditor
     WindowSystem
-    DBusAddons
-    Crash
   OPTIONAL_COMPONENTS
     Activities
 )
@@ -41,12 +42,13 @@ find_package(
 target_link_libraries(
   kateprivate
   PUBLIC
+    KF5::CoreAddons
+    KF5::Crash
+    KF5::DBusAddons
     KF5::I18n
+    KF5::IconThemes
     KF5::TextEditor
     KF5::WindowSystem
-    KF5::DBusAddons
-    KF5::Crash
-    KF5::CoreAddons
 )
 
 if(KF5Activities_FOUND)