From ab0a007cb369a8e9a1bf43c9386a77d36199759b Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@digia.com>
Date: Thu, 22 Nov 2012 13:40:51 +0100
Subject: QtBase: examples/widgets/itemviews code style

Change-Id: I78a7745f7dc3add3fd7780220118d1b35b50a941
Reviewed-by: hjk <qthjk@ovi.com>
---
 examples/widgets/itemviews/editabletreemodel/main.cpp       |  2 +-
 examples/widgets/itemviews/editabletreemodel/mainwindow.cpp | 11 ++++-------
 examples/widgets/itemviews/editabletreemodel/mainwindow.h   | 10 +++-------
 examples/widgets/itemviews/editabletreemodel/treeitem.cpp   |  4 ++--
 examples/widgets/itemviews/editabletreemodel/treeitem.h     |  2 +-
 examples/widgets/itemviews/editabletreemodel/treemodel.cpp  | 13 ++++++-------
 examples/widgets/itemviews/editabletreemodel/treemodel.h    |  2 +-
 7 files changed, 18 insertions(+), 26 deletions(-)

(limited to 'examples/widgets/itemviews/editabletreemodel')

diff --git a/examples/widgets/itemviews/editabletreemodel/main.cpp b/examples/widgets/itemviews/editabletreemodel/main.cpp
index 65e2014109..79f39a459e 100644
--- a/examples/widgets/itemviews/editabletreemodel/main.cpp
+++ b/examples/widgets/itemviews/editabletreemodel/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
 
 #include "mainwindow.h"
 
diff --git a/examples/widgets/itemviews/editabletreemodel/mainwindow.cpp b/examples/widgets/itemviews/editabletreemodel/mainwindow.cpp
index 4635b9548b..91393ea03e 100644
--- a/examples/widgets/itemviews/editabletreemodel/mainwindow.cpp
+++ b/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]"),
-                                 Qt::EditRole);
+            model->setHeaderData(column, Qt::Horizontal, QVariant("[No header]"), 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]"),
-                             Qt::EditRole);
+        model->setHeaderData(column + 1, Qt::Horizontal, QVariant("[No header]"), Qt::EditRole);
 
     updateActions();
 
diff --git a/examples/widgets/itemviews/editabletreemodel/mainwindow.h b/examples/widgets/itemviews/editabletreemodel/mainwindow.h
index 2b2ec0ba0d..ae999a1b1f 100644
--- a/examples/widgets/itemviews/editabletreemodel/mainwindow.h
+++ b/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;
-class QTreeView;
-class QWidget;
+#include <QMainWindow>
+#include <QModelIndex>
 
 class MainWindow : public QMainWindow, private Ui::MainWindow
 {
@@ -68,4 +64,4 @@ private slots:
     void removeRow();
 };
 
-#endif
+#endif // MAINWINDOW_H
diff --git a/examples/widgets/itemviews/editabletreemodel/treeitem.cpp b/examples/widgets/itemviews/editabletreemodel/treeitem.cpp
index 579dfa06c1..c8e22d79e1 100644
--- a/examples/widgets/itemviews/editabletreemodel/treeitem.cpp
+++ b/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)
 {
diff --git a/examples/widgets/itemviews/editabletreemodel/treeitem.h b/examples/widgets/itemviews/editabletreemodel/treeitem.h
index 31e4c603be..e85e86101a 100644
--- a/examples/widgets/itemviews/editabletreemodel/treeitem.h
+++ b/examples/widgets/itemviews/editabletreemodel/treeitem.h
@@ -71,4 +71,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // TREEITEM_H
diff --git a/examples/widgets/itemviews/editabletreemodel/treemodel.cpp b/examples/widgets/itemviews/editabletreemodel/treemodel.cpp
index 8c10e4c641..4eb2abdd6f 100644
--- a/examples/widgets/itemviews/editabletreemodel/treemodel.cpp
+++ b/examples/widgets/itemviews/editabletreemodel/treemodel.cpp
@@ -44,8 +44,7 @@
 #include "treemodel.h"
 
 //! [0]
-TreeModel::TreeModel(const QStringList &headers, const QString &data,
-                     QObject *parent)
+TreeModel::TreeModel(const QStringList &headers, const QString &data, 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,
-                        int role)
+bool TreeModel::setData(const QModelIndex &index, const QVariant &value, 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;
     }
 }
diff --git a/examples/widgets/itemviews/editabletreemodel/treemodel.h b/examples/widgets/itemviews/editabletreemodel/treemodel.h
index a84189bce8..abdc37508e 100644
--- a/examples/widgets/itemviews/editabletreemodel/treemodel.h
+++ b/examples/widgets/itemviews/editabletreemodel/treemodel.h
@@ -94,4 +94,4 @@ private:
 };
 //! [2]
 
-#endif
+#endif // TREEMODEL_H
-- 
cgit v1.2.3