QtBase: examples/widgets/graphicsview/ codestyle

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

49 files changed, 296 insertions, 302 deletions

diff --git a/examples/widgets/graphicsview/anchorlayout/main.cpp b/examples/widgets/graphicsview/anchorlayout/main.cpp
index a01881501b..55788d4280 100644
--- a/examples/widgets/graphicsview/anchorlayout/main.cpp
+++ b/examples/widgets/graphicsview/anchorlayout/main.cpp
@@ -38,15 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QGraphicsWidget>
-#include <QGraphicsProxyWidget>
-#include <QGraphicsAnchorLayout>
 #include <QtWidgets>
 
 static QGraphicsProxyWidget *createItem(const QSizeF &minimum = QSizeF(100.0, 100.0),
-                                   const QSizeF &preferred = QSize(150.0, 100.0),
-                                   const QSizeF &maximum = QSizeF(200.0, 100.0),
-                                   const QString &name = "0")
+                                        const QSizeF &preferred = QSize(150.0, 100.0),
+                                        const QSizeF &maximum = QSizeF(200.0, 100.0),
+                                        const QString &name = "0")
 {
     QGraphicsProxyWidget *w = new QGraphicsProxyWidget;
     w->setWidget(new QPushButton(name));
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 {
diff --git a/examples/widgets/graphicsview/chip/chip.h b/examples/widgets/graphicsview/chip/chip.h
index 7e98b24502..c90d314e7d 100644
--- a/examples/widgets/graphicsview/chip/chip.h
+++ b/examples/widgets/graphicsview/chip/chip.h
@@ -42,8 +42,8 @@
 #ifndef CHIP_H
 #define CHIP_H
 
-#include <QtGui/QColor>
-#include <QtWidgets/QGraphicsItem>
+#include <QColor>
+#include <QGraphicsItem>
 
 class Chip : public QGraphicsItem
 {
@@ -60,9 +60,10 @@ protected:
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 
 private:
-    int x, y;
+    int x;
+    int y;
     QColor color;
     QVector<QPointF> stuff;
 };
 
-#endif
+#endif // CHIP_H
diff --git a/examples/widgets/graphicsview/chip/main.cpp b/examples/widgets/graphicsview/chip/main.cpp
index 0f660f5fc4..cb1ad418ad 100644
--- a/examples/widgets/graphicsview/chip/main.cpp
+++ b/examples/widgets/graphicsview/chip/main.cpp
@@ -43,7 +43,7 @@
 
 #include <QApplication>
 
-int main(int argc, char **argv)
+int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(images);
 
diff --git a/examples/widgets/graphicsview/chip/mainwindow.cpp b/examples/widgets/graphicsview/chip/mainwindow.cpp
index 1987f535a2..c9e5f82f88 100644
--- a/examples/widgets/graphicsview/chip/mainwindow.cpp
+++ b/examples/widgets/graphicsview/chip/mainwindow.cpp
@@ -39,11 +39,12 @@
 **
 ****************************************************************************/
 
+#include "chip.h"
 #include "mainwindow.h"
 #include "view.h"
-#include "chip.h"
 
-#include <QtWidgets>
+#include <QHBoxLayout>
+#include <QSplitter>
 
 MainWindow::MainWindow(QWidget *parent)
     : QWidget(parent)
diff --git a/examples/widgets/graphicsview/chip/mainwindow.h b/examples/widgets/graphicsview/chip/mainwindow.h
index 00e006f900..c615b78da1 100644
--- a/examples/widgets/graphicsview/chip/mainwindow.h
+++ b/examples/widgets/graphicsview/chip/mainwindow.h
@@ -42,13 +42,12 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtWidgets/qwidget.h>
+#include <QWidget>
 
-QT_FORWARD_DECLARE_CLASS(QGraphicsScene)
-QT_FORWARD_DECLARE_CLASS(QGraphicsView)
-QT_FORWARD_DECLARE_CLASS(QLabel)
-QT_FORWARD_DECLARE_CLASS(QSlider)
-QT_FORWARD_DECLARE_CLASS(QSplitter)
+QT_BEGIN_NAMESPACE
+class QGraphicsScene;
+class QSplitter;
+QT_END_NAMESPACE
 
 class MainWindow : public QWidget
 {
@@ -65,4 +64,4 @@ private:
     QSplitter *h2Splitter;
 };
 
-#endif
+#endif // MAINWINDOW_H
diff --git a/examples/widgets/graphicsview/chip/view.cpp b/examples/widgets/graphicsview/chip/view.cpp
index 56ad17b9e8..cb83175744 100644
--- a/examples/widgets/graphicsview/chip/view.cpp
+++ b/examples/widgets/graphicsview/chip/view.cpp
@@ -41,7 +41,6 @@
 
 #include "view.h"
 
-#include <QtWidgets>
 #ifndef QT_NO_PRINTER
 #include <QPrinter>
 #include <QPrintDialog>
@@ -178,8 +177,10 @@ View::View(const QString &name, QWidget *parent)
     connect(resetButton, SIGNAL(clicked()), this, SLOT(resetView()));
     connect(zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setupMatrix()));
     connect(rotateSlider, SIGNAL(valueChanged(int)), this, SLOT(setupMatrix()));
-    connect(graphicsView->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(setResetButtonEnabled()));
-    connect(graphicsView->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(setResetButtonEnabled()));
+    connect(graphicsView->verticalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(setResetButtonEnabled()));
+    connect(graphicsView->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(setResetButtonEnabled()));
     connect(selectModeButton, SIGNAL(toggled(bool)), this, SLOT(togglePointerMode()));
     connect(dragModeButton, SIGNAL(toggled(bool)), this, SLOT(togglePointerMode()));
     connect(antialiasButton, SIGNAL(toggled(bool)), this, SLOT(toggleAntialiasing()));
@@ -276,4 +277,3 @@ void View::rotateRight()
 {
     rotateSlider->setValue(rotateSlider->value() + 10);
 }
-
diff --git a/examples/widgets/graphicsview/chip/view.h b/examples/widgets/graphicsview/chip/view.h
index 5fc9bed630..b6cdc41200 100644
--- a/examples/widgets/graphicsview/chip/view.h
+++ b/examples/widgets/graphicsview/chip/view.h
@@ -45,9 +45,11 @@
 #include <QFrame>
 #include <QGraphicsView>
 
-QT_FORWARD_DECLARE_CLASS(QLabel)
-QT_FORWARD_DECLARE_CLASS(QSlider)
-QT_FORWARD_DECLARE_CLASS(QToolButton)
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QSlider;
+class QToolButton;
+QT_END_NAMESPACE
 
 class View;
 
@@ -101,4 +103,4 @@ private:
     QSlider *rotateSlider;
 };
 
-#endif
+#endif // VIEW_H
diff --git a/examples/widgets/graphicsview/collidingmice/main.cpp b/examples/widgets/graphicsview/collidingmice/main.cpp
index cda7372167..a363f1425d 100644
--- a/examples/widgets/graphicsview/collidingmice/main.cpp
+++ b/examples/widgets/graphicsview/collidingmice/main.cpp
@@ -38,19 +38,19 @@
 **
 ****************************************************************************/
 
-#include "mouse.h"
-
 #include <QtWidgets>
 
 #include <math.h>
 
+#include "mouse.h"
+
 static const int MouseCount = 7;
 
 //! [0]
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
-    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+    qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
 //! [0]
 
 //! [1]
