Cleanup Widgets examples - includes

Cleanup the Widgets examples - adjust includes to Qt coding style and
remove unused includes and formward declarations

Change-Id: I9f2e513284ad631337ff52ec9c0b98645055dcca
Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

36 files changed, 66 insertions, 85 deletions

diff --git a/examples/widgets/widgets/analogclock/analogclock.cpp b/examples/widgets/widgets/analogclock/analogclock.cpp
index bee316b9b7..c7b3f66cca 100644
--- a/examples/widgets/widgets/analogclock/analogclock.cpp
+++ b/examples/widgets/widgets/analogclock/analogclock.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "analogclock.h"
 
+#include <QtWidgets>
+
 //! [0] //! [1]
 AnalogClock::AnalogClock(QWidget *parent)
 //! [0] //! [2]
diff --git a/examples/widgets/widgets/calculator/button.cpp b/examples/widgets/widgets/calculator/button.cpp
index 0d622b1781..a1ce0bf428 100644
--- a/examples/widgets/widgets/calculator/button.cpp
+++ b/examples/widgets/widgets/calculator/button.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "button.h"
 
+#include <QtWidgets>
+
 //! [0]
 Button::Button(const QString &text, QWidget *parent)
     : QToolButton(parent)
diff --git a/examples/widgets/widgets/calculator/calculator.cpp b/examples/widgets/widgets/calculator/calculator.cpp
index cbcc29b2a8..dd908cf40a 100644
--- a/examples/widgets/widgets/calculator/calculator.cpp
+++ b/examples/widgets/widgets/calculator/calculator.cpp
@@ -48,13 +48,13 @@
 **
 ****************************************************************************/
 
+#include "button.h"
+#include "calculator.h"
+
 #include <QtWidgets>
 
 #include <cmath>
 
-#include "button.h"
-#include "calculator.h"
-
 //! [0]
 Calculator::Calculator(QWidget *parent)
     : QWidget(parent)
diff --git a/examples/widgets/widgets/charactermap/characterwidget.cpp b/examples/widgets/widgets/charactermap/characterwidget.cpp
index 5bab921516..061c0164b0 100644
--- a/examples/widgets/widgets/charactermap/characterwidget.cpp
+++ b/examples/widgets/widgets/charactermap/characterwidget.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "characterwidget.h"
 
+#include <QtWidgets>
+
 //! [0]
 CharacterWidget::CharacterWidget(QWidget *parent)
     : QWidget(parent), columns(16), lastKey(-1)
diff --git a/examples/widgets/widgets/charactermap/characterwidget.h b/examples/widgets/widgets/charactermap/characterwidget.h
index 34e061e96b..d12a46aa15 100644
--- a/examples/widgets/widgets/charactermap/characterwidget.h
+++ b/examples/widgets/widgets/charactermap/characterwidget.h
@@ -52,7 +52,6 @@
 #define CHARACTERWIDGET_H
 
 #include <QFont>
-#include <QPoint>
 #include <QSize>
 #include <QString>
 #include <QWidget>
diff --git a/examples/widgets/widgets/codeeditor/codeeditor.h b/examples/widgets/widgets/codeeditor/codeeditor.h
index fcfc188cf2..5a48abafc4 100644
--- a/examples/widgets/widgets/codeeditor/codeeditor.h
+++ b/examples/widgets/widgets/codeeditor/codeeditor.h
@@ -52,7 +52,6 @@
 #define CODEEDITOR_H
 
 #include <QPlainTextEdit>
-#include <QObject>
 
 QT_BEGIN_NAMESPACE
 class QPaintEvent;
diff --git a/examples/widgets/widgets/digitalclock/digitalclock.cpp b/examples/widgets/widgets/digitalclock/digitalclock.cpp
index dec7e64fc3..000334f33b 100644
--- a/examples/widgets/widgets/digitalclock/digitalclock.cpp
+++ b/examples/widgets/widgets/digitalclock/digitalclock.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "digitalclock.h"
 
+#include <QtWidgets>
+
 //! [0]
 DigitalClock::DigitalClock(QWidget *parent)
     : QLCDNumber(parent)
