QtBase: examples/widgets/itemviews code style

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

examples/widgets/itemviews/basicsortfiltermodel/main.cpp

@@ -38,10 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "window.h"
 
+#include <QApplication>
+#include <QStandardItemModel>
+#include <QTime>
+
 void addMail(QAbstractItemModel *model, const QString &subject,
              const QString &sender, const QDateTime &date)
 {

examples/widgets/itemviews/basicsortfiltermodel/window.h

@@ -85,4 +85,4 @@ private:
     QComboBox *filterColumnComboBox;
 };
 
-#endif
+#endif // WINDOW_H

examples/widgets/itemviews/chart/mainwindow.cpp

@@ -103,15 +103,17 @@ void MainWindow::openFile(const QString &path)
 {
     QString fileName;
     if (path.isNull())
-        fileName = QFileDialog::getOpenFileName(this, tr("Choose a data file"),
+        fileName = QFileDialog::getOpenFileName(this, tr("Choose a data file"), "", "*.cht");
-                                                "", "*.cht");
     else
         fileName = path;
 
-    if (!fileName.isEmpty()) {
+    if (fileName.isEmpty())
-        QFile file(fileName);
+        return;
+
+    QFile file(fileName);
+    if (!file.open(QFile::ReadOnly | QFile::Text))
+        return;
 
-        if (file.open(QFile::ReadOnly | QFile::Text)) {
     QTextStream stream(&file);
     QString line;
 
@@ -121,7 +123,6 @@ void MainWindow::openFile(const QString &path)
     do {
         line = stream.readLine();
         if (!line.isEmpty()) {
-
             model->insertRows(row, 1, QModelIndex());
 
             QStringList pieces = line.split(",", QString::SkipEmptyParts);
@@ -138,19 +139,20 @@ void MainWindow::openFile(const QString &path)
     file.close();
     statusBar()->showMessage(tr("Loaded %1").arg(fileName), 2000);
 }
-    }
-}
 
 void MainWindow::saveFile()
 {
     QString fileName = QFileDialog::getSaveFileName(this,
         tr("Save file as"), "", "*.cht");
 
-    if (!fileName.isEmpty()) {
+    if (fileName.isEmpty())
-        QFile file(fileName);
+        return;
-        QTextStream stream(&file);
 
-        if (file.open(QFile::WriteOnly | QFile::Text)) {
+    QFile file(fileName);
+    if (!file.open(QFile::WriteOnly | QFile::Text))
+        return;
+
+    QTextStream stream(&file);
     for (int row = 0; row < model->rowCount(QModelIndex()); ++row) {
 
         QStringList pieces;
@@ -164,9 +166,7 @@ void MainWindow::saveFile()
 
         stream << pieces.join(',') << "\n";
     }
-        }
 
     file.close();
     statusBar()->showMessage(tr("Saved %1").arg(fileName), 2000);
 }
-}

examples/widgets/itemviews/chart/mainwindow.h

@@ -69,4 +69,4 @@ private:
     QItemSelectionModel *selectionModel;
 };
 
-#endif
+#endif // MAINWINDOW_H

examples/widgets/itemviews/chart/pieview.cpp

@@ -150,7 +150,7 @@ QModelIndex PieView::indexAt(const QPoint &point) const
                     return model()->index(row, 0, rootIndex());
 
                 // Update the list index that corresponds to the next valid row.
-                validRow++;
+                ++validRow;
             }
         }
     }
@@ -182,7 +182,8 @@ QRect PieView::itemRect(const QModelIndex &index) const
     else
         valueIndex = index;
 
-    if (model()->data(valueIndex).toDouble() > 0.0) {
+    if (model()->data(valueIndex).toDouble() <= 0.0)
+        return QRect();
 
     int listItem = 0;
     for (int row = index.row()-1; row >= 0; --row) {
@@ -202,8 +203,6 @@ QRect PieView::itemRect(const QModelIndex &index) const
     case 1:
         return viewport()->rect();
     }
-
-    }
     return QRect();
 }
 
@@ -322,7 +321,8 @@ void PieView::paintEvent(QPaintEvent *event)
     // Viewport rectangles
     QRect pieRect = QRect(margin, margin, pieSize, pieSize);
 