diff --git a/examples/widgets/graphicsview/diagramscene/arrow.cpp b/examples/widgets/graphicsview/diagramscene/arrow.cpp
index ed6b61d803..3daeac303e 100644
--- a/examples/widgets/graphicsview/diagramscene/arrow.cpp
+++ b/examples/widgets/graphicsview/diagramscene/arrow.cpp
@@ -38,11 +38,14 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
 
 #include "arrow.h"
+
 #include <math.h>
 
+#include <QPen>
+#include <QPainter>
+
 const qreal Pi = 3.14;
 
 //! [0]
diff --git a/examples/widgets/graphicsview/diagramscene/arrow.h b/examples/widgets/graphicsview/diagramscene/arrow.h
index 8ccf937725..f6cd60b241 100644
--- a/examples/widgets/graphicsview/diagramscene/arrow.h
+++ b/examples/widgets/graphicsview/diagramscene/arrow.h
@@ -63,22 +63,17 @@ public:
     Arrow(DiagramItem *startItem, DiagramItem *endItem,
       QGraphicsItem *parent = 0);
 
-    int type() const
-        { return Type; }
+    int type() const { return Type; }
     QRectF boundingRect() const;
     QPainterPath shape() const;
-    void setColor(const QColor &color)
-        { myColor = color; }
-    DiagramItem *startItem() const
-        { return myStartItem; }
-    DiagramItem *endItem() const
-        { return myEndItem; }
+    void setColor(const QColor &color) { myColor = color; }
+    DiagramItem *startItem() const { return myStartItem; }
+    DiagramItem *endItem() const { return myEndItem; }
 
     void updatePosition();
 
 protected:
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-               QWidget *widget = 0);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
 private:
     DiagramItem *myStartItem;
@@ -88,4 +83,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // ARROW_H
diff --git a/examples/widgets/graphicsview/diagramscene/diagramitem.cpp b/examples/widgets/graphicsview/diagramscene/diagramitem.cpp
index e3f4271304..1eaecbda91 100644
--- a/examples/widgets/graphicsview/diagramscene/diagramitem.cpp
+++ b/examples/widgets/graphicsview/diagramscene/diagramitem.cpp
@@ -38,11 +38,14 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "diagramitem.h"
 #include "arrow.h"
 
+#include <QGraphicsScene>
+#include <QGraphicsSceneContextMenuEvent>
+#include <QMenu>
+#include <QPainter>
+
 //! [0]
 DiagramItem::DiagramItem(DiagramType diagramType, QMenu *contextMenu,
              QGraphicsItem *parent)
@@ -138,8 +141,7 @@ void DiagramItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 //! [5]
 
 //! [6]