diff --git a/examples/widgets/widgets/elidedlabel/elidedlabel.cpp b/examples/widgets/widgets/elidedlabel/elidedlabel.cpp
index b12bf118f6..e80f7a9894 100644
--- a/examples/widgets/widgets/elidedlabel/elidedlabel.cpp
+++ b/examples/widgets/widgets/elidedlabel/elidedlabel.cpp
@@ -51,8 +51,8 @@
 #include "elidedlabel.h"
 
 #include <QPainter>
+#include <QSizePolicy>
 #include <QTextLayout>
-#include <QDebug>
 
 //! [0]
 ElidedLabel::ElidedLabel(const QString &text, QWidget *parent)
diff --git a/examples/widgets/widgets/elidedlabel/elidedlabel.h b/examples/widgets/widgets/elidedlabel/elidedlabel.h
index 9d4fe5fef3..0c8d96834e 100644
--- a/examples/widgets/widgets/elidedlabel/elidedlabel.h
+++ b/examples/widgets/widgets/elidedlabel/elidedlabel.h
@@ -51,11 +51,8 @@
 #ifndef ELIDEDLABEL_H
 #define ELIDEDLABEL_H
 
-#include <QtWidgets/QFrame>
-#include <QtCore/QRect>
-#include <QtGui/QResizeEvent>
-#include <QtCore/QString>
-#include <QtWidgets/QWidget>
+#include <QFrame>
+#include <QString>
 
 //! [0]
 class ElidedLabel : public QFrame
diff --git a/examples/widgets/widgets/elidedlabel/main.cpp b/examples/widgets/widgets/elidedlabel/main.cpp
index f692db0efc..1c620c1d41 100644
--- a/examples/widgets/widgets/elidedlabel/main.cpp
+++ b/examples/widgets/widgets/elidedlabel/main.cpp
@@ -50,7 +50,7 @@
 
 #include "testwidget.h"
 
-#include <QtWidgets/QApplication>
+#include <QApplication>
 
 //! [0]
 int main( int argc, char *argv[] )
diff --git a/examples/widgets/widgets/elidedlabel/testwidget.cpp b/examples/widgets/widgets/elidedlabel/testwidget.cpp
index 6392a4b4fa..4e013cc5de 100644
--- a/examples/widgets/widgets/elidedlabel/testwidget.cpp
+++ b/examples/widgets/widgets/elidedlabel/testwidget.cpp
@@ -51,14 +51,13 @@
 #include "testwidget.h"
 #include "elidedlabel.h"
 
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QSizePolicy>
-#include <QtWidgets/QGridLayout>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
 
 //! [0]
