Cleanup Spreadsheet example

Cleanup the Spreadsheet example:
 - use nullptr
 - use for instead foreach

Change-Id: I55deed157403a46d98a6d753ef46e4cbe5730b4f
Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>

1 files changed, 11 insertions, 22 deletions

diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp b/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp
index 92cbaff031..62d3a6fdcd 100644
--- a/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp
+++ b/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp
@@ -50,19 +50,9 @@
 
 #include "spreadsheetitem.h"
 
-SpreadSheetItem::SpreadSheetItem()
-        : QTableWidgetItem(), isResolving(false)
-{
-}
-
-SpreadSheetItem::SpreadSheetItem(const QString &text)
-        : QTableWidgetItem(text), isResolving(false)
-{
-}
-
 QTableWidgetItem *SpreadSheetItem::clone() const
 {
-    SpreadSheetItem *item = new SpreadSheetItem();
+    SpreadSheetItem *item = new SpreadSheetItem;
     *item = *this;
     return item;
 }
@@ -75,21 +65,20 @@ QVariant SpreadSheetItem::data(int role) const
     if (role == Qt::DisplayRole)
         return display();
 
-    QString t = display().toString();
-    bool isNumber = false;
-    int number = t.toInt(&isNumber);
+    const QString t = display().toString();
 
     if (role == Qt::ForegroundRole) {
-        if (!isNumber)
-            return QVariant::fromValue(QColor(Qt::black));
-        else if (number < 0)
-            return QVariant::fromValue(QColor(Qt::red));
-        return QVariant::fromValue(QColor(Qt::blue));
+        bool isNumber = false;
+        const int number = t.toInt(&isNumber);
+        QColor color = Qt::black;
+        if (isNumber)
+            color = (number < 0) ? Qt::red : Qt::blue;
+        return QVariant::fromValue(color);
     }
 
-     if (role == Qt::TextAlignmentRole)
-         if (!t.isEmpty() && (t.at(0).isNumber() || t.at(0) == '-'))
-             return (int)(Qt::AlignRight | Qt::AlignVCenter);
+    if (role == Qt::TextAlignmentRole)
+        if (!t.isEmpty() && (t.at(0).isNumber() || t.at(0) == '-'))
+            return int(Qt::AlignRight | Qt::AlignVCenter);
 
      return QTableWidgetItem::data(role);
  }