-QVariant DiagramItem::itemChange(GraphicsItemChange change,
-                     const QVariant &value)
+QVariant DiagramItem::itemChange(GraphicsItemChange change, const QVariant &value)
 {
     if (change == QGraphicsItem::ItemPositionChange) {
         foreach (Arrow *arrow, arrows) {
diff --git a/examples/widgets/graphicsview/diagramscene/diagramitem.h b/examples/widgets/graphicsview/diagramscene/diagramitem.h
index d60b6acde1..97da81e12e 100644
--- a/examples/widgets/graphicsview/diagramscene/diagramitem.h
+++ b/examples/widgets/graphicsview/diagramscene/diagramitem.h
@@ -67,19 +67,15 @@ public:
     enum { Type = UserType + 15 };
     enum DiagramType { Step, Conditional, StartEnd, Io };
 
-    DiagramItem(DiagramType diagramType, QMenu *contextMenu,
-        QGraphicsItem *parent = 0);
+    DiagramItem(DiagramType diagramType, QMenu *contextMenu, QGraphicsItem *parent = 0);
 
     void removeArrow(Arrow *arrow);
     void removeArrows();
-    DiagramType diagramType() const
-        { return myDiagramType; }
-    QPolygonF polygon() const
-        { return myPolygon; }
+    DiagramType diagramType() const { return myDiagramType; }
+    QPolygonF polygon() const { return myPolygon; }
     void addArrow(Arrow *arrow);
     QPixmap image() const;
-    int type() const
-        { return Type;}
+    int type() const { return Type;}
 
 protected:
     void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
@@ -93,4 +89,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // DIAGRAMITEM_H
diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.cpp b/examples/widgets/graphicsview/diagramscene/diagramscene.cpp
index b485e322e4..f695069616 100644
--- a/examples/widgets/graphicsview/diagramscene/diagramscene.cpp
+++ b/examples/widgets/graphicsview/diagramscene/diagramscene.cpp
@@ -38,11 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "diagramscene.h"
 #include "arrow.h"
 
+#include <QTextCursor>
+#include <QGraphicsSceneMouseEvent>
+
 //! [0]
 DiagramScene::DiagramScene(QMenu *itemMenu, QObject *parent)
     : QGraphicsScene(parent)
@@ -63,8 +64,7 @@ void DiagramScene::setLineColor(const QColor &color)
 {
     myLineColor = color;
     if (isItemChange(Arrow::Type)) {
-        Arrow *item =
-            qgraphicsitem_cast<Arrow *>(selectedItems().first());
+        Arrow *item = qgraphicsitem_cast<Arrow *>(selectedItems().first());
         item->setColor(myLineColor);
         update();
     }
@@ -76,8 +76,7 @@ void DiagramScene::setTextColor(const QColor &color)
 {
     myTextColor = color;
     if (isItemChange(DiagramTextItem::Type)) {
-        DiagramTextItem *item =
-            qgraphicsitem_cast<DiagramTextItem *>(selectedItems().first());
+        DiagramTextItem *item = qgraphicsitem_cast<DiagramTextItem *>(selectedItems().first());
         item->setDefaultTextColor(myTextColor);
     }
 }
@@ -88,8 +87,7 @@ void DiagramScene::setItemColor(const QColor &color)
 {
     myItemColor = color;
     if (isItemChange(DiagramItem::Type)) {
-        DiagramItem *item =
-            qgraphicsitem_cast<DiagramItem *>(selectedItems().first());
+        DiagramItem *item = qgraphicsitem_cast<DiagramItem *>(selectedItems().first());
         item->setBrush(myItemColor);
     }
 }
@@ -101,8 +99,7 @@ void DiagramScene::setFont(const QFont &font)
     myFont = font;
 
     if (isItemChange(DiagramTextItem::Type)) {
-        QGraphicsTextItem *item =
-            qgraphicsitem_cast<DiagramTextItem *>(selectedItems().first());
+        QGraphicsTextItem *item = qgraphicsitem_cast<DiagramTextItem *>(selectedItems().first());
         //At this point the selection can change so the first selected item might not be a DiagramTextItem
         if (item)
             item->setFont(myFont);
@@ -209,10 +206,8 @@ void DiagramScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent)
             startItems.first()->type() == DiagramItem::Type &&
             endItems.first()->type() == DiagramItem::Type &&
             startItems.first() != endItems.first()) {
-            DiagramItem *startItem =
-                qgraphicsitem_cast<DiagramItem *>(startItems.first());
-            DiagramItem *endItem =
-                qgraphicsitem_cast<DiagramItem *>(endItems.first());
+            DiagramItem *startItem = qgraphicsitem_cast<DiagramItem *>(startItems.first());
+            DiagramItem *endItem = qgraphicsitem_cast<DiagramItem *>(endItems.first());
             Arrow *arrow = new Arrow(startItem, endItem);
             arrow->setColor(myLineColor);
             startItem->addArrow(arrow);
diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.h b/examples/widgets/graphicsview/diagramscene/diagramscene.h
index 1ce3e30af5..96df6cbe88 100644
--- a/examples/widgets/graphicsview/diagramscene/diagramscene.h
+++ b/examples/widgets/graphicsview/diagramscene/diagramscene.h
@@ -41,10 +41,11 @@
 #ifndef DIAGRAMSCENE_H
 #define DIAGRAMSCENE_H
 
-#include <QGraphicsScene>
 #include "diagramitem.h"
 #include "diagramtextitem.h"
 
+#include <QGraphicsScene>
+
 QT_BEGIN_NAMESPACE
 class QGraphicsSceneMouseEvent;
 class QMenu;
@@ -64,14 +65,10 @@ public:
     enum Mode { InsertItem, InsertLine, InsertText, MoveItem };
 
     explicit DiagramScene(QMenu *itemMenu, QObject *parent = 0);
-    QFont font() const
-        { return myFont; }
-    QColor textColor() const
-        { return myTextColor; }
-    QColor itemColor() const
-        { return myItemColor; }
-    QColor lineColor() const
-        { return myLineColor; }
+    QFont font() const { return myFont; }
+    QColor textColor() const { return myTextColor; }
+    QColor itemColor() const { return myItemColor; }
+    QColor lineColor() const { return myLineColor; }
     void setLineColor(const QColor &color);
     void setTextColor(const QColor &color);
     void setItemColor(const QColor &color);
@@ -109,4 +106,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // DIAGRAMSCENE_H
diff --git a/examples/widgets/graphicsview/diagramscene/diagramtextitem.cpp b/examples/widgets/graphicsview/diagramscene/diagramtextitem.cpp
index b4e80508fe..8ad8bba633 100644
--- a/examples/widgets/graphicsview/diagramscene/diagramtextitem.cpp
+++ b/examples/widgets/graphicsview/diagramscene/diagramtextitem.cpp
@@ -38,8 +38,6 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "diagramtextitem.h"
 #include "diagramscene.h"
 
diff --git a/examples/widgets/graphicsview/diagramscene/diagramtextitem.h b/examples/widgets/graphicsview/diagramscene/diagramtextitem.h
index c6cff61b36..81013ed014 100644
--- a/examples/widgets/graphicsview/diagramscene/diagramtextitem.h
+++ b/examples/widgets/graphicsview/diagramscene/diagramtextitem.h
@@ -61,8 +61,7 @@ public:
 
     DiagramTextItem(QGraphicsItem *parent = 0);
 
-    int type() const
-        { return Type; }
+    int type() const { return Type; }
 
 signals:
     void lostFocus(DiagramTextItem *item);
@@ -75,4 +74,4 @@ protected:
 };
 //! [0]
 
-#endif
+#endif // DIAGRAMTEXTITEM_H
diff --git a/examples/widgets/graphicsview/diagramscene/main.cpp b/examples/widgets/graphicsview/diagramscene/main.cpp
index b672c6ea8d..7f0bcfaaee 100644
--- a/examples/widgets/graphicsview/diagramscene/main.cpp
+++ b/examples/widgets/graphicsview/diagramscene/main.cpp
@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "mainwindow.h"
 
+#include <QApplication>
+
 int main(int argv, char *args[])
 {
     Q_INIT_RESOURCE(diagramscene);
diff --git a/examples/widgets/graphicsview/diagramscene/mainwindow.cpp b/examples/widgets/graphicsview/diagramscene/mainwindow.cpp
index 39ebe48488..a39c9ba178 100644
--- a/examples/widgets/graphicsview/diagramscene/mainwindow.cpp
+++ b/examples/widgets/graphicsview/diagramscene/mainwindow.cpp
@@ -38,14 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-#include <QLabel>
-
-#include "mainwindow.h"
+#include "arrow.h"
 #include "diagramitem.h"
 #include "diagramscene.h"
 #include "diagramtextitem.h"
-#include "arrow.h"
+#include "mainwindow.h"
+
+#include <QtWidgets>
 
 const int InsertTextButton = 10;
 
@@ -61,9 +60,9 @@ MainWindow::MainWindow()
     connect(scene, SIGNAL(itemInserted(DiagramItem*)),
             this, SLOT(itemInserted(DiagramItem*)));
     connect(scene, SIGNAL(textInserted(QGraphicsTextItem*)),
-        this, SLOT(textInserted(QGraphicsTextItem*)));
+            this, SLOT(textInserted(QGraphicsTextItem*)));
     connect(scene, SIGNAL(itemSelected(QGraphicsItem*)),
-        this, SLOT(itemSelected(QGraphicsItem*)));
+            this, SLOT(itemSelected(QGraphicsItem*)));
     createToolbars();
 
     QHBoxLayout *layout = new QHBoxLayout;
@@ -85,8 +84,8 @@ void MainWindow::backgroundButtonGroupClicked(QAbstractButton *button)
 {
     QList<QAbstractButton *> buttons = backgroundButtonGroup->buttons();
     foreach (QAbstractButton *myButton, buttons) {
-    if (myButton != button)
-        button->setChecked(false);
+        if (myButton != button)
+            button->setChecked(false);
     }
     QString text = button->text();
     if (text == tr("Blue Grid"))
@@ -108,8 +107,8 @@ void MainWindow::buttonGroupClicked(int id)
 {
     QList<QAbstractButton *> buttons = buttonGroup->buttons();
     foreach (QAbstractButton *button, buttons) {
-    if (buttonGroup->button(id) != button)
-        button->setChecked(false);
+        if (buttonGroup->button(id) != button)
+            button->setChecked(false);
     }
     if (id == InsertTextButton) {
         scene->setMode(DiagramScene::InsertText);
@@ -134,9 +133,8 @@ void MainWindow::deleteItem()
     }
 
     foreach (QGraphicsItem *item, scene->selectedItems()) {
-         if (item->type() == DiagramItem::Type) {
+         if (item->type() == DiagramItem::Type)
              qgraphicsitem_cast<DiagramItem *>(item)->removeArrows();
-         }
          scene->removeItem(item);
          delete item;
      }
@@ -161,8 +159,7 @@ void MainWindow::bringToFront()
 
     qreal zValue = 0;
     foreach (QGraphicsItem *item, overlapItems) {
-        if (item->zValue() >= zValue &&
-            item->type() == DiagramItem::Type)
+        if (item->zValue() >= zValue && item->type() == DiagramItem::Type)
             zValue = item->zValue() + 0.1;
     }
     selectedItem->setZValue(zValue);
@@ -180,8 +177,7 @@ void MainWindow::sendToBack()
 
     qreal zValue = 0;
     foreach (QGraphicsItem *item, overlapItems) {
-        if (item->zValue() <= zValue &&
-            item->type() == DiagramItem::Type)
+        if (item->zValue() <= zValue && item->type() == DiagramItem::Type)
             zValue = item->zValue() - 0.1;
     }
     selectedItem->setZValue(zValue);
@@ -235,8 +231,8 @@ void MainWindow::textColorChanged()
 {
     textAction = qobject_cast<QAction *>(sender());
     fontColorToolButton->setIcon(createColorToolButtonIcon(
-                ":/images/textpointer.png",
-                qvariant_cast<QColor>(textAction->data())));
+                                     ":/images/textpointer.png",
+                                     qvariant_cast<QColor>(textAction->data())));
     textButtonTriggered();
 }
 //! [12]
@@ -246,8 +242,8 @@ void MainWindow::itemColorChanged()
 {
     fillAction = qobject_cast<QAction *>(sender());
     fillColorToolButton->setIcon(createColorToolButtonIcon(
-                 ":/images/floodfill.png",
-                 qvariant_cast<QColor>(fillAction->data())));
+                                     ":/images/floodfill.png",
+                                     qvariant_cast<QColor>(fillAction->data())));
     fillButtonTriggered();
 }
 //! [13]