-    if (validItems > 0) {
+    if (validItems <= 0)
+        return;
 
     painter.save();
     painter.translate(pieRect.x() - horizontalScrollBar()->value(),
@@ -332,7 +332,6 @@ void PieView::paintEvent(QPaintEvent *event)
     int row;
 
     for (row = 0; row < model()->rowCount(rootIndex()); ++row) {
-
         QModelIndex index = model()->index(row, 1, rootIndex());
         double value = model()->data(index).toDouble();
 
@@ -340,8 +339,7 @@ void PieView::paintEvent(QPaintEvent *event)
             double angle = 360*value/totalValue;
 
             QModelIndex colorIndex = model()->index(row, 0, rootIndex());
-                QColor color = QColor(model()->data(colorIndex,
+            QColor color = QColor(model()->data(colorIndex, Qt::DecorationRole).toString());
-                                Qt::DecorationRole).toString());
 
             if (currentIndex() == index)
                 painter.setBrush(QBrush(color, Qt::Dense4Pattern));
@@ -350,8 +348,7 @@ void PieView::paintEvent(QPaintEvent *event)
             else
                 painter.setBrush(QBrush(color));
 
-                painter.drawPie(0, 0, pieSize, pieSize, int(startAngle*16),
+            painter.drawPie(0, 0, pieSize, pieSize, int(startAngle*16), int(angle*16));
-                                int(angle*16));
 
             startAngle += angle;
         }
@@ -361,7 +358,6 @@ void PieView::paintEvent(QPaintEvent *event)
     int keyNumber = 0;
 
     for (row = 0; row < model()->rowCount(rootIndex()); ++row) {
-
         QModelIndex index = model()->index(row, 1, rootIndex());
         double value = model()->data(index).toDouble();
 
@@ -376,8 +372,7 @@ void PieView::paintEvent(QPaintEvent *event)
                 option.state |= QStyle::State_HasFocus;
             itemDelegate()->paint(&painter, option, labelIndex);
 
-                keyNumber++;
+            ++keyNumber;
-            }
         }
     }
 }
