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/puzzle/main.cpp         |  4 ++--
 examples/widgets/itemviews/puzzle/mainwindow.cpp   | 19 ++++++++++---------
 examples/widgets/itemviews/puzzle/mainwindow.h     |  4 ++--
 examples/widgets/itemviews/puzzle/piecesmodel.cpp  | 10 ++++++----
 examples/widgets/itemviews/puzzle/piecesmodel.h    |  2 +-
 examples/widgets/itemviews/puzzle/puzzlewidget.cpp |  7 +++----
 examples/widgets/itemviews/puzzle/puzzlewidget.h   |  4 ++--
 7 files changed, 26 insertions(+), 24 deletions(-)

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

diff --git a/examples/widgets/itemviews/puzzle/main.cpp b/examples/widgets/itemviews/puzzle/main.cpp
index d3ccb880bb..6895e38f83 100644
--- a/examples/widgets/itemviews/puzzle/main.cpp
+++ b/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);
diff --git a/examples/widgets/itemviews/puzzle/mainwindow.cpp b/examples/widgets/itemviews/puzzle/mainwindow.cpp
index 4afdc65696..b7c4fd69e0 100644
--- a/examples/widgets/itemviews/puzzle/mainwindow.cpp
+++ b/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;
@@ -81,9 +82,9 @@ void MainWindow::openImage(const QString &path)
 void MainWindow::setCompleted()
 {
     QMessageBox::information(this, tr("Puzzle Completed"),
-        tr("Congratulations! You have completed the puzzle!\n"
-           "Click OK to start again."),
-        QMessageBox::Ok);
+                             tr("Congratulations! You have completed the puzzle!\n"
+                                "Click OK to start again."),
+                             QMessageBox::Ok);
 
     setupPuzzle();
 }
@@ -91,8 +92,8 @@ void MainWindow::setCompleted()
 void MainWindow::setupPuzzle()
 {
     int size = qMin(puzzleImage.width(), puzzleImage.height());
-    puzzleImage = puzzleImage.copy((puzzleImage.width() - size)/2,
-        (puzzleImage.height() - size)/2, size, size).scaled(puzzleWidget->imageSize(),
+    puzzleImage = puzzleImage.copy((puzzleImage.width() - size) / 2,
+        (puzzleImage.height() - size) / 2, size, size).scaled(puzzleWidget->imageSize(),
             puzzleWidget->imageSize(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 
     qsrand(QCursor::pos().x() ^ QCursor::pos().y());
diff --git a/examples/widgets/itemviews/puzzle/mainwindow.h b/examples/widgets/itemviews/puzzle/mainwindow.h
index 955cced99b..5523b662de 100644
--- a/examples/widgets/itemviews/puzzle/mainwindow.h
+++ b/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
diff --git a/examples/widgets/itemviews/puzzle/piecesmodel.cpp b/examples/widgets/itemviews/puzzle/piecesmodel.cpp
index 948df042b6..29ce9c8ea5 100644
--- a/examples/widgets/itemviews/puzzle/piecesmodel.cpp
+++ b/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)
 {
@@ -66,7 +67,7 @@ QVariant PiecesModel::data(const QModelIndex &index, int role) const
 void PiecesModel::addPiece(const QPixmap &pixmap, const QPoint &location)
 {
     int row;
-    if (int(2.0*qrand()/(RAND_MAX+1.0)) == 1)
+    if (int(2.0 * qrand() / (RAND_MAX + 1.0)) == 1)
         row = 0;
     else
         row = pixmaps.size();
@@ -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);
diff --git a/examples/widgets/itemviews/puzzle/piecesmodel.h b/examples/widgets/itemviews/puzzle/piecesmodel.h
index 2a236ba736..db43b4da24 100644
--- a/examples/widgets/itemviews/puzzle/piecesmodel.h
+++ b/examples/widgets/itemviews/puzzle/piecesmodel.h
@@ -79,4 +79,4 @@ private:
     int m_PieceSize;
 };
 
-#endif
+#endif // PIECESLIST_H
diff --git a/examples/widgets/itemviews/puzzle/puzzlewidget.cpp b/examples/widgets/itemviews/puzzle/puzzlewidget.cpp
index 13ada06568..390c6f144a 100644
--- a/examples/widgets/itemviews/puzzle/puzzlewidget.cpp
+++ b/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,9 +130,8 @@ 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;
 }
diff --git a/examples/widgets/itemviews/puzzle/puzzlewidget.h b/examples/widgets/itemviews/puzzle/puzzlewidget.h
index 996c0aa184..f7d46d00b4 100644
--- a/examples/widgets/itemviews/puzzle/puzzlewidget.h
+++ b/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
-- 
cgit v1.2.3