@@ -257,8 +253,8 @@ void MainWindow::lineColorChanged()
 {
     lineAction = qobject_cast<QAction *>(sender());
     lineColorToolButton->setIcon(createColorToolButtonIcon(
-                 ":/images/linecolor.png",
-                 qvariant_cast<QColor>(lineAction->data())));
+                                     ":/images/linecolor.png",
+                                     qvariant_cast<QColor>(lineAction->data())));
     lineButtonTriggered();
 }
 //! [14]
@@ -329,12 +325,9 @@ void MainWindow::createToolBox()
     connect(buttonGroup, SIGNAL(buttonClicked(int)),
             this, SLOT(buttonGroupClicked(int)));
     QGridLayout *layout = new QGridLayout;
-    layout->addWidget(createCellWidget(tr("Conditional"),
-                               DiagramItem::Conditional), 0, 0);
-    layout->addWidget(createCellWidget(tr("Process"),
-                      DiagramItem::Step),0, 1);
-    layout->addWidget(createCellWidget(tr("Input/Output"),
-                      DiagramItem::Io), 1, 0);
+    layout->addWidget(createCellWidget(tr("Conditional"), DiagramItem::Conditional), 0, 0);
+    layout->addWidget(createCellWidget(tr("Process"), DiagramItem::Step),0, 1);
+    layout->addWidget(createCellWidget(tr("Input/Output"), DiagramItem::Io), 1, 0);
 //! [21]
 
     QToolButton *textButton = new QToolButton;
@@ -361,13 +354,13 @@ void MainWindow::createToolBox()
 
     QGridLayout *backgroundLayout = new QGridLayout;
     backgroundLayout->addWidget(createBackgroundCellWidget(tr("Blue Grid"),
-                ":/images/background1.png"), 0, 0);
+                                                           ":/images/background1.png"), 0, 0);
     backgroundLayout->addWidget(createBackgroundCellWidget(tr("White Grid"),
-                ":/images/background2.png"), 0, 1);
+                                                           ":/images/background2.png"), 0, 1);
     backgroundLayout->addWidget(createBackgroundCellWidget(tr("Gray Grid"),
-                    ":/images/background3.png"), 1, 0);
+                                                           ":/images/background3.png"), 1, 0);
     backgroundLayout->addWidget(createBackgroundCellWidget(tr("No Grid"),
-                ":/images/background4.png"), 1, 1);
+                                                           ":/images/background4.png"), 1, 1);
 
     backgroundLayout->setRowStretch(2, 10);
     backgroundLayout->setColumnStretch(2, 10);
@@ -392,23 +385,18 @@ void MainWindow::createActions()
                                 tr("Bring to &Front"), this);
     toFrontAction->setShortcut(tr("Ctrl+F"));
     toFrontAction->setStatusTip(tr("Bring item to front"));
-    connect(toFrontAction, SIGNAL(triggered()),
-            this, SLOT(bringToFront()));
+    connect(toFrontAction, SIGNAL(triggered()), this, SLOT(bringToFront()));
 //! [23]
 
-    sendBackAction = new QAction(QIcon(":/images/sendtoback.png"),
-                                 tr("Send to &Back"), this);
+    sendBackAction = new QAction(QIcon(":/images/sendtoback.png"), tr("Send to &Back"), this);
     sendBackAction->setShortcut(tr("Ctrl+B"));
     sendBackAction->setStatusTip(tr("Send item to back"));
-    connect(sendBackAction, SIGNAL(triggered()),
-        this, SLOT(sendToBack()));
+    connect(sendBackAction, SIGNAL(triggered()), this, SLOT(sendToBack()));
 
-    deleteAction = new QAction(QIcon(":/images/delete.png"),
-                               tr("&Delete"), this);
+    deleteAction = new QAction(QIcon(":/images/delete.png"), tr("&Delete"), this);
     deleteAction->setShortcut(tr("Delete"));
     deleteAction->setStatusTip(tr("Delete item from diagram"));
-    connect(deleteAction, SIGNAL(triggered()),
-        this, SLOT(deleteItem()));
+    connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItem()));
 
     exitAction = new QAction(tr("E&xit"), this);
     exitAction->setShortcuts(QKeySequence::Quit);
@@ -420,27 +408,21 @@ void MainWindow::createActions()
     QPixmap pixmap(":/images/bold.png");
     boldAction->setIcon(QIcon(pixmap));
     boldAction->setShortcut(tr("Ctrl+B"));
-    connect(boldAction, SIGNAL(triggered()),
-            this, SLOT(handleFontChange()));
+    connect(boldAction, SIGNAL(triggered()), this, SLOT(handleFontChange()));
 
-    italicAction = new QAction(QIcon(":/images/italic.png"),
-                               tr("Italic"), this);
+    italicAction = new QAction(QIcon(":/images/italic.png"), tr("Italic"), this);
     italicAction->setCheckable(true);
     italicAction->setShortcut(tr("Ctrl+I"));
-    connect(italicAction, SIGNAL(triggered()),
-            this, SLOT(handleFontChange()));
+    connect(italicAction, SIGNAL(triggered()), this, SLOT(handleFontChange()));
 
-    underlineAction = new QAction(QIcon(":/images/underline.png"),
-                                  tr("Underline"), this);
+    underlineAction = new QAction(QIcon(":/images/underline.png"), tr("Underline"), this);
     underlineAction->setCheckable(true);
     underlineAction->setShortcut(tr("Ctrl+U"));
-    connect(underlineAction, SIGNAL(triggered()),
-            this, SLOT(handleFontChange()));
+    connect(underlineAction, SIGNAL(triggered()), this, SLOT(handleFontChange()));
 
     aboutAction = new QAction(tr("A&bout"), this);
     aboutAction->setShortcut(tr("Ctrl+B"));
-    connect(aboutAction, SIGNAL(triggered()),
-            this, SLOT(about()));
+    connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
 }
 
 //! [24]
@@ -484,11 +466,9 @@ void MainWindow::createToolbars()
 
     fontColorToolButton = new QToolButton;
     fontColorToolButton->setPopupMode(QToolButton::MenuButtonPopup);
-    fontColorToolButton->setMenu(createColorMenu(SLOT(textColorChanged()),
-                                                 Qt::black));
+    fontColorToolButton->setMenu(createColorMenu(SLOT(textColorChanged()), Qt::black));
     textAction = fontColorToolButton->menu()->defaultAction();
-    fontColorToolButton->setIcon(createColorToolButtonIcon(
-    ":/images/textpointer.png", Qt::black));
+    fontColorToolButton->setIcon(createColorToolButtonIcon(":/images/textpointer.png", Qt::black));
     fontColorToolButton->setAutoFillBackground(true);
     connect(fontColorToolButton, SIGNAL(clicked()),
             this, SLOT(textButtonTriggered()));
@@ -496,22 +476,20 @@ void MainWindow::createToolbars()
 //! [26]
     fillColorToolButton = new QToolButton;
     fillColorToolButton->setPopupMode(QToolButton::MenuButtonPopup);