@@ -395,13 +390,12 @@ int PieView::rows(const QModelIndex &index) const
 void PieView::rowsInserted(const QModelIndex &parent, int start, int end)
 {
     for (int row = start; row <= end; ++row) {
-
         QModelIndex index = model()->index(row, 1, rootIndex());
         double value = model()->data(index).toDouble();
 
         if (value > 0.0) {
             totalValue += value;
-            validItems++;
+            ++validItems;
         }
     }
 
@@ -411,12 +405,11 @@ void PieView::rowsInserted(const QModelIndex &parent, int start, int end)
 void PieView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
 {
     for (int row = start; row <= end; ++row) {
-
         QModelIndex index = model()->index(row, 1, rootIndex());
         double value = model()->data(index).toDouble();
         if (value > 0.0) {
             totalValue -= value;
-            validItems--;
+            --validItems;
         }
     }
 
@@ -433,21 +426,23 @@ void PieView::scrollTo(const QModelIndex &index, ScrollHint)
     QRect area = viewport()->rect();
     QRect rect = visualRect(index);
 
-    if (rect.left() < area.left())
+    if (rect.left() < area.left()) {
         horizontalScrollBar()->setValue(
             horizontalScrollBar()->value() + rect.left() - area.left());
-    else if (rect.right() > area.right())
+    } else if (rect.right() > area.right()) {
         horizontalScrollBar()->setValue(
             horizontalScrollBar()->value() + qMin(
                 rect.right() - area.right(), rect.left() - area.left()));
+    }
 
-    if (rect.top() < area.top())
+    if (rect.top() < area.top()) {
         verticalScrollBar()->setValue(
             verticalScrollBar()->value() + rect.top() - area.top());
-    else if (rect.bottom() > area.bottom())
+    } else if (rect.bottom() > area.bottom()) {
         verticalScrollBar()->setValue(
             verticalScrollBar()->value() + qMin(
                 rect.bottom() - area.bottom(), rect.top() - area.top()));
+    }
 
     update();
 }
@@ -524,12 +519,12 @@ int PieView::verticalOffset() const
 QRect PieView::visualRect(const QModelIndex &index) const
 {
     QRect rect = itemRect(index);
-    if (rect.isValid())
+    if (!rect.isValid())
+        return rect;
+
     return QRect(rect.left() - horizontalScrollBar()->value(),
                  rect.top() - verticalScrollBar()->value(),
                  rect.width(), rect.height());
-    else
-        return rect;
 }
 
 /*

examples/widgets/itemviews/chart/pieview.h

@@ -42,18 +42,6 @@
 #define PIEVIEW_H
 
 #include <QAbstractItemView>
-#include <QFont>
-#include <QItemSelection>
-#include <QItemSelectionModel>
-#include <QModelIndex>
-#include <QRect>
-#include <QSize>
-#include <QPoint>
-#include <QWidget>
-
-QT_BEGIN_NAMESPACE
-class QRubberBand;
-QT_END_NAMESPACE
 
 //! [0]
 class PieView : public QAbstractItemView
@@ -68,7 +56,8 @@ public:
     QModelIndex indexAt(const QPoint &point) const;
 
 protected slots:
-    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> & = QVector<int>());
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
+                     const QVector<int> &roles = QVector<int>());
     void rowsInserted(const QModelIndex &parent, int start, int end);
     void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
 
@@ -111,4 +100,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // PIEVIEW_H

examples/widgets/itemviews/combowidgetmapper/window.h

@@ -83,4 +83,4 @@ private:
 };
 //! [Window definition]
 
-#endif
+#endif // WINDOW_H

examples/widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.h

@@ -70,4 +70,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // MYSORTFILTERPROXYMODEL_H

examples/widgets/itemviews/customsortfiltermodel/window.h

@@ -87,4 +87,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // WINDOW_H

examples/widgets/itemviews/dirview/main.cpp

@@ -38,7 +38,9 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QFileSystemModel>
+#include <QTreeView>
 
 int main(int argc, char *argv[])
 {

examples/widgets/itemviews/editabletreemodel/main.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
 
 #include "mainwindow.h"
 

examples/widgets/itemviews/editabletreemodel/mainwindow.cpp

@@ -38,17 +38,16 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "mainwindow.h"
 #include "treemodel.h"
 
+#include <QFile>
+
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {
     setupUi(this);
 
-
     QStringList headers;
     headers << tr("Title") << tr("Description");
 
@@ -95,8 +94,7 @@ void MainWindow::insertChild()
         QModelIndex child = model->index(0, column, index);
         model->setData(child, QVariant("[No data]"), Qt::EditRole);
         if (!model->headerData(column, Qt::Horizontal).isValid())
-            model->setHeaderData(column, Qt::Horizontal, QVariant("[No header]"),
+            model->setHeaderData(column, Qt::Horizontal, QVariant("[No header]"), Qt::EditRole);
-                                 Qt::EditRole);
     }
 
     view->selectionModel()->setCurrentIndex(model->index(0, 0, index),
@@ -112,8 +110,7 @@ bool MainWindow::insertColumn(const QModelIndex &parent)
     // Insert a column in the parent item.
     bool changed = model->insertColumn(column + 1, parent);
     if (changed)
-        model->setHeaderData(column + 1, Qt::Horizontal, QVariant("[No header]"),
+        model->setHeaderData(column + 1, Qt::Horizontal, QVariant("[No header]"), Qt::EditRole);
-                             Qt::EditRole);
 
     updateActions();
 

examples/widgets/itemviews/editabletreemodel/mainwindow.h

@@ -41,14 +41,10 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
-#include <QModelIndex>
-
 #include "ui_mainwindow.h"
 
-class QAction;
+#include <QMainWindow>
-class QTreeView;
+#include <QModelIndex>
-class QWidget;
 
 class MainWindow : public QMainWindow, private Ui::MainWindow
 {
@@ -68,4 +64,4 @@ private slots:
     void removeRow();
 };
 
-#endif
+#endif // MAINWINDOW_H

examples/widgets/itemviews/editabletreemodel/treeitem.cpp

@@ -44,10 +44,10 @@
     A container for items of data supplied by the simple tree model.
 */
 
-#include <QStringList>
-
 #include "treeitem.h"
 
+#include <QStringList>
+
 //! [0]
 TreeItem::TreeItem(const QVector<QVariant> &data, TreeItem *parent)
 {

examples/widgets/itemviews/editabletreemodel/treeitem.h

@@ -71,4 +71,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // TREEITEM_H

examples/widgets/itemviews/editabletreemodel/treemodel.cpp

@@ -44,8 +44,7 @@
 #include "treemodel.h"
 
 //! [0]
-TreeModel::TreeModel(const QStringList &headers, const QString &data,
+TreeModel::TreeModel(const QStringList &headers, const QString &data, QObject *parent)
-                     QObject *parent)
     : QAbstractItemModel(parent)
 {
     QVector<QVariant> rootData;
@@ -99,7 +98,8 @@ TreeItem *TreeModel::getItem(const QModelIndex &index) const
 {
     if (index.isValid()) {
         TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
-        if (item) return item;
+        if (item)
+            return item;
     }
     return rootItem;
 }
@@ -206,8 +206,7 @@ int TreeModel::rowCount(const QModelIndex &parent) const
 }
 //! [8]
 
-bool TreeModel::setData(const QModelIndex &index, const QVariant &value,
+bool TreeModel::setData(const QModelIndex &index, const QVariant &value, int role)
-                        int role)
 {
     if (role != Qt::EditRole)
         return false;
@@ -249,7 +248,7 @@ void TreeModel::setupModelData(const QStringList &lines, TreeItem *parent)
         while (position < lines[number].length()) {
             if (lines[number].mid(position, 1) != " ")
                 break;
-            position++;
+            ++position;
         }
 
         QString lineData = lines[number].mid(position).trimmed();
@@ -283,6 +282,6 @@ void TreeModel::setupModelData(const QStringList &lines, TreeItem *parent)
                 parent->child(parent->childCount() - 1)->setData(column, columnData[column]);
         }
 
-        number++;
+        ++number;
     }
 }

