QtBase: examples/widgets/itemviews code style

Change-Id: I78a7745f7dc3add3fd7780220118d1b35b50a941
Reviewed-by: hjk <qthjk@ovi.com>

6 files changed, 36 insertions, 32 deletions

diff --git a/examples/widgets/itemviews/spreadsheet/main.cpp b/examples/widgets/itemviews/spreadsheet/main.cpp
index 25fd243b26..ae29d22e18 100644
--- a/examples/widgets/itemviews/spreadsheet/main.cpp
+++ b/examples/widgets/itemviews/spreadsheet/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
 #include "spreadsheet.h"
 
+#include <QApplication>
+
 int main(int argc, char** argv) {
     Q_INIT_RESOURCE(spreadsheet);
     QApplication app(argc, argv);
diff --git a/examples/widgets/itemviews/spreadsheet/printview.cpp b/examples/widgets/itemviews/spreadsheet/printview.cpp
index b673d48361..ec7df077c9 100644
--- a/examples/widgets/itemviews/spreadsheet/printview.cpp
+++ b/examples/widgets/itemviews/spreadsheet/printview.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "printview.h"
-
 #ifndef QT_NO_PRINTER
 #include <QPrinter>
 #endif
 #include <QStyleOptionViewItem>
 
+#include "printview.h"
+
 PrintView::PrintView()
 {
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp
index 2140ed8b5d..56966fc49f 100644
--- a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp
+++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp
@@ -69,7 +69,7 @@ SpreadSheet::SpreadSheet(int rows, int cols, QWidget *parent)
         table->setHorizontalHeaderItem(c, new QTableWidgetItem(character));
     }
 
-    table->setItemPrototype(table->item(rows -1, cols - 1));
+    table->setItemPrototype(table->item(rows - 1, cols - 1));
     table->setItemDelegate(new SpreadSheetDelegate());
 
     createActions();
@@ -168,10 +168,8 @@ void SpreadSheet::setupMenuBar()
 void SpreadSheet::updateStatus(QTableWidgetItem *item)
 {
     if (item && item == table->currentItem()) {
-        statusBar()->showMessage(item->data(Qt::StatusTipRole).toString(),
-                                 1000);
-        cellLabel->setText(tr("Cell: (%1)").arg(encode_pos(table->row(item),
-                                                           table->column(item))));
+        statusBar()->showMessage(item->data(Qt::StatusTipRole).toString(), 1000);
+        cellLabel->setText(tr("Cell: (%1)").arg(encode_pos(table->row(item), table->column(item))));
     }
 }
 
@@ -236,9 +234,10 @@ void SpreadSheet::selectColor()
     if (selected.count() == 0)
         return;
 
-    foreach(QTableWidgetItem *i, selected)
+    foreach (QTableWidgetItem *i, selected) {
         if (i)
             i->setBackgroundColor(col);
+    }
 
     updateColor(table->currentItem());
 }
@@ -254,9 +253,10 @@ void SpreadSheet::selectFont()
 
     if (!ok)
         return;
-    foreach(QTableWidgetItem *i, selected)
+    foreach (QTableWidgetItem *i, selected) {
         if (i)
             i->setFont(fnt);
+    }
 }
 
 bool SpreadSheet::runInputDialog(const QString &title,
@@ -407,7 +407,8 @@ void SpreadSheet::actionSum()
     if (runInputDialog(tr("Sum cells"), tr("First cell:"), tr("Last cell:"),
                        QString("%1").arg(QChar(0x03a3)), tr("Output to:"),
                        &cell1, &cell2, &out)) {
-        int row, col;
+        int row;
+        int col;
         decode_pos(out, &row, &col);
         table->item(row, col)->setText(tr("sum %1 %2").arg(cell1, cell2));
     }
@@ -631,8 +632,7 @@ void SpreadSheet::print()
     QPrintPreviewDialog dlg(&printer);
     PrintView view;
     view.setModel(table->model());
-    connect(&dlg, SIGNAL(paintRequested(QPrinter*)),
-            &view, SLOT(print(QPrinter*)));
+    connect(&dlg, SIGNAL(paintRequested(QPrinter*)), &view, SLOT(print(QPrinter*)));
     dlg.exec();
 #endif
 }
diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.cpp b/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.cpp
index a33ac4704b..59185f3354 100644
--- a/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.cpp
+++ b/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "spreadsheetdelegate.h"
+
 #include <QtWidgets>
 
 SpreadSheetDelegate::SpreadSheetDelegate(QObject *parent)
@@ -70,8 +71,7 @@ QWidget *SpreadSheetDelegate::createEditor(QWidget *parent,
 
     QCompleter *autoComplete = new QCompleter(allStrings);
     editor->setCompleter(autoComplete);
-    connect(editor, SIGNAL(editingFinished()),
-        this, SLOT(commitAndCloseEditor()));
+    connect(editor, SIGNAL(editingFinished()), this, SLOT(commitAndCloseEditor()));
     return editor;
 }
 
@@ -88,13 +88,14 @@ void SpreadSheetDelegate::setEditorData(QWidget *editor,
     QLineEdit *edit = qobject_cast<QLineEdit*>(editor);
     if (edit) {
         edit->setText(index.model()->data(index, Qt::EditRole).toString());
-    } else {
-        QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
-        if (dateEditor) {
-            dateEditor->setDate(QDate::fromString(
-            index.model()->data(index, Qt::EditRole).toString(),
-            "d/M/yyyy"));
-        }
+        return;
+    }
+
+    QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
+    if (dateEditor) {
+        dateEditor->setDate(QDate::fromString(
+                                index.model()->data(index, Qt::EditRole).toString(),
+                                "d/M/yyyy"));
     }
 }
 
@@ -104,11 +105,10 @@ void SpreadSheetDelegate::setModelData(QWidget *editor,
     QLineEdit *edit = qobject_cast<QLineEdit *>(editor);
     if (edit) {
         model->setData(index, edit->text());
-    } else {
-        QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
-        if (dateEditor) {
-            model->setData(index, dateEditor->date().toString("dd/M/yyyy"));
-        }
+        return;
     }
-}
 
+    QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
+    if (dateEditor)
+        model->setData(index, dateEditor->date().toString("dd/M/yyyy"));
+}
diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.h b/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.h
index cdefb4b1df..dc674ba89e 100644
--- a/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.h
+++ b/examples/widgets/itemviews/spreadsheet/spreadsheetdelegate.h
@@ -42,9 +42,10 @@
 #ifndef SPREADSHEETDELEGATE_H
 #define SPREADSHEETDELEGATE_H
 
-#include <QItemDelegate>
 #include "spreadsheet.h"
 
+#include <QItemDelegate>
+
 class SpreadSheetDelegate : public QItemDelegate
 {
     Q_OBJECT
diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheetitem.h b/examples/widgets/itemviews/spreadsheet/spreadsheetitem.h
index 5eb9a35c4c..10b281a17e 100644
--- a/examples/widgets/itemviews/spreadsheet/spreadsheetitem.h
+++ b/examples/widgets/itemviews/spreadsheet/spreadsheetitem.h
@@ -42,10 +42,10 @@
 #ifndef SPREADSHEETITEM_H
 #define SPREADSHEETITEM_H
 
-#include <QTableWidgetItem>
-#include <QtWidgets>
 #include "spreadsheet.h"
 
+#include <QTableWidgetItem>
+
 class SpreadSheetItem : public QTableWidgetItem
 {
 public:
@@ -59,7 +59,9 @@ public:
     QVariant display() const;
 
     inline QString formula() const
-    { return QTableWidgetItem::data(Qt::DisplayRole).toString(); }
+    {
+        return QTableWidgetItem::data(Qt::DisplayRole).toString();
+    }
 
     static QVariant computeFormula(const QString &formula,
                                    const QTableWidget *widget,