Themed Icons: Introduce Utils::Icon

Instead of describing icons via file name or in the themed icons case
via
a string that is a list of mask/color pairs, we have now a class for it.

Icons are now listed in per-plugin *icons.h headers.

RunControl::m_icon was The only place left where an icon property was in
fact a string. This patch changes that member to be a Utils::Icon.

Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp
index bb70085c90..0a43518c9f 100644
--- a/src/plugins/diffeditor/diffview.cpp
+++ b/src/plugins/diffeditor/diffview.cpp
@@ -30,11 +30,11 @@
 
 #include "diffview.h"
 
+#include "diffeditoricons.h"
 #include "unifieddiffeditorwidget.h"
 #include "sidebysidediffeditorwidget.h"
 
 #include <utils/qtcassert.h>
-#include <utils/themehelper.h>
 
 #include <QCoreApplication>
 
@@ -97,8 +97,7 @@ void IDiffView::setSyncToolTip(const QString &text)
 UnifiedView::UnifiedView() : m_widget(0)
 {
     setId(UNIFIED_VIEW_ID);
-    setIcon(Utils::ThemeHelper::themedIcon(
-                QLatin1String(":/diffeditor/images/unifieddiff.png")));
+    setIcon(Icons::UNIFIED_DIFF.icon());
     setToolTip(QCoreApplication::translate("DiffEditor::UnifiedView", "Switch to Unified Diff Editor"));
 }
 
@@ -154,8 +153,7 @@ void UnifiedView::setSync(bool sync)
 SideBySideView::SideBySideView() : m_widget(0)
 {
     setId(SIDE_BY_SIDE_VIEW_ID);
-    setIcon(Utils::ThemeHelper::themedIcon(
-                QLatin1String(":/diffeditor/images/sidebysidediff.png")));
+    setIcon(Icons::UNIFIED_DIFF.icon());
     setToolTip(QCoreApplication::translate("DiffEditor::SideBySideView",
                                            "Switch to Side By Side Diff Editor"));
     setSupportsSync(true);