examples/widgets/itemviews/editabletreemodel/treemodel.h

@@ -94,4 +94,4 @@ private:
 };
 //! [2]
 
-#endif
+#endif // TREEMODEL_H

examples/widgets/itemviews/fetchmore/filelistmodel.cpp

@@ -39,10 +39,11 @@
 ****************************************************************************/
 
 #include "filelistmodel.h"
+
 #include <QApplication>
-#include <QPalette>
 #include <QBrush>
 #include <QDir>
+#include <QPalette>
 
 FileListModel::FileListModel(QObject *parent)
     : QAbstractListModel(parent)
@@ -63,9 +64,9 @@ QVariant FileListModel::data(const QModelIndex &index, int role) const
     if (index.row() >= fileList.size() || index.row() < 0)
         return QVariant();
     
-    if (role == Qt::DisplayRole)
+    if (role == Qt::DisplayRole) {
         return fileList.at(index.row());
-    else if (role == Qt::BackgroundRole) {
+    } else if (role == Qt::BackgroundRole) {
         int batch = (index.row() / 100) % 2;
         if (batch == 0)
             return qApp->palette().base();

examples/widgets/itemviews/fetchmore/filelistmodel.h

@@ -72,4 +72,4 @@ private:
 };
 //![0]
 
-#endif
+#endif // FILELISTMODEL_H

examples/widgets/itemviews/fetchmore/main.cpp

@@ -38,9 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
 #include "window.h"
 
+#include <QApplication>
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);

examples/widgets/itemviews/fetchmore/window.cpp

@@ -38,10 +38,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
 #include "filelistmodel.h"
 #include "window.h"
 
+#include <QtWidgets>
+
 Window::Window(QWidget *parent)
     : QWidget(parent)
 {

examples/widgets/itemviews/fetchmore/window.h

@@ -61,4 +61,4 @@ private:
     QTextBrowser *logViewer;
 };
 
-#endif
+#endif // WINDOW_H

examples/widgets/itemviews/frozencolumn/freezetablewidget.cpp

@@ -38,10 +38,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "freezetablewidget.h"
 
+#include <QScrollBar>
+#include <QHeaderView>
+
 //! [constructor]
 FreezeTableWidget::FreezeTableWidget(QAbstractItemModel * model)
 {
@@ -86,7 +87,7 @@ void FreezeTableWidget::init()
                                      "background-color: #8EDE21;"
                                      "selection-background-color: #999}"); //for demo purposes
       frozenTableView->setSelectionModel(selectionModel());
-      for(int col=1; col<model()->columnCount(); col++)
+      for (int col = 1; col < model()->columnCount(); ++col)
             frozenTableView->setColumnHidden(col, true);
 
       frozenTableView->setColumnWidth(0, columnWidth(0) );
@@ -105,7 +106,7 @@ void FreezeTableWidget::init()
 
 
 //! [sections]
-void FreezeTableWidget::updateSectionWidth(int logicalIndex, int, int newSize)
+void FreezeTableWidget::updateSectionWidth(int logicalIndex, int /* oldSize */, int newSize)
 {
       if (logicalIndex == 0){
             frozenTableView->setColumnWidth(0, newSize);
@@ -113,7 +114,7 @@ void FreezeTableWidget::updateSectionWidth(int logicalIndex, int, int newSize)
       }
 }
 
-void FreezeTableWidget::updateSectionHeight(int logicalIndex, int, int newSize)
+void FreezeTableWidget::updateSectionHeight(int logicalIndex, int /* oldSize */, int newSize)
 {
       frozenTableView->setRowHeight(logicalIndex, newSize);
 }