-TestWidget::TestWidget(QWidget *parent):
-    QWidget(parent)
+TestWidget::TestWidget(QWidget *parent)
+    : QWidget(parent)
 {
     const QString romeo = tr(
         "But soft, what light through yonder window breaks? / "
@@ -116,7 +115,7 @@ TestWidget::TestWidget(QWidget *parent):
     //! [3]
 
     //! [4]
-    QGridLayout *layout = new QGridLayout();
+    QGridLayout *layout = new QGridLayout;
     layout->addWidget(label, 0, 1, Qt::AlignCenter);
     layout->addWidget(switchButton, 0, 2);
     layout->addWidget(exitButton, 0, 3);
diff --git a/examples/widgets/widgets/elidedlabel/testwidget.h b/examples/widgets/widgets/elidedlabel/testwidget.h
index cd309d2316..bcb2f33044 100644
--- a/examples/widgets/widgets/elidedlabel/testwidget.h
+++ b/examples/widgets/widgets/elidedlabel/testwidget.h
@@ -51,10 +51,9 @@
 #ifndef TESTWIDGET_H
 #define TESTWIDGET_H
 
-#include <QtWidgets/QWidget>
-#include <QtCore/QStringList>
-#include <QtWidgets/QSlider>
-#include <QtWidgets/QComboBox>
+#include <QSlider>
+#include <QStringList>
+#include <QWidget>
 
 class ElidedLabel;
 
diff --git a/examples/widgets/widgets/icons/iconpreviewarea.cpp b/examples/widgets/widgets/icons/iconpreviewarea.cpp
index 9cb54c47f6..1a2f514ba8 100644
--- a/examples/widgets/widgets/icons/iconpreviewarea.cpp
+++ b/examples/widgets/widgets/icons/iconpreviewarea.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "iconpreviewarea.h"
 
+#include <QtWidgets>
+
 //! [0]
 IconPreviewArea::IconPreviewArea(QWidget *parent)
     : QWidget(parent)
diff --git a/examples/widgets/widgets/icons/iconsizespinbox.cpp b/examples/widgets/widgets/icons/iconsizespinbox.cpp
index 4c6a850858..e94d943993 100644
--- a/examples/widgets/widgets/icons/iconsizespinbox.cpp
+++ b/examples/widgets/widgets/icons/iconsizespinbox.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "iconsizespinbox.h"
 
+#include <QtWidgets>
+
 //! [0]
 IconSizeSpinBox::IconSizeSpinBox(QWidget *parent)
     : QSpinBox(parent)
diff --git a/examples/widgets/widgets/icons/imagedelegate.cpp b/examples/widgets/widgets/icons/imagedelegate.cpp
index 3c873f1e24..786194bae7 100644
--- a/examples/widgets/widgets/icons/imagedelegate.cpp
+++ b/examples/widgets/widgets/icons/imagedelegate.cpp
@@ -48,11 +48,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "imagedelegate.h"
 #include "iconpreviewarea.h"
 
+#include <QtWidgets>
+
 //! [0]
 ImageDelegate::ImageDelegate(QObject *parent)
     : QItemDelegate(parent)
diff --git a/examples/widgets/widgets/icons/mainwindow.h b/examples/widgets/widgets/icons/mainwindow.h
index 1949bd235c..c67d828cab 100644
--- a/examples/widgets/widgets/icons/mainwindow.h
+++ b/examples/widgets/widgets/icons/mainwindow.h
@@ -60,8 +60,6 @@ QT_BEGIN_NAMESPACE
 class QAction;
 class QActionGroup;
 class QLabel;
-class QMenu;
-class QRadioButton;
 class QButtonGroup;
 class QTableWidget;
 QT_END_NAMESPACE
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp
index 70623dc7cb..fed551dade 100644
--- a/examples/widgets/widgets/imageviewer/imageviewer.cpp
+++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp
@@ -48,6 +48,8 @@
 **
 ****************************************************************************/
 
+#include "imageviewer.h"
+
 #include <QtWidgets>
 #if defined(QT_PRINTSUPPORT_LIB)
 #include <QtPrintSupport/qtprintsupportglobal.h>
@@ -56,8 +58,6 @@
 #endif
 #endif
 
-#include "imageviewer.h"
-
 //! [0]
 ImageViewer::ImageViewer(QWidget *parent)
    : QMainWindow(parent), imageLabel(new QLabel),
diff --git a/examples/widgets/widgets/lineedits/window.h b/examples/widgets/widgets/lineedits/window.h
index 3231588f4f..a31634f3a3 100644
--- a/examples/widgets/widgets/lineedits/window.h
+++ b/examples/widgets/widgets/lineedits/window.h
@@ -54,7 +54,6 @@
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
-class QComboBox;
 class QLineEdit;
 QT_END_NAMESPACE
 
diff --git a/examples/widgets/widgets/movie/movieplayer.cpp b/examples/widgets/widgets/movie/movieplayer.cpp
index 3003bfb541..182b258a82 100644
--- a/examples/widgets/widgets/movie/movieplayer.cpp
+++ b/examples/widgets/widgets/movie/movieplayer.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "movieplayer.h"
 
+#include <QtWidgets>
+
 MoviePlayer::MoviePlayer(QWidget *parent)
     : QWidget(parent)
 {
diff --git a/examples/widgets/widgets/scribble/scribblearea.cpp b/examples/widgets/widgets/scribble/scribblearea.cpp
index d32a29697b..13e46f6e1d 100644
--- a/examples/widgets/widgets/scribble/scribblearea.cpp
+++ b/examples/widgets/widgets/scribble/scribblearea.cpp
@@ -48,6 +48,8 @@
 **
 ****************************************************************************/
 
+#include "scribblearea.h"
+
 #include <QtWidgets>
 #if defined(QT_PRINTSUPPORT_LIB)
 #include <QtPrintSupport/qtprintsupportglobal.h>
@@ -57,8 +59,6 @@
 #endif
 #endif
 
-#include "scribblearea.h"
-
 //! [0]
 ScribbleArea::ScribbleArea(QWidget *parent)
     : QWidget(parent)
diff --git a/examples/widgets/widgets/sliders/slidersgroup.cpp b/examples/widgets/widgets/sliders/slidersgroup.cpp
index 3bccdd687a..b4eaf9bb3d 100644
--- a/examples/widgets/widgets/sliders/slidersgroup.cpp
+++ b/examples/widgets/widgets/sliders/slidersgroup.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "slidersgroup.h"
 
+#include <QtWidgets>
+
 //! [0]
 SlidersGroup::SlidersGroup(Qt::Orientation orientation, const QString &title,
                            QWidget *parent)
diff --git a/examples/widgets/widgets/styles/norwegianwoodstyle.cpp b/examples/widgets/widgets/styles/norwegianwoodstyle.cpp
index 8aca91a686..b334ca97cb 100644
--- a/examples/widgets/widgets/styles/norwegianwoodstyle.cpp
+++ b/examples/widgets/widgets/styles/norwegianwoodstyle.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "norwegianwoodstyle.h"
 
+#include <QtWidgets>
+
 NorwegianWoodStyle::NorwegianWoodStyle() :
     QProxyStyle(QStyleFactory::create("windows"))
 {
diff --git a/examples/widgets/widgets/styles/widgetgallery.cpp b/examples/widgets/widgets/styles/widgetgallery.cpp
index dbe82c547b..7f4b7f39d4 100644
--- a/examples/widgets/widgets/styles/widgetgallery.cpp
+++ b/examples/widgets/widgets/styles/widgetgallery.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
-#include "norwegianwoodstyle.h"
 #include "widgetgallery.h"
+#include "norwegianwoodstyle.h"
+
+#include <QtWidgets>
 
 //! [0]
 WidgetGallery::WidgetGallery(QWidget *parent)
diff --git a/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp b/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp
index 3247fa774d..0874cc3554 100644
--- a/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp
+++ b/examples/widgets/widgets/stylesheet/stylesheeteditor.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "stylesheeteditor.h"
 
+#include <QtWidgets>
+
 StyleSheetEditor::StyleSheetEditor(QWidget *parent)
     : QDialog(parent)
 {
diff --git a/examples/widgets/widgets/tablet/tabletapplication.cpp b/examples/widgets/widgets/tablet/tabletapplication.cpp
index 2e5ac07c95..37be018276 100644
--- a/examples/widgets/widgets/tablet/tabletapplication.cpp
+++ b/examples/widgets/widgets/tablet/tabletapplication.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "tabletapplication.h"
 
+#include <QtWidgets>
+
 //! [0]
 bool TabletApplication::event(QEvent *event)
 {
diff --git a/examples/widgets/widgets/tetrix/main.cpp b/examples/widgets/widgets/tetrix/main.cpp
index 2698190e76..92f245ca14 100644
--- a/examples/widgets/widgets/tetrix/main.cpp
+++ b/examples/widgets/widgets/tetrix/main.cpp
@@ -48,12 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
-#include <stdlib.h>
-
 #include "tetrixwindow.h"
 
+#include <QApplication>
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
diff --git a/examples/widgets/widgets/tetrix/tetrixboard.cpp b/examples/widgets/widgets/tetrix/tetrixboard.cpp
index 222ab1fb4d..b1139ca8a6 100644
--- a/examples/widgets/widgets/tetrix/tetrixboard.cpp
+++ b/examples/widgets/widgets/tetrix/tetrixboard.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "tetrixboard.h"
 
+#include <QtWidgets>
+
 //! [0]
 TetrixBoard::TetrixBoard(QWidget *parent)
     : QFrame(parent)
diff --git a/examples/widgets/widgets/tetrix/tetrixpiece.cpp b/examples/widgets/widgets/tetrix/tetrixpiece.cpp
index 3d8fa86860..b1b3ca9a99 100644
--- a/examples/widgets/widgets/tetrix/tetrixpiece.cpp
+++ b/examples/widgets/widgets/tetrix/tetrixpiece.cpp
@@ -48,12 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtCore>
-
-#include <stdlib.h>
-
 #include "tetrixpiece.h"
 
+#include <QtCore>
+
 //! [0]
 void TetrixPiece::setRandomShape()
 {
diff --git a/examples/widgets/widgets/tetrix/tetrixwindow.h b/examples/widgets/widgets/tetrix/tetrixwindow.h
index 02226ffe1c..3743d6cd2a 100644
--- a/examples/widgets/widgets/tetrix/tetrixwindow.h
+++ b/examples/widgets/widgets/tetrix/tetrixwindow.h
@@ -51,7 +51,6 @@
 #ifndef TETRIXWINDOW_H
 #define TETRIXWINDOW_H
 
-#include <QFrame>
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
diff --git a/examples/widgets/widgets/tooltips/shapeitem.cpp b/examples/widgets/widgets/tooltips/shapeitem.cpp
index 70c1cc03dc..68cc744b84 100644
--- a/examples/widgets/widgets/tooltips/shapeitem.cpp
+++ b/examples/widgets/widgets/tooltips/shapeitem.cpp
@@ -48,8 +48,6 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "shapeitem.h"
 
 //! [0]
diff --git a/examples/widgets/widgets/tooltips/sortingbox.cpp b/examples/widgets/widgets/tooltips/sortingbox.cpp
index 838083c399..685eaa7d1d 100644
--- a/examples/widgets/widgets/tooltips/sortingbox.cpp
+++ b/examples/widgets/widgets/tooltips/sortingbox.cpp
@@ -48,12 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
-#include <stdlib.h>
-
 #include "sortingbox.h"
 
+#include <QtWidgets>
+
 //! [0]
 SortingBox::SortingBox(QWidget *parent)
     : QWidget(parent)
diff --git a/examples/widgets/widgets/tooltips/sortingbox.h b/examples/widgets/widgets/tooltips/sortingbox.h
index 12bdeff1f6..3d0cecea2b 100644
--- a/examples/widgets/widgets/tooltips/sortingbox.h
+++ b/examples/widgets/widgets/tooltips/sortingbox.h
@@ -51,10 +51,10 @@
 #ifndef SORTINGBOX_H
 #define SORTINGBOX_H
 
-#include <QWidget>
-
 #include "shapeitem.h"
 
+#include <QWidget>
+
 QT_BEGIN_NAMESPACE
 class QAction;
 class QPoint;
diff --git a/examples/widgets/widgets/wiggly/dialog.cpp b/examples/widgets/widgets/wiggly/dialog.cpp
index 010648eda6..a7a72b3570 100644
--- a/examples/widgets/widgets/wiggly/dialog.cpp
+++ b/examples/widgets/widgets/wiggly/dialog.cpp
@@ -48,12 +48,12 @@
 **
 ****************************************************************************/
 
-#include <QLineEdit>
-#include <QVBoxLayout>
-
 #include "dialog.h"
 #include "wigglywidget.h"
 
+#include <QLineEdit>
+#include <QVBoxLayout>
+
 //! [0]
 Dialog::Dialog(QWidget *parent)
     : QDialog(parent)
diff --git a/examples/widgets/widgets/wiggly/main.cpp b/examples/widgets/widgets/wiggly/main.cpp
index bd2a50a8eb..cd888c4084 100644
--- a/examples/widgets/widgets/wiggly/main.cpp
+++ b/examples/widgets/widgets/wiggly/main.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-
 #include "dialog.h"
 
+#include <QApplication>
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
diff --git a/examples/widgets/widgets/wiggly/wigglywidget.cpp b/examples/widgets/widgets/wiggly/wigglywidget.cpp
index 1b8f3cffad..0399fe9056 100644
--- a/examples/widgets/widgets/wiggly/wigglywidget.cpp
+++ b/examples/widgets/widgets/wiggly/wigglywidget.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "wigglywidget.h"
 
+#include <QtWidgets>
+
 //! [0]
 WigglyWidget::WigglyWidget(QWidget *parent)
     : QWidget(parent)
diff --git a/examples/widgets/widgets/windowflags/previewwindow.cpp b/examples/widgets/widgets/windowflags/previewwindow.cpp
index 09e26fd7e4..8773dccb05 100644
--- a/examples/widgets/widgets/windowflags/previewwindow.cpp
+++ b/examples/widgets/widgets/windowflags/previewwindow.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "previewwindow.h"
 
+#include <QtWidgets>
+
 //! [0]
 PreviewWindow::PreviewWindow(QWidget *parent)
     : QWidget(parent)