From 4ac521354dfa575c31ecb732a0f8c1e18827c21e Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@digia.com>
Date: Fri, 23 Nov 2012 14:27:50 +0100
Subject: QtBase: example code style

Change-Id: I0685f7e2c7c698a4bf288b8b1ae909167932a3fb
Reviewed-by: hjk <qthjk@ovi.com>
---
 examples/widgets/draganddrop/puzzle/mainwindow.cpp   | 15 ++++++++-------
 examples/widgets/draganddrop/puzzle/mainwindow.h     |  2 +-
 examples/widgets/draganddrop/puzzle/pieceslist.cpp   | 15 +++++++++------
 examples/widgets/draganddrop/puzzle/pieceslist.h     |  2 +-
 examples/widgets/draganddrop/puzzle/puzzlewidget.cpp | 13 +++++++------
 examples/widgets/draganddrop/puzzle/puzzlewidget.h   |  2 +-
 6 files changed, 27 insertions(+), 22 deletions(-)

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

diff --git a/examples/widgets/draganddrop/puzzle/mainwindow.cpp b/examples/widgets/draganddrop/puzzle/mainwindow.cpp
index 47300f3f28..bc0f4d6838 100644
--- a/examples/widgets/draganddrop/puzzle/mainwindow.cpp
+++ b/examples/widgets/draganddrop/puzzle/mainwindow.cpp
@@ -38,13 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-#include <stdlib.h>
-
 #include "mainwindow.h"
 #include "pieceslist.h"
 #include "puzzlewidget.h"
 
+#include <QtWidgets>
+#include <stdlib.h>
+
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {
@@ -59,9 +59,10 @@ void MainWindow::openImage(const QString &path)
 {
     QString fileName = path;
 
-    if (fileName.isNull())
+    if (fileName.isNull()) {
         fileName = QFileDialog::getOpenFileName(this,
             tr("Open Image"), "", "Image Files (*.png *.jpg *.bmp)");
+    }
 
     if (!fileName.isEmpty()) {
         QPixmap newImage;
@@ -79,9 +80,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();
 }
diff --git a/examples/widgets/draganddrop/puzzle/mainwindow.h b/examples/widgets/draganddrop/puzzle/mainwindow.h
index 3283bea39c..c975f50243 100644
--- a/examples/widgets/draganddrop/puzzle/mainwindow.h
+++ b/examples/widgets/draganddrop/puzzle/mainwindow.h
@@ -73,4 +73,4 @@ private:
     PuzzleWidget *puzzleWidget;
 };
 
-#endif
+#endif // MAINWINDOW_H
diff --git a/examples/widgets/draganddrop/puzzle/pieceslist.cpp b/examples/widgets/draganddrop/puzzle/pieceslist.cpp
index eab48b3562..434d5a0344 100644
--- a/examples/widgets/draganddrop/puzzle/pieceslist.cpp
+++ b/examples/widgets/draganddrop/puzzle/pieceslist.cpp
@@ -38,10 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "pieceslist.h"
 
+#include <QDrag>
+#include <QDragEnterEvent>
+#include <QMimeData>
+
 PiecesList::PiecesList(int pieceSize, QWidget *parent)
     : QListWidget(parent), m_PieceSize(pieceSize)
 {
@@ -66,8 +68,9 @@ void PiecesList::dragMoveEvent(QDragMoveEvent *event)
     if (event->mimeData()->hasFormat("image/x-puzzle-piece")) {
         event->setDropAction(Qt::MoveAction);
         event->accept();
-    } else
+    } else {
         event->ignore();
+    }
 }
 
 void PiecesList::dropEvent(QDropEvent *event)
@@ -83,8 +86,9 @@ void PiecesList::dropEvent(QDropEvent *event)
 
         event->setDropAction(Qt::MoveAction);
         event->accept();
-    } else
+    } else {
         event->ignore();
+    }
 }
 
 void PiecesList::addPiece(QPixmap pixmap, QPoint location)
@@ -93,8 +97,7 @@ void PiecesList::addPiece(QPixmap pixmap, QPoint location)
     pieceItem->setIcon(QIcon(pixmap));
     pieceItem->setData(Qt::UserRole, QVariant(pixmap));
     pieceItem->setData(Qt::UserRole+1, location);
-    pieceItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable
-                        | Qt::ItemIsDragEnabled);
+    pieceItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
 }
 
 void PiecesList::startDrag(Qt::DropActions /*supportedActions*/)
diff --git a/examples/widgets/draganddrop/puzzle/pieceslist.h b/examples/widgets/draganddrop/puzzle/pieceslist.h
index 7824654a8d..19fa27a72a 100644
--- a/examples/widgets/draganddrop/puzzle/pieceslist.h
+++ b/examples/widgets/draganddrop/puzzle/pieceslist.h
@@ -60,4 +60,4 @@ protected:
     int m_PieceSize;
 };
 
-#endif
+#endif // PIECESLIST_H
diff --git a/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp b/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp
index 3798b2ec7b..f48ef08745 100644
--- a/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp
+++ b/examples/widgets/draganddrop/puzzle/puzzlewidget.cpp
@@ -38,10 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "puzzlewidget.h"
 
+#include <QDrag>
+#include <QDragEnterEvent>
+#include <QMimeData>
+#include <QPainter>
+
 PuzzleWidget::PuzzleWidget(int imageSize, QWidget *parent)
     : QWidget(parent), m_ImageSize(imageSize)
 {
@@ -130,9 +133,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;
 }
@@ -192,9 +194,8 @@ void PuzzleWidget::paintEvent(QPaintEvent *event)
         painter.drawRect(highlightedRect.adjusted(0, 0, -1, -1));
     }
 
-    for (int i = 0; i < pieceRects.size(); ++i) {
+    for (int i = 0; i < pieceRects.size(); ++i)
         painter.drawPixmap(pieceRects[i], piecePixmaps[i]);
-    }
     painter.end();
 }
 
diff --git a/examples/widgets/draganddrop/puzzle/puzzlewidget.h b/examples/widgets/draganddrop/puzzle/puzzlewidget.h
index 996c0aa184..6322eec93e 100644
--- a/examples/widgets/draganddrop/puzzle/puzzlewidget.h
+++ b/examples/widgets/draganddrop/puzzle/puzzlewidget.h
@@ -86,4 +86,4 @@ private:
     int m_ImageSize;
 };
 
-#endif
+#endif // PUZZLEWIDGET_H
-- 
cgit v1.2.3