@@ -137,7 +138,6 @@ QModelIndex FreezeTableWidget::moveCursor(CursorAction cursorAction,
 
       if (cursorAction == MoveLeft && current.column() > 0
               && visualRect(current).topLeft().x() < frozenTableView->columnWidth(0) ){
-
             const int newValue = horizontalScrollBar()->value() + visualRect(current).topLeft().x()
                                  - frozenTableView->columnWidth(0);
             horizontalScrollBar()->setValue(newValue);
@@ -151,8 +151,6 @@ void FreezeTableWidget::scrollTo (const QModelIndex & index, ScrollHint hint){
         QTableView::scrollTo(index, hint);
 }
 
-
-
 //! [geometry]
 void FreezeTableWidget::updateFrozenTableGeometry()
 {

examples/widgets/itemviews/frozencolumn/freezetablewidget.h

@@ -64,9 +64,9 @@ private:
 
 
 private slots:
-      void updateSectionWidth(int logicalIndex,int, int newSize);
+      void updateSectionWidth(int logicalIndex, int oldSize, int newSize);
-      void updateSectionHeight(int logicalIndex, int, int newSize);
+      void updateSectionHeight(int logicalIndex, int oldSize, int newSize);
 
 };
 //! [Widget definition]
-#endif
+#endif // FREEZETABLEWIDGET_H

examples/widgets/itemviews/frozencolumn/main.cpp

@@ -44,22 +44,17 @@
 
 #include "freezetablewidget.h"
 
-int main( int argc, char** argv )
+int main(int argc, char* argv[])
 {
-
     Q_INIT_RESOURCE(grades);
 
-
     QApplication app( argc, argv );
     QStandardItemModel *model=new QStandardItemModel();
 
-
     QFile file(":/grades.txt");
-      QString line;
-      QStringList list;
     if (file.open(QFile::ReadOnly)) {
-            line = file.readLine(200);
+        QString line = file.readLine(200);
-            list= line.simplified().split(",");
+        QStringList list = line.simplified().split(",");
         model->setHorizontalHeaderLabels(list);
 
         int row = 0;
@@ -68,11 +63,11 @@ int main( int argc, char** argv )
             line = file.readLine(200);
             if (!line.startsWith("#") && line.contains(",")) {
                 list= line.simplified().split(",");
-                        for(int col=0; col<list.length(); col++){
+                for (int col = 0; col < list.length(); ++col){
                     newItem = new QStandardItem(list.at(col));
                     model->setItem(row, col, newItem);
                 }
-                        row++;
+                ++row;
             }
         }
     }

examples/widgets/itemviews/interview/main.cpp

@@ -42,11 +42,11 @@
 #include "model.h"
 
 #include <QApplication>
-#include <QTableView>
+#include <QHeaderView>
-#include <QTreeView>
 #include <QListView>
 #include <QSplitter>
-#include <QHeaderView>
+#include <QTableView>
+#include <QTreeView>
 
 int main(int argc, char *argv[])
 {

examples/widgets/itemviews/interview/model.cpp

@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "model.h"
+
 #include <QIcon>
 #include <QPixmap>
 
@@ -60,10 +61,10 @@ Model::~Model()
 QModelIndex Model::index(int row, int column, const QModelIndex &parent) const
 {
     if (row < rc && row >= 0 && column < cc && column >= 0) {
-        Node *p = static_cast<Node*>(parent.internalPointer());
+        Node *parentNode = static_cast<Node*>(parent.internalPointer());
-        Node *n = node(row, p);
+        Node *childNode = node(row, parentNode);
-	if (n)
+        if (childNode)
-	    return createIndex(row, column, n);
+            return createIndex(row, column, childNode);
     }
     return QModelIndex();
 }
@@ -71,10 +72,10 @@ QModelIndex Model::index(int row, int column, const QModelIndex &parent) const
 QModelIndex Model::parent(const QModelIndex &child) const
 {
     if (child.isValid()) {
-        Node *n = static_cast<Node*>(child.internalPointer());
+        Node *childNode = static_cast<Node*>(child.internalPointer());
-        Node *p = parent(n);
+        Node *parentNode = parent(childNode);
-        if (p)
+        if (parentNode)
-            return createIndex(row(p), 0, p);
+            return createIndex(row(parentNode), 0, parentNode);
     }
     return QModelIndex();
 }
@@ -143,5 +144,5 @@ Model::Node *Model::parent(Node *child) const
 int Model::row(Node *node) const
 {
     const Node *first = node->parent ? &(node->parent->children->at(0)) : &(tree->at(0));
-     return (node - first);
+    return node - first;
 }

examples/widgets/itemviews/interview/model.h

@@ -82,9 +82,10 @@ private:
     int row(Node *node) const;
 
     QIcon services;
-    int rc, cc;
+    int rc;
+    int cc;
     QVector<Node> *tree;
     QFileIconProvider iconProvider;
 };
 
-#endif
+#endif // MODEL_H

examples/widgets/itemviews/pixelator/imagemodel.cpp

@@ -38,8 +38,6 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "imagemodel.h"
 
 //! [0]

examples/widgets/itemviews/pixelator/imagemodel.h

@@ -65,4 +65,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // IMAGEMODEL_H

examples/widgets/itemviews/pixelator/mainwindow.cpp

@@ -38,16 +38,16 @@
 **
 ****************************************************************************/
 
+#include "imagemodel.h"
+#include "mainwindow.h"
+#include "pixeldelegate.h"
+
 #include <QtWidgets>
 #ifndef QT_NO_PRINTER
 #include <QPrinter>
 #include <QPrintDialog>
 #endif
 
-#include "imagemodel.h"
-#include "mainwindow.h"
-#include "pixeldelegate.h"
-
 //! [0]
 MainWindow::MainWindow()
 {
@@ -155,8 +155,7 @@ void MainWindow::openImage(const QString &fileName)
 void MainWindow::printImage()
 {
 #ifndef QT_NO_PRINTER
-    if (model->rowCount(QModelIndex())*model->columnCount(QModelIndex())
+    if (model->rowCount(QModelIndex())*model->columnCount(QModelIndex()) > 90000) {
-        > 90000) {
 	    QMessageBox::StandardButton answer;
 	    answer = QMessageBox::question(this, tr("Large Image Size"),
             tr("The printed image may be very large. Are you sure that "

examples/widgets/itemviews/pixelator/mainwindow.h

@@ -71,4 +71,4 @@ private:
     QTableView *view;
 };
 
-#endif
+#endif // MAINWINDOW_H

examples/widgets/itemviews/pixelator/pixeldelegate.cpp

@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "pixeldelegate.h"
 
+#include <QPainter>
+
 //! [0]
 PixelDelegate::PixelDelegate(QObject *parent)
     : QAbstractItemDelegate(parent)

examples/widgets/itemviews/pixelator/pixeldelegate.h

@@ -42,7 +42,6 @@
 #define PIXELDELEGATE_H
 
 #include <QAbstractItemDelegate>
-#include <QFontMetrics>
 #include <QModelIndex>
 #include <QSize>
 
@@ -76,4 +75,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // PIXELDELEGATE_H

examples/widgets/itemviews/puzzle/main.cpp

@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-
 #include "mainwindow.h"
 
+#include <QApplication>
+
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(puzzle);

examples/widgets/itemviews/puzzle/mainwindow.cpp

@@ -38,13 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-#include <stdlib.h>
-
 #include "mainwindow.h"
 #include "piecesmodel.h"
 #include "puzzlewidget.h"
 
+#include <QtWidgets>
+#include <stdlib.h>
+
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {
@@ -61,9 +61,10 @@ void MainWindow::openImage(const QString &path)
 {
     QString fileName = path;
 
-    if (fileName.isNull())
+    if (fileName.isNull()) {
         fileName = QFileDialog::getOpenFileName(this,
             tr("Open Image"), "", tr("Image Files (*.png *.jpg *.bmp)"));
+    }
 
     if (!fileName.isEmpty()) {
         QPixmap newImage;

examples/widgets/itemviews/puzzle/mainwindow.h

@@ -41,8 +41,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QPixmap>
 #include <QMainWindow>
+#include <QPixmap>
 
 class PuzzleWidget;
 class PiecesModel;
@@ -74,4 +74,4 @@ private:
     PiecesModel *model;
 };
 
-#endif
+#endif // MAINWINDOW_H

examples/widgets/itemviews/puzzle/piecesmodel.cpp

@@ -38,10 +38,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "piecesmodel.h"
 
+#include <QIcon>
+#include <QMimeData>
+
 PiecesModel::PiecesModel(int pieceSize, QObject *parent)
     : QAbstractListModel(parent), m_PieceSize(pieceSize)
 {
@@ -153,8 +154,9 @@ bool PiecesModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
             endRow = pixmaps.size();
         else
             endRow = qMin(row, pixmaps.size());
-    } else
+    } else {
         endRow = parent.row();
+    }
 
     QByteArray encodedData = data->data("image/x-puzzle-piece");
     QDataStream stream(&encodedData, QIODevice::ReadOnly);

examples/widgets/itemviews/puzzle/piecesmodel.h

@@ -79,4 +79,4 @@ private:
     int m_PieceSize;
 };
 
-#endif
+#endif // PIECESLIST_H

examples/widgets/itemviews/puzzle/puzzlewidget.cpp

@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "puzzlewidget.h"
 
+#include <QtWidgets>
+
 PuzzleWidget::PuzzleWidget(int imageSize, QWidget *parent)
     : QWidget(parent), m_ImageSize(imageSize)
 {
@@ -130,10 +130,9 @@ void PuzzleWidget::dropEvent(QDropEvent *event)
 int PuzzleWidget::findPiece(const QRect &pieceRect) const
 {
     for (int i = 0; i < pieceRects.size(); ++i) {
-        if (pieceRect == pieceRects[i]) {
+        if (pieceRect == pieceRects[i])
             return i;
     }
-    }
     return -1;
 }
 

examples/widgets/itemviews/puzzle/puzzlewidget.h

@@ -42,8 +42,8 @@
 #define PUZZLEWIDGET_H
 
 #include <QList>
-#include <QPoint>
 #include <QPixmap>
+#include <QPoint>
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
@@ -86,4 +86,4 @@ private:
     int m_ImageSize;
 };
 
-#endif
+#endif // PUZZLEWIDGET_H

examples/widgets/itemviews/simpledommodel/domitem.cpp

@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QtXml>
-
 #include "domitem.h"
 
+#include <QtXml>
+
 //! [0]
 DomItem::DomItem(QDomNode &node, int row, DomItem *parent)
 {

examples/widgets/itemviews/simpledommodel/domitem.h

@@ -63,4 +63,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // DOMITEM_H

examples/widgets/itemviews/simpledommodel/dommodel.cpp

@@ -38,12 +38,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-#include <QtXml>
-
 #include "domitem.h"
 #include "dommodel.h"
 
+#include <QtXml>
+
 //! [0]
 DomModel::DomModel(QDomDocument document, QObject *parent)
     : QAbstractItemModel(parent), domDocument(document)

examples/widgets/itemviews/simpledommodel/dommodel.h

@@ -44,7 +44,6 @@
 #include <QAbstractItemModel>
 #include <QDomDocument>
 #include <QModelIndex>
-#include <QVariant>
 
 class DomItem;
 
@@ -73,4 +72,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // DOMMODEL_H

examples/widgets/itemviews/simpledommodel/main.cpp

@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-
 #include "mainwindow.h"
 
+#include <QApplication>
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);

examples/widgets/itemviews/simpledommodel/mainwindow.cpp

@@ -38,20 +38,19 @@
 **
 ****************************************************************************/
 
-#include <QDomDocument>
-#include <QFile>
-#include <QtWidgets>
-
 #include "dommodel.h"
 #include "mainwindow.h"
 
+#include <QDomDocument>
+#include <QTreeView>
+#include <QMenuBar>
+#include <QFileDialog>
+
 MainWindow::MainWindow() : QMainWindow(), model(0)
 {
     fileMenu = menuBar()->addMenu(tr("&File"));
-    fileMenu->addAction(tr("&Open..."), this, SLOT(openFile()),
+    fileMenu->addAction(tr("&Open..."), this, SLOT(openFile()), QKeySequence::Open);
-                        QKeySequence::Open);
+    fileMenu->addAction(tr("E&xit"), this, SLOT(close()), QKeySequence::Quit);
-    fileMenu->addAction(tr("E&xit"), this, SLOT(close()),
-                        QKeySequence::Quit);
 
     model = new DomModel(QDomDocument(), this);
     view = new QTreeView(this);

examples/widgets/itemviews/simpledommodel/mainwindow.h

@@ -67,4 +67,4 @@ private:
     QTreeView *view;
 };
 
-#endif
+#endif // MAINWINDOW_H

examples/widgets/itemviews/simpletreemodel/main.cpp

@@ -38,10 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "treemodel.h"
 
+#include <QApplication>
+#include <QFile>
+#include <QTreeView>
+
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(simpletreemodel);

examples/widgets/itemviews/simpletreemodel/treeitem.h

@@ -67,4 +67,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // TREEITEM_H

examples/widgets/itemviews/simpletreemodel/treemodel.cpp

@@ -45,11 +45,11 @@
     models.
 */
 
-#include <QtWidgets>
-
 #include "treeitem.h"
 #include "treemodel.h"
 
+#include <QStringList>
+
 //! [0]
 TreeModel::TreeModel(const QString &data, QObject *parent)
     : QAbstractItemModel(parent)
@@ -213,6 +213,6 @@ void TreeModel::setupModelData(const QStringList &lines, TreeItem *parent)
             parents.last()->appendChild(new TreeItem(columnData, parents.last()));
         }
 
-        number++;
+        ++number;
     }
 }

examples/widgets/itemviews/simpletreemodel/treemodel.h

@@ -73,4 +73,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // TREEMODEL_H

examples/widgets/itemviews/simplewidgetmapper/main.cpp

@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-
 #include "window.h"
 
+#include <QApplication>
+
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);

examples/widgets/itemviews/simplewidgetmapper/window.cpp

@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "window.h"
 
+#include <QtWidgets>
+
 //! [Set up widgets]
 Window::Window(QWidget *parent)
     : QWidget(parent)
@@ -69,12 +69,9 @@ Window::Window(QWidget *parent)
     mapper->addMapping(addressEdit, 1);
     mapper->addMapping(ageSpinBox, 2);
 
-    connect(previousButton, SIGNAL(clicked()),
+    connect(previousButton, SIGNAL(clicked()), mapper, SLOT(toPrevious()));
-            mapper, SLOT(toPrevious()));
+    connect(nextButton, SIGNAL(clicked()), mapper, SLOT(toNext()));
-    connect(nextButton, SIGNAL(clicked()),
+    connect(mapper, SIGNAL(currentIndexChanged(int)), this, SLOT(updateButtons(int)));
-            mapper, SLOT(toNext()));
-    connect(mapper, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(updateButtons(int)));
 //! [Set up the mapper]
 
 //! [Set up the layout]

examples/widgets/itemviews/simplewidgetmapper/window.h

@@ -81,4 +81,4 @@ private:
 };
 //! [Window definition]
 
-#endif
+#endif // WINDOW_H

examples/widgets/itemviews/spinboxdelegate/delegate.cpp

@@ -45,10 +45,9 @@
     using a spin box widget.
 */
 
-#include <QtWidgets>
-
 #include "delegate.h"
 
+#include <QSpinBox>
 
 //! [0]
 SpinBoxDelegate::SpinBoxDelegate(QObject *parent)

examples/widgets/itemviews/spinboxdelegate/delegate.h

@@ -42,10 +42,6 @@
 #define DELEGATE_H
 
 #include <QStyledItemDelegate>
-#include <QModelIndex>
-#include <QObject>
-#include <QSize>
-#include <QSpinBox>
 
 //! [0]
 class SpinBoxDelegate : public QStyledItemDelegate

examples/widgets/itemviews/spinboxdelegate/main.cpp

@@ -45,14 +45,13 @@
   data obtained from a model.
 */
 
+#include "delegate.h"
+
 #include <QApplication>
 #include <QHeaderView>
-#include <QItemSelectionModel>
 #include <QStandardItemModel>
 #include <QTableView>
 
-#include "delegate.h"
-
 //! [0]
 int main(int argc, char *argv[])
 {

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);

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);

examples/widgets/itemviews/spreadsheet/spreadsheet.cpp

@@ -168,10 +168,8 @@ void SpreadSheet::setupMenuBar()
 void SpreadSheet::updateStatus(QTableWidgetItem *item)
 {
     if (item && item == table->currentItem()) {
-        statusBar()->showMessage(item->data(Qt::StatusTipRole).toString(),
+        statusBar()->showMessage(item->data(Qt::StatusTipRole).toString(), 1000);
-                                 1000);
+        cellLabel->setText(tr("Cell: (%1)").arg(encode_pos(table->row(item), table->column(item))));
-        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,10 +253,11 @@ 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,
                                  const QString &c1Text,
@@ -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*)),
+    connect(&dlg, SIGNAL(paintRequested(QPrinter*)), &view, SLOT(print(QPrinter*)));
-            &view, SLOT(print(QPrinter*)));
     dlg.exec();
 #endif
 }

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()),
+    connect(editor, SIGNAL(editingFinished()), this, SLOT(commitAndCloseEditor()));
-        this, SLOT(commitAndCloseEditor()));
     return editor;
 }
 