-    fillColorToolButton->setMenu(createColorMenu(SLOT(itemColorChanged()),
-                         Qt::white));
+    fillColorToolButton->setMenu(createColorMenu(SLOT(itemColorChanged()), Qt::white));
     fillAction = fillColorToolButton->menu()->defaultAction();
     fillColorToolButton->setIcon(createColorToolButtonIcon(
-    ":/images/floodfill.png", Qt::white));
+                                     ":/images/floodfill.png", Qt::white));
     connect(fillColorToolButton, SIGNAL(clicked()),
             this, SLOT(fillButtonTriggered()));
 //! [26]
 
     lineColorToolButton = new QToolButton;
     lineColorToolButton->setPopupMode(QToolButton::MenuButtonPopup);
-    lineColorToolButton->setMenu(createColorMenu(SLOT(lineColorChanged()),
-                                 Qt::black));
+    lineColorToolButton->setMenu(createColorMenu(SLOT(lineColorChanged()), Qt::black));
     lineAction = lineColorToolButton->menu()->defaultAction();
     lineColorToolButton->setIcon(createColorToolButtonIcon(
-        ":/images/linecolor.png", Qt::black));
+                                     ":/images/linecolor.png", Qt::black));
     connect(lineColorToolButton, SIGNAL(clicked()),
             this, SLOT(lineButtonTriggered()));
 
@@ -537,8 +515,7 @@ void MainWindow::createToolbars()
 
     pointerTypeGroup = new QButtonGroup(this);
     pointerTypeGroup->addButton(pointerButton, int(DiagramScene::MoveItem));
-    pointerTypeGroup->addButton(linePointerButton,
-                                int(DiagramScene::InsertLine));
+    pointerTypeGroup->addButton(linePointerButton, int(DiagramScene::InsertLine));
     connect(pointerTypeGroup, SIGNAL(buttonClicked(int)),
             this, SLOT(pointerGroupClicked(int)));
 
@@ -559,8 +536,7 @@ void MainWindow::createToolbars()
 //! [27]
 
 //! [28]
