From dae8d2505d6b6c591429768c10ae3ca190679d41 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@digia.com>
Date: Fri, 23 Nov 2012 09:31:03 +0100
Subject: QtBase: examples/widgets/graphicsview/ codestyle

Change-Id: I501066b5eb5a1557d510e0ec20b5270e8c12704a
Reviewed-by: hjk <qthjk@ovi.com>
---
 .../widgets/graphicsview/basicgraphicslayouts/layoutitem.cpp   | 10 +++++++---
 .../widgets/graphicsview/basicgraphicslayouts/layoutitem.h     |  9 +++++----
 examples/widgets/graphicsview/basicgraphicslayouts/main.cpp    |  7 ++++---
 examples/widgets/graphicsview/basicgraphicslayouts/window.cpp  |  6 +++---
 examples/widgets/graphicsview/basicgraphicslayouts/window.h    |  2 +-
 5 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'examples/widgets/graphicsview/basicgraphicslayouts')

diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.cpp b/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.cpp
index ce7cf0d093..7e7b026f10 100644
--- a/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.cpp
+++ b/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.cpp
@@ -40,6 +40,10 @@
 
 #include "layoutitem.h"
 
+#include <QGradient>
+#include <QGraphicsLinearLayout>
+#include <QPainter>
+
 //! [0]
 LayoutItem::LayoutItem(QGraphicsItem *parent/* = 0*/)
     : QGraphicsLayoutItem(), QGraphicsItem(parent)
@@ -71,7 +75,7 @@ void LayoutItem::paint(QPainter *painter,
     // paint a background rect (with gradient)
     QLinearGradient gradient(frame.topLeft(), frame.topLeft() + QPointF(200,200));
     stops << QGradientStop(0.0, QColor(60, 60,  60));
-    stops << QGradientStop(frame.height()/2/frame.height(), QColor(102, 176, 54));
+    stops << QGradientStop(frame.height() / 2 / frame.height(), QColor(102, 176, 54));
 
     //stops << QGradientStop(((frame.height() + h)/2 )/frame.height(), QColor(157, 195,  55));
     stops << QGradientStop(1.0, QColor(215, 215, 215));
@@ -80,9 +84,9 @@ void LayoutItem::paint(QPainter *painter,
     painter->drawRoundedRect(frame, 10.0, 10.0);
 
     // paint a rect around the pixmap (with gradient)
-    QPointF pixpos = frame.center() - (QPointF(w, h)/2);
+    QPointF pixpos = frame.center() - (QPointF(w, h) / 2);
     QRectF innerFrame(pixpos, QSizeF(w, h));
-    innerFrame.adjust(-4, -4, +4, +4);
+    innerFrame.adjust(-4, -4, 4, 4);
     gradient.setStart(innerFrame.topLeft());
     gradient.setFinalStop(innerFrame.bottomRight());
     stops.clear();
diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.h b/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.h
index 263485ed0b..d8cbe8cf96 100644
--- a/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.h
+++ b/examples/widgets/graphicsview/basicgraphicslayouts/layoutitem.h
@@ -40,7 +40,9 @@
 
 #ifndef LAYOUTITEM_H
 #define LAYOUTITEM_H
-#include <QtWidgets>
+
+#include <QGraphicsLayoutItem>
+#include <QGraphicsItem>
 
 //! [0]
 class LayoutItem : public QGraphicsLayoutItem, public QGraphicsItem
@@ -54,12 +56,11 @@ public:
 
     // Inherited from QGraphicsItem
     QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-        QWidget *widget = 0);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
 private:
     QPixmap *m_pix;
 };
 //! [0]
 
-#endif
+#endif // LAYOUTITEM_H
diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/main.cpp b/examples/widgets/graphicsview/basicgraphicslayouts/main.cpp
index bffc6a9e28..32ff43b5a6 100644
--- a/examples/widgets/graphicsview/basicgraphicslayouts/main.cpp
+++ b/examples/widgets/graphicsview/basicgraphicslayouts/main.cpp
@@ -38,11 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "window.h"
 
-int main(int argc, char **argv)
+#include <QApplication>
+#include <QGraphicsView>
+
+int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/window.cpp b/examples/widgets/graphicsview/basicgraphicslayouts/window.cpp
index 464b90f8f2..983785cbb6 100644
--- a/examples/widgets/graphicsview/basicgraphicslayouts/window.cpp
+++ b/examples/widgets/graphicsview/basicgraphicslayouts/window.cpp
@@ -41,6 +41,9 @@
 #include "window.h"
 #include "layoutitem.h"
 
+#include <QGraphicsLinearLayout>
+#include <QGraphicsGridLayout>
+
 Window::Window(QGraphicsWidget *parent) : QGraphicsWidget(parent, Qt::Window)
 {
 //! [0]
@@ -85,6 +88,3 @@ Window::Window(QGraphicsWidget *parent) : QGraphicsWidget(parent, Qt::Window)
 //! [3]
 
 }
-
-
-
diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/window.h b/examples/widgets/graphicsview/basicgraphicslayouts/window.h
index c82a330944..62347254ba 100644
--- a/examples/widgets/graphicsview/basicgraphicslayouts/window.h
+++ b/examples/widgets/graphicsview/basicgraphicslayouts/window.h
@@ -41,7 +41,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include <QtWidgets/QGraphicsWidget>
+#include <QGraphicsWidget>
 
 //! [0]
 class Window : public QGraphicsWidget {
-- 
cgit v1.2.3