@@ -88,7 +88,9 @@ void SpreadSheetDelegate::setEditorData(QWidget *editor,
     QLineEdit *edit = qobject_cast<QLineEdit*>(editor);
     if (edit) {
         edit->setText(index.model()->data(index, Qt::EditRole).toString());
-    } else {
+        return;
+    }
+
     QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
     if (dateEditor) {
         dateEditor->setDate(QDate::fromString(
@@ -96,7 +98,6 @@ void SpreadSheetDelegate::setEditorData(QWidget *editor,
                                 "d/M/yyyy"));
     }
 }
-}
 
 void SpreadSheetDelegate::setModelData(QWidget *editor,
     QAbstractItemModel *model, const QModelIndex &index) const
@@ -104,11 +105,10 @@ void SpreadSheetDelegate::setModelData(QWidget *editor,
     QLineEdit *edit = qobject_cast<QLineEdit *>(editor);
     if (edit) {
         model->setData(index, edit->text());
-    } else {
+        return;
-        QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
-        if (dateEditor) {
-            model->setData(index, dateEditor->date().toString("dd/M/yyyy"));
-        }
-    }
     }
 
+    QDateTimeEdit *dateEditor = qobject_cast<QDateTimeEdit *>(editor);
+    if (dateEditor)
+        model->setData(index, dateEditor->date().toString("dd/M/yyyy"));
+}

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

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,