Git: Use Utils::Icon for IconItemDelegate constructor

Use our icon abstraction instead of file names, because themed icons are
coming.

Change-Id: I0f4e44caf96aeab0c354d2166b111d59b7b29149
Reviewed-by: Orgad Shaneh <[email protected]>

4 files changed, 8 insertions, 5 deletions

diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp
index 61688746bfc..d0f618d8e43 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.cpp
+++ b/src/plugins/git/gerrit/gerritpushdialog.cpp
@@ -31,6 +31,8 @@
 #include "../gitclient.h"
 #include "../gitconstants.h"
 
+#include <utils/icon.h>
+
 #include <QDateTime>
 #include <QDir>
 #include <QPushButton>
@@ -45,7 +47,7 @@ class PushItemDelegate : public IconItemDelegate
 {
 public:
     PushItemDelegate(LogChangeWidget *widget)
-        : IconItemDelegate(widget, ":/git/images/arrowup.png")
+        : IconItemDelegate(widget, Utils::Icon(":/git/images/arrowup.png"))
     {
     }
 
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index b8746962c21..98c94260b3e 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -743,7 +743,7 @@ class RebaseItemDelegate : public IconItemDelegate
 {
 public:
     RebaseItemDelegate(LogChangeWidget *widget)
-        : IconItemDelegate(widget, Utils::Icons::UNDO.imageFileName())
+        : IconItemDelegate(widget, Utils::Icons::UNDO)
     {
     }
 
diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp
index 4b5a7b14e1e..301c6ac903e 100644
--- a/src/plugins/git/logchangedialog.cpp
+++ b/src/plugins/git/logchangedialog.cpp
@@ -279,9 +279,9 @@ int LogItemDelegate::currentRow() const
     return m_widget->commitIndex();
 }
 
-IconItemDelegate::IconItemDelegate(LogChangeWidget *widget, const QString &icon)
+IconItemDelegate::IconItemDelegate(LogChangeWidget *widget, const Utils::Icon &icon)
     : LogItemDelegate(widget)
-    , m_icon(icon)
+    , m_icon(icon.icon())
 {
 }
 
diff --git a/src/plugins/git/logchangedialog.h b/src/plugins/git/logchangedialog.h
index 06aae758449..19ec7a2ee9f 100644
--- a/src/plugins/git/logchangedialog.h
+++ b/src/plugins/git/logchangedialog.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include <utils/icon.h>
 #include <utils/itemviews.h>
 
 #include <QDialog>
@@ -114,7 +115,7 @@ private:
 class IconItemDelegate : public LogItemDelegate
 {
 public:
-    IconItemDelegate(LogChangeWidget *widget, const QString &icon);
+    IconItemDelegate(LogChangeWidget *widget, const Utils::Icon &icon);
 
     virtual bool hasIcon(int row) const = 0;