-QWidget *MainWindow::createBackgroundCellWidget(const QString &text,
-                        const QString &image)
+QWidget *MainWindow::createBackgroundCellWidget(const QString &text, const QString &image)
 {
     QToolButton *button = new QToolButton;
     button->setText(text);
@@ -581,8 +557,7 @@ QWidget *MainWindow::createBackgroundCellWidget(const QString &text,
 //! [28]
 
 //! [29]
-QWidget *MainWindow::createCellWidget(const QString &text,
-                      DiagramItem::DiagramType type)
+QWidget *MainWindow::createCellWidget(const QString &text, DiagramItem::DiagramType type)
 {
 
     DiagramItem item(type, itemMenu);
@@ -619,20 +594,17 @@ QMenu *MainWindow::createColorMenu(const char *slot, QColor defaultColor)
         QAction *action = new QAction(names.at(i), this);
         action->setData(colors.at(i));
         action->setIcon(createColorIcon(colors.at(i)));
-        connect(action, SIGNAL(triggered()),
-                this, slot);
+        connect(action, SIGNAL(triggered()), this, slot);
         colorMenu->addAction(action);
-        if (colors.at(i) == defaultColor) {
+        if (colors.at(i) == defaultColor)
             colorMenu->setDefaultAction(action);
-        }
     }
     return colorMenu;
 }
 //! [30]
 
 //! [31]
-QIcon MainWindow::createColorToolButtonIcon(const QString &imageFile,
-                        QColor color)
+QIcon MainWindow::createColorToolButtonIcon(const QString &imageFile, QColor color)
 {
     QPixmap pixmap(50, 80);
     pixmap.fill(Qt::transparent);
diff --git a/examples/widgets/graphicsview/diagramscene/mainwindow.h b/examples/widgets/graphicsview/diagramscene/mainwindow.h
index 05e026b101..a6ac18cc91 100644
--- a/examples/widgets/graphicsview/diagramscene/mainwindow.h
+++ b/examples/widgets/graphicsview/diagramscene/mainwindow.h
@@ -41,10 +41,10 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
-
 #include "diagramitem.h"
 
+#include <QMainWindow>
+
 class DiagramScene;
 
 QT_BEGIN_NAMESPACE
@@ -147,4 +147,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // MAINWINDOW_H
diff --git a/examples/widgets/graphicsview/elasticnodes/edge.cpp b/examples/widgets/graphicsview/elasticnodes/edge.cpp
index dcefedeabf..c71b36e5ee 100644
--- a/examples/widgets/graphicsview/elasticnodes/edge.cpp
+++ b/examples/widgets/graphicsview/elasticnodes/edge.cpp
@@ -38,13 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QPainter>
-
 #include "edge.h"
 #include "node.h"
 
 #include <math.h>
 
+#include <QPainter>
+
 static const double Pi = 3.14159265358979323846264338327950288419717;
 static double TwoPi = 2.0 * Pi;
 
diff --git a/examples/widgets/graphicsview/elasticnodes/edge.h b/examples/widgets/graphicsview/elasticnodes/edge.h
index b6d562887c..1e3febddb8 100644
--- a/examples/widgets/graphicsview/elasticnodes/edge.h
+++ b/examples/widgets/graphicsview/elasticnodes/edge.h
@@ -72,4 +72,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // EDGE_H
diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp
index ed2195f021..67b6088079 100644
--- a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp
+++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp
@@ -42,10 +42,10 @@
 #include "edge.h"
 #include "node.h"
 
-#include <QtWidgets>
-
 #include <math.h>
 
+#include <QKeyEvent>
+
 //! [0]
 GraphWidget::GraphWidget(QWidget *parent)
     : QGraphicsView(parent), timerId(0)
diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.h b/examples/widgets/graphicsview/elasticnodes/graphwidget.h
index d85e91aa6d..064d3bf00a 100644
--- a/examples/widgets/graphicsview/elasticnodes/graphwidget.h
+++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.h
@@ -41,7 +41,7 @@
 #ifndef GRAPHWIDGET_H
 #define GRAPHWIDGET_H
 
-#include <QtWidgets/QGraphicsView>
+#include <QGraphicsView>
 
 class Node;
 
@@ -74,4 +74,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // GRAPHWIDGET_H
diff --git a/examples/widgets/graphicsview/elasticnodes/main.cpp b/examples/widgets/graphicsview/elasticnodes/main.cpp
index 1cd45dd6f3..80a6c37f0b 100644
--- a/examples/widgets/graphicsview/elasticnodes/main.cpp
+++ b/examples/widgets/graphicsview/elasticnodes/main.cpp
@@ -38,10 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "graphwidget.h"
 
+#include <QApplication>
+#include <QTime>
+#include <QMainWindow>
+
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
diff --git a/examples/widgets/graphicsview/elasticnodes/node.cpp b/examples/widgets/graphicsview/elasticnodes/node.cpp
index 9f85ac03f3..623c452c59 100644
--- a/examples/widgets/graphicsview/elasticnodes/node.cpp
+++ b/examples/widgets/graphicsview/elasticnodes/node.cpp
@@ -38,15 +38,15 @@
 **
 ****************************************************************************/
 
+#include "edge.h"
+#include "node.h"
+#include "graphwidget.h"
+
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QStyleOption>
 
-#include "edge.h"
-#include "node.h"
-#include "graphwidget.h"
-
 //! [0]
 Node::Node(GraphWidget *graphWidget)
     : graph(graphWidget)
@@ -142,8 +142,7 @@ bool Node::advance()
 QRectF Node::boundingRect() const
 {
     qreal adjust = 2;
-    return QRectF( -10 - adjust, -10 - adjust,
-                  23 + adjust, 23 + adjust);
+    return QRectF( -10 - adjust, -10 - adjust, 23 + adjust, 23 + adjust);
 }
 //! [8]
 
diff --git a/examples/widgets/graphicsview/elasticnodes/node.h b/examples/widgets/graphicsview/elasticnodes/node.h
index 9b1335b36b..29dc32bb8b 100644
--- a/examples/widgets/graphicsview/elasticnodes/node.h
+++ b/examples/widgets/graphicsview/elasticnodes/node.h
@@ -82,4 +82,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // NODE_H
diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
index 5374e84c38..13c9395be3 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
+++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
@@ -41,7 +41,9 @@
 
 #include "customproxy.h"
 
-#include <QtWidgets>
+#include <QStyleOptionGraphicsItem>
+#include <QPainter>
+#include <QGraphicsScene>
 
 CustomProxy::CustomProxy(QGraphicsItem *parent, Qt::WindowFlags wFlags)
     : QGraphicsProxyWidget(parent, wFlags), popupShown(false), currentPopup(0)
@@ -95,13 +97,16 @@ void CustomProxy::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 void CustomProxy::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
     QGraphicsProxyWidget::hoverLeaveEvent(event);
-    if (!popupShown && (timeLine->direction() != QTimeLine::Backward || timeLine->currentValue() != 0))
+    if (!popupShown
+            && (timeLine->direction() != QTimeLine::Backward || timeLine->currentValue() != 0)) {
         zoomOut();
+    }
 }
 
 bool CustomProxy::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
 {
-    if (watched->isWindow() && (event->type() == QEvent::UngrabMouse || event->type() == QEvent::GrabMouse)) {
+    if (watched->isWindow()
+            && (event->type() == QEvent::UngrabMouse || event->type() == QEvent::GrabMouse)) {
         popupShown = watched->isVisible();
         if (!popupShown && !isUnderMouse())
             zoomOut();
@@ -142,10 +147,10 @@ void CustomProxy::updateStep(qreal step)
 void CustomProxy::stateChanged(QTimeLine::State state)
 {
     if (state == QTimeLine::Running) {
-	if (timeLine->direction() == QTimeLine::Forward)
+        if (timeLine->direction() == QTimeLine::Forward)
             setCacheMode(ItemCoordinateCache);
     } else if (state == QTimeLine::NotRunning) {
-	if (timeLine->direction() == QTimeLine::Backward)
+        if (timeLine->direction() == QTimeLine::Backward)
             setCacheMode(DeviceCoordinateCache);
     }
 }
diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.h b/examples/widgets/graphicsview/embeddeddialogs/customproxy.h
index 4e884779fc..b20c05ce5b 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.h
+++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.h
@@ -42,12 +42,13 @@
 #ifndef CUSTOMPROXY_H
 #define CUSTOMPROXY_H
 
-#include <QtCore/qtimeline.h>
-#include <QtWidgets/qgraphicsproxywidget.h>
+#include <QTimeLine>
+#include <QGraphicsProxyWidget>
 
 class CustomProxy : public QGraphicsProxyWidget
 {
     Q_OBJECT
+
 public:
     explicit CustomProxy(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
 
@@ -73,4 +74,4 @@ private:
     QGraphicsItem *currentPopup;
 };
 
-#endif
+#endif // CUSTOMPROXY_H
diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp
index d18f537eb9..aa80f1e9c0 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp
+++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.cpp
@@ -42,12 +42,12 @@
 #include "embeddeddialog.h"
 #include "ui_embeddeddialog.h"
 
-#include <QtWidgets>
+#include <QStyleFactory>
 
 EmbeddedDialog::EmbeddedDialog(QWidget *parent)
     : QDialog(parent)
+    , ui(new Ui::EmbeddedDialog)
 {
-    ui = new Ui_embeddedDialog;
     ui->setupUi(this);
     ui->layoutDirection->setCurrentIndex(layoutDirection() != Qt::LeftToRight);
 
diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h
index 88f2ae5983..3217b9a619 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h
+++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h
@@ -42,13 +42,18 @@
 #ifndef EMBEDDEDDIALOG_H
 #define EMBEDDEDDIALOG_H
 
-#include <QtWidgets/qdialog.h>
+#include <QDialog>
 
-QT_FORWARD_DECLARE_CLASS(Ui_embeddedDialog);
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class EmbeddedDialog;
+}
+QT_END_NAMESPACE
 
 class EmbeddedDialog : public QDialog
 {
     Q_OBJECT
+
 public:
     EmbeddedDialog(QWidget *parent = 0);
     ~EmbeddedDialog();
@@ -60,7 +65,7 @@ private slots:
     void styleChanged(const QString &styleName);
 
 private:
-    Ui_embeddedDialog *ui;
+    Ui::EmbeddedDialog *ui;
 };
 
-#endif
+#endif // EMBEDDEDDIALOG_H
diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.ui b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.ui
index f967b10085..82aa5d7be3 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.ui
+++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
- <class>embeddedDialog</class>
- <widget class="QDialog" name="embeddedDialog" >
-  <property name="geometry" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>EmbeddedDialog</class>
+ <widget class="QDialog" name="EmbeddedDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,73 +10,73 @@
     <height>134</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Embedded Dialog</string>
   </property>
-  <layout class="QFormLayout" name="formLayout" >
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+  <layout class="QFormLayout" name="formLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
       <string>Layout Direction:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>layoutDirection</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="layoutDirection" >
+   <item row="0" column="1">
+    <widget class="QComboBox" name="layoutDirection">
      <item>
-      <property name="text" >
+      <property name="text">
        <string>Left to Right</string>
       </property>
      </item>
      <item>
-      <property name="text" >
+      <property name="text">
        <string>Right to Left</string>
       </property>
      </item>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
       <string>Select Font:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>fontComboBox</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" >
-    <widget class="QFontComboBox" name="fontComboBox" />
+   <item row="1" column="1">
+    <widget class="QFontComboBox" name="fontComboBox"/>
    </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="label_3" >
-     <property name="text" >
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
       <string>Style:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>style</cstring>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" >
-    <widget class="QComboBox" name="style" />
+   <item row="2" column="1">
+    <widget class="QComboBox" name="style"/>
    </item>
-   <item row="3" column="0" >
-    <widget class="QLabel" name="label_4" >
-     <property name="text" >
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
       <string>Layout spacing:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>spacing</cstring>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" >
-    <widget class="QSlider" name="spacing" >
-     <property name="orientation" >
+   <item row="3" column="1">
+    <widget class="QSlider" name="spacing">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
diff --git a/examples/widgets/graphicsview/embeddeddialogs/main.cpp b/examples/widgets/graphicsview/embeddeddialogs/main.cpp
index 90b470df54..2cc5c78baa 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/main.cpp
+++ b/examples/widgets/graphicsview/embeddeddialogs/main.cpp
@@ -42,7 +42,9 @@
 #include "customproxy.h"
 #include "embeddeddialog.h"
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QGraphicsScene>
+#include <QGraphicsView>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/widgets/graphicsview/flowlayout/flowlayout.cpp b/examples/widgets/graphicsview/flowlayout/flowlayout.cpp
index d43719005f..f994b780b8 100644
--- a/examples/widgets/graphicsview/flowlayout/flowlayout.cpp
+++ b/examples/widgets/graphicsview/flowlayout/flowlayout.cpp
@@ -39,8 +39,10 @@
 ****************************************************************************/
 
 #include "flowlayout.h"
-#include <QtWidgets/qwidget.h>
-#include <QtCore/qmath.h>
+
+#include <qmath.h>
+
+#include <QWidget>
 
 FlowLayout::FlowLayout()
 {
diff --git a/examples/widgets/graphicsview/flowlayout/flowlayout.h b/examples/widgets/graphicsview/flowlayout/flowlayout.h
index 01a3474257..344f5b4db8 100644
--- a/examples/widgets/graphicsview/flowlayout/flowlayout.h
+++ b/examples/widgets/graphicsview/flowlayout/flowlayout.h
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/qgraphicslayout.h>
+#include <QGraphicsLayout>
 
 class FlowLayout : public QGraphicsLayout
 {
diff --git a/examples/widgets/graphicsview/flowlayout/main.cpp b/examples/widgets/graphicsview/flowlayout/main.cpp
index 22d0d0c1da..378cb39bc5 100644
--- a/examples/widgets/graphicsview/flowlayout/main.cpp
+++ b/examples/widgets/graphicsview/flowlayout/main.cpp
@@ -38,10 +38,13 @@
 **
 ****************************************************************************/
 
-#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/flowlayout/window.cpp b/examples/widgets/graphicsview/flowlayout/window.cpp
index c22c2a067b..ec3edfd830 100644
--- a/examples/widgets/graphicsview/flowlayout/window.cpp
+++ b/examples/widgets/graphicsview/flowlayout/window.cpp
@@ -38,17 +38,18 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/qgraphicsproxywidget.h>
-#include <QtWidgets/qlabel.h>
 #include "flowlayout.h"
 #include "window.h"
 
+#include <QGraphicsProxyWidget>
+#include <QLabel>
+
 Window::Window()
 : QGraphicsWidget(0, Qt::Window)
 {
     FlowLayout *lay = new FlowLayout;
     QLatin1String wiseWords("I am not bothered by the fact that I am unknown."
-    " I am bothered when I do not know others. (Confucius)");
+                            " I am bothered when I do not know others. (Confucius)");
     QString sentence(wiseWords);
     QStringList words = sentence.split(QLatin1Char(' '), QString::SkipEmptyParts);
     for (int i = 0; i < words.count(); ++i) {
diff --git a/examples/widgets/graphicsview/flowlayout/window.h b/examples/widgets/graphicsview/flowlayout/window.h
index 0792e866ad..734aac92ce 100644
--- a/examples/widgets/graphicsview/flowlayout/window.h
+++ b/examples/widgets/graphicsview/flowlayout/window.h
@@ -38,10 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/qgraphicswidget.h>
+#include <QGraphicsWidget>
 
-class Window : public QGraphicsWidget {
+class Window : public QGraphicsWidget
+{
     Q_OBJECT
+
 public:
     Window();
 };
diff --git a/examples/widgets/graphicsview/padnavigator/flippablepad.cpp b/examples/widgets/graphicsview/padnavigator/flippablepad.cpp
index 3941048050..1318b45a28 100644
--- a/examples/widgets/graphicsview/padnavigator/flippablepad.cpp
+++ b/examples/widgets/graphicsview/padnavigator/flippablepad.cpp
@@ -40,7 +40,7 @@
 
 #include "flippablepad.h"
 
-#include <QtWidgets/QtWidgets>
+#include <QDirIterator>
 
 //! [0]
 static QRectF boundsFromSize(const QSize &size)
diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.cpp b/examples/widgets/graphicsview/padnavigator/padnavigator.cpp
index cb87ec36a7..1a8418b3d3 100644
--- a/examples/widgets/graphicsview/padnavigator/padnavigator.cpp
+++ b/examples/widgets/graphicsview/padnavigator/padnavigator.cpp
@@ -42,9 +42,8 @@
 #include "padnavigator.h"
 #include "splashitem.h"
 
-#include <QtWidgets/QtWidgets>
 #ifndef QT_NO_OPENGL
-#include <QtOpenGL/QtOpenGL>
+#include <QtOpenGL>
 #endif
 
 //! [0]
@@ -90,8 +89,7 @@ PadNavigator::PadNavigator(const QSize &size, QWidget *parent)
 
 //! [4]
     // Selection item
-    RoundRectItem *selectionItem = new RoundRectItem(QRectF(-60, -60, 120, 120),
-                                                     Qt::gray, pad);
+    RoundRectItem *selectionItem = new RoundRectItem(QRectF(-60, -60, 120, 120), Qt::gray, pad);
     selectionItem->setZValue(0.5);
 //! [4]
 
@@ -288,7 +286,9 @@ PadNavigator::PadNavigator(const QSize &size, QWidget *parent)
     setMinimumSize(50, 50);
     setViewportUpdateMode(FullViewportUpdate);
     setCacheMode(CacheBackground);
-    setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing);
+    setRenderHints(QPainter::Antialiasing
+                   | QPainter::SmoothPixmapTransform
+                   | QPainter::TextAntialiasing);
 #ifndef QT_NO_OPENGL
     setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
 #endif
diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.h b/examples/widgets/graphicsview/padnavigator/padnavigator.h
index a20dadd5a6..21b24ef7ab 100644
--- a/examples/widgets/graphicsview/padnavigator/padnavigator.h
+++ b/examples/widgets/graphicsview/padnavigator/padnavigator.h
@@ -45,11 +45,8 @@
 #include "ui_form.h"
 
 QT_BEGIN_NAMESPACE
-
 class QState;
 class QStateMachine;
-class Ui_Form;
-
 QT_END_NAMESPACE
 
 //! [0]
@@ -63,7 +60,7 @@ protected:
     void resizeEvent(QResizeEvent *event);
 
 private:
-    Ui_Form form;
+    Ui::Form form;
 };
 //! [0]
 
diff --git a/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp b/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp
index 2433162f80..7f0681a91c 100644
--- a/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp
+++ b/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp
@@ -40,7 +40,9 @@
 
 #include "roundrectitem.h"
 
-#include <QtWidgets/QtWidgets>
+#include <QApplication>
+#include <QPainter>
+#include <QPalette>
 
 //! [0]
 RoundRectItem::RoundRectItem(const QRectF &bounds, const QColor &color,
diff --git a/examples/widgets/graphicsview/padnavigator/splashitem.cpp b/examples/widgets/graphicsview/padnavigator/splashitem.cpp
index cf6794ff32..82ed89fbff 100644
--- a/examples/widgets/graphicsview/padnavigator/splashitem.cpp
+++ b/examples/widgets/graphicsview/padnavigator/splashitem.cpp
@@ -40,7 +40,7 @@
 
 #include "splashitem.h"
 
-#include <QtWidgets/QtWidgets>
+#include <QPainter>
 
 //! [0]
 SplashItem::SplashItem(QGraphicsItem *parent)
diff --git a/examples/widgets/graphicsview/simpleanchorlayout/main.cpp b/examples/widgets/graphicsview/simpleanchorlayout/main.cpp
index 80301910b1..b5cc237db7 100644
--- a/examples/widgets/graphicsview/simpleanchorlayout/main.cpp
+++ b/examples/widgets/graphicsview/simpleanchorlayout/main.cpp
@@ -45,7 +45,10 @@ class Widget : public QGraphicsWidget
 public:
     Widget(const QColor &color, const QColor &textColor, const QString &caption,
            QGraphicsItem *parent = 0)
-        : QGraphicsWidget(parent), caption(caption), color(color), textColor(textColor)
+        : QGraphicsWidget(parent)
+        , caption(caption)
+        , color(color)
+        , textColor(textColor)
     {
     }
 
diff --git a/examples/widgets/graphicsview/weatheranchorlayout/main.cpp b/examples/widgets/graphicsview/weatheranchorlayout/main.cpp
index f12c057e46..55864fa433 100644
--- a/examples/widgets/graphicsview/weatheranchorlayout/main.cpp
+++ b/examples/widgets/graphicsview/weatheranchorlayout/main.cpp
@@ -38,23 +38,24 @@
 **
 ****************************************************************************/
 
+#include <QApplication>
 #include <QLabel>
 #include <QPainter>
 #include <QPushButton>
-#include <QApplication>
 
-#include <QGraphicsView>
-#include <QGraphicsScene>
-#include <QGraphicsWidget>
-#include <QGraphicsProxyWidget>
 #include <QGraphicsAnchorLayout>
+#include <QGraphicsProxyWidget>
+#include <QGraphicsScene>
 #include <QGraphicsSceneResizeEvent>
+#include <QGraphicsView>
+#include <QGraphicsWidget>
 
 
 class GraphicsView : public QGraphicsView
 {
 public:
-    GraphicsView(QGraphicsScene *scene, QGraphicsWidget *widget) : QGraphicsView(scene), w(widget)
+    GraphicsView(QGraphicsScene *scene, QGraphicsWidget *widget)
+        : QGraphicsView(scene), w(widget)
     {
     }
 
@@ -70,7 +71,8 @@ class PixmapWidget : public QGraphicsLayoutItem
 {
 
 public:
-    PixmapWidget(const QPixmap &pix) : QGraphicsLayoutItem()
+    PixmapWidget(const QPixmap &pix)
+        : QGraphicsLayoutItem()
     {
         original = new QGraphicsPixmapItem(pix);
         setGraphicsItem(original);
@@ -91,7 +93,8 @@ public:
 
     void setGeometry (const QRectF &rect)
     {
-        original->setTransform(QTransform::fromScale(rect.width() / r.width(), rect.height() / r.height()), true);
+        original->setTransform(QTransform::fromScale(rect.width() / r.width(),
+                                                     rect.height() / r.height()), true);
         original->setPos(rect.x(), rect.y());
         r = rect;
     }
@@ -114,7 +117,7 @@ protected:
             default:
                 break;
         }
-         return sh;
+        return sh;
     }
 
 private:
@@ -128,7 +131,10 @@ class PlaceWidget : public QGraphicsWidget
     Q_OBJECT
 
 public:
-    PlaceWidget(const QPixmap &pix) : QGraphicsWidget(), original(pix), scaled(pix)
+    PlaceWidget(const QPixmap &pix)
+        : QGraphicsWidget()
+        , original(pix)
+        , scaled(pix)
     {
     }
 
@@ -183,7 +189,7 @@ private:
 };
 
 
-int main(int argc, char **argv)
+int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(weatheranchorlayout);
 
@@ -219,51 +225,51 @@ int main(int argc, char **argv)
     sunnyWeather->setZValue(9999);
 
     // start anchor layout
-    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
-    l->setSpacing(0);
+    QGraphicsAnchorLayout *layout = new QGraphicsAnchorLayout;
+    layout->setSpacing(0);
 
     // setup the main widget
-    QGraphicsWidget *w = new QGraphicsWidget(0, Qt::Window);
+    QGraphicsWidget *widget = new QGraphicsWidget(0, Qt::Window);
     QPalette p;
     p.setColor(QPalette::Window, Qt::black);
-    w->setPalette(p);
-    w->setPos(20, 20);
-    w->setLayout(l);
+    widget->setPalette(p);
+    widget->setPos(20, 20);
+    widget->setLayout(layout);
 
     // vertical anchors
-    QGraphicsAnchor *anchor = l->addAnchor(title, Qt::AnchorTop, l, Qt::AnchorTop);
-    anchor = l->addAnchor(place, Qt::AnchorTop, title, Qt::AnchorBottom);
+    QGraphicsAnchor *anchor = layout->addAnchor(title, Qt::AnchorTop, layout, Qt::AnchorTop);
+    anchor = layout->addAnchor(place, Qt::AnchorTop, title, Qt::AnchorBottom);
     anchor->setSpacing(12);
-    anchor = l->addAnchor(place, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    anchor = layout->addAnchor(place, Qt::AnchorBottom, layout, Qt::AnchorBottom);
     anchor->setSpacing(12);
 
-    anchor = l->addAnchor(sunnyWeather, Qt::AnchorTop, title, Qt::AnchorTop);
-    anchor = l->addAnchor(sunnyWeather, Qt::AnchorBottom, l, Qt::AnchorVerticalCenter);
+    anchor = layout->addAnchor(sunnyWeather, Qt::AnchorTop, title, Qt::AnchorTop);
+    anchor = layout->addAnchor(sunnyWeather, Qt::AnchorBottom, layout, Qt::AnchorVerticalCenter);
 
-    anchor = l->addAnchor(tabbar, Qt::AnchorTop, title, Qt::AnchorBottom);
+    anchor = layout->addAnchor(tabbar, Qt::AnchorTop, title, Qt::AnchorBottom);
     anchor->setSpacing(5);
-    anchor = l->addAnchor(details, Qt::AnchorTop, tabbar, Qt::AnchorBottom);
+    anchor = layout->addAnchor(details, Qt::AnchorTop, tabbar, Qt::AnchorBottom);
     anchor->setSpacing(2);
-    anchor = l->addAnchor(details, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    anchor = layout->addAnchor(details, Qt::AnchorBottom, layout, Qt::AnchorBottom);
     anchor->setSpacing(12);
 
     // horizontal anchors
-    anchor = l->addAnchor(l, Qt::AnchorLeft, title, Qt::AnchorLeft);
-    anchor = l->addAnchor(title, Qt::AnchorRight, l, Qt::AnchorRight);
+    anchor = layout->addAnchor(layout, Qt::AnchorLeft, title, Qt::AnchorLeft);
+    anchor = layout->addAnchor(title, Qt::AnchorRight, layout, Qt::AnchorRight);
 
-    anchor = l->addAnchor(place, Qt::AnchorLeft, l, Qt::AnchorLeft);
+    anchor = layout->addAnchor(place, Qt::AnchorLeft, layout, Qt::AnchorLeft);
     anchor->setSpacing(15);
-    anchor = l->addAnchor(place, Qt::AnchorRight, details, Qt::AnchorLeft);
+    anchor = layout->addAnchor(place, Qt::AnchorRight, details, Qt::AnchorLeft);
     anchor->setSpacing(35);
 
-    anchor = l->addAnchor(sunnyWeather, Qt::AnchorLeft, place, Qt::AnchorHorizontalCenter);
-    anchor = l->addAnchor(sunnyWeather, Qt::AnchorRight, l, Qt::AnchorHorizontalCenter);
+    anchor = layout->addAnchor(sunnyWeather, Qt::AnchorLeft, place, Qt::AnchorHorizontalCenter);
+    anchor = layout->addAnchor(sunnyWeather, Qt::AnchorRight, layout, Qt::AnchorHorizontalCenter);
 
-    anchor = l->addAnchor(tabbar, Qt::AnchorHorizontalCenter, details, Qt::AnchorHorizontalCenter);
-    anchor = l->addAnchor(details, Qt::AnchorRight, l, Qt::AnchorRight);
+    anchor = layout->addAnchor(tabbar, Qt::AnchorHorizontalCenter, details, Qt::AnchorHorizontalCenter);
+    anchor = layout->addAnchor(details, Qt::AnchorRight, layout, Qt::AnchorRight);
 
     // QGV setup
-    scene.addItem(w);
+    scene.addItem(widget);
     scene.setBackgroundBrush(Qt::white);
     QGraphicsView *view = new QGraphicsView(&scene);
     view->show();