From 59556dfc6a07a076d398bf48a092c02c18068fdc Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Wed, 8 Mar 2017 13:22:50 +0800
Subject: [PATCH] Cleanup & refactor

---
 src/gui/properties/proplistdelegate.cpp | 45 +++++++++++++------------
 src/gui/properties/proplistdelegate.h   | 10 +++---
 src/gui/search/searchlistdelegate.cpp   |  2 +-
 src/gui/search/searchlistdelegate.h     |  4 +--
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/gui/properties/proplistdelegate.cpp b/src/gui/properties/proplistdelegate.cpp
index 68bc859ca..cb4e86ce9 100644
--- a/src/gui/properties/proplistdelegate.cpp
+++ b/src/gui/properties/proplistdelegate.cpp
@@ -76,33 +76,34 @@ void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
 
     switch(index.column()) {
     case PCSIZE:
-        QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(index.data().toLongLong()));
-        break;
     case REMAINING:
         QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(index.data().toLongLong()));
         break;
-    case PROGRESS:
-        if (index.data().toDouble() >= 0) {
-            QStyleOptionProgressBar newopt;
-            qreal progress = index.data().toDouble() * 100.;
-            newopt.rect = opt.rect;
-            newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%");
-            newopt.progress = (int)progress;
-            newopt.maximum = 100;
-            newopt.minimum = 0;
-            newopt.textVisible = true;
-            if (index.sibling(index.row(), PRIORITY).data().toInt() == prio::IGNORED) {
-                newopt.state &= ~QStyle::State_Enabled;
-                newopt.palette = progressBarDisabledPalette();
-            }
-            else
-                newopt.state |= QStyle::State_Enabled;
+    case PROGRESS: {
+        if (index.data().toDouble() < 0)
+            break;
+
+        QStyleOptionProgressBar newopt;
+        qreal progress = index.data().toDouble() * 100.;
+        newopt.rect = opt.rect;
+        newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%");
+        newopt.progress = int(progress);
+        newopt.maximum = 100;
+        newopt.minimum = 0;
+        newopt.textVisible = true;
+        if (index.sibling(index.row(), PRIORITY).data().toInt() == prio::IGNORED) {
+            newopt.state &= ~QStyle::State_Enabled;
+            newopt.palette = progressBarDisabledPalette();
+        }
+        else {
+            newopt.state |= QStyle::State_Enabled;
+        }
+
 #ifndef Q_OS_WIN
-            QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
+        QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
 #else
-            // XXX: To avoid having the progress text on the right of the bar
-            QProxyStyle st("fusion");
-            st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0);
+        // XXX: To avoid having the progress text on the right of the bar
+        QProxyStyle("fusion").drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0);
 #endif
         }
         break;
diff --git a/src/gui/properties/proplistdelegate.h b/src/gui/properties/proplistdelegate.h
index 5c70fd2d7..90b8babe9 100644
--- a/src/gui/properties/proplistdelegate.h
+++ b/src/gui/properties/proplistdelegate.h
@@ -56,13 +56,13 @@ class PropListDelegate : public QItemDelegate
 public:
     PropListDelegate(PropertiesWidget *properties);
 
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
-    void setEditorData(QWidget *editor, const QModelIndex &index) const;
-    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, const QModelIndex &index) const;
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+    void setEditorData(QWidget *editor, const QModelIndex &index) const override;
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, const QModelIndex &index) const override;
 
 public slots:
-    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
-    void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const;
+    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
+    void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const override;
 
 signals:
     void filteredFilesChanged() const;
diff --git a/src/gui/search/searchlistdelegate.cpp b/src/gui/search/searchlistdelegate.cpp
index 233133c1f..16c79afff 100644
--- a/src/gui/search/searchlistdelegate.cpp
+++ b/src/gui/search/searchlistdelegate.cpp
@@ -69,5 +69,5 @@ void SearchListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
 QWidget *SearchListDelegate::createEditor(QWidget *, const QStyleOptionViewItem &, const QModelIndex &) const
 {
     // No editor here
-    return 0;
+    return nullptr;
 }
diff --git a/src/gui/search/searchlistdelegate.h b/src/gui/search/searchlistdelegate.h
index 91e0e46a4..2131d5bfa 100644
--- a/src/gui/search/searchlistdelegate.h
+++ b/src/gui/search/searchlistdelegate.h
@@ -38,8 +38,8 @@ class SearchListDelegate: public QItemDelegate
 public:
     explicit SearchListDelegate(QObject *parent);
 
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
-    QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const;
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+    QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const override;
 };
 
 #endif