From 2d415c822876f5ccc475d5f5c000d58717c51c4a Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 2 Dec 2013 23:28:21 +0200
Subject: [PATCH] Git: Use initStyleOption instead of setting options in paint

Change-Id: Idc14c157478c7092fce7d688044cb0a99e47bebe
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---
 src/plugins/git/gitplugin.cpp     | 7 +++----
 src/plugins/git/logchangedialog.h | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index f055c3f4b31..c6b5cf02bb6 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -807,12 +807,11 @@ class ResetItemDelegate : public LogItemDelegate
 {
 public:
     ResetItemDelegate(LogChangeWidget *widget) : LogItemDelegate(widget) {}
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+    void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const
     {
-        QStyleOptionViewItem o = option;
         if (index.row() < currentRow())
-            o.font.setStrikeOut(true);
-        QStyledItemDelegate::paint(painter, o, index);
+            option->font.setStrikeOut(true);
+        LogItemDelegate::initStyleOption(option, index);
     }
 };
 
diff --git a/src/plugins/git/logchangedialog.h b/src/plugins/git/logchangedialog.h
index f95604d84c8..9996c2f5bb2 100644
--- a/src/plugins/git/logchangedialog.h
+++ b/src/plugins/git/logchangedialog.h
@@ -102,8 +102,6 @@ protected:
     LogItemDelegate(LogChangeWidget *widget);
 
     int currentRow() const;
-    virtual void paint(QPainter *painter, const QStyleOptionViewItem &option,
-                       const QModelIndex &index) const = 0;
 
 private:
     LogChangeWidget *m_widget;
-- 
GitLab