Qt Designer Examples: Fix includes.

Replace module includes by per-class includes and reorder.

Change-Id: Id8273865c0110e6d834d9c40a123e3d72bfc4b87
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

diff --git a/examples/designer/calculatorform/calculatorform.cpp b/examples/designer/calculatorform/calculatorform.cpp
index 648a085..4a77ac2 100644 (file)
--- a/examples/designer/calculatorform/calculatorform.cpp
+++ b/examples/designer/calculatorform/calculatorform.cpp
@@ -38,8 +38,6 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
-
 #include "calculatorform.h"
 
 //! [0]

diff --git a/examples/designer/customwidgetplugin/analogclock.cpp b/examples/designer/customwidgetplugin/analogclock.cpp
index dec16b9..07e7b54 100644 (file)
--- a/examples/designer/customwidgetplugin/analogclock.cpp
+++ b/examples/designer/customwidgetplugin/analogclock.cpp
@@ -38,10 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
-
 #include "analogclock.h"
 
+#include <QMouseEvent>
+#include <QPainter>
+#include <QTime>
+#include <QTimer>
+
 AnalogClock::AnalogClock(QWidget *parent)
     : QWidget(parent)
 {

diff --git a/examples/designer/taskmenuextension/tictactoe.cpp b/examples/designer/taskmenuextension/tictactoe.cpp
index 0256618..b79beee 100644 (file)
--- a/examples/designer/taskmenuextension/tictactoe.cpp
+++ b/examples/designer/taskmenuextension/tictactoe.cpp
@@ -38,10 +38,11 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
-
 #include "tictactoe.h"
 
+#include <QMouseEvent>
+#include <QPainter>
+
 TicTacToe::TicTacToe(QWidget *parent)
     : QWidget(parent)
 {

diff --git a/examples/designer/taskmenuextension/tictactoedialog.cpp b/examples/designer/taskmenuextension/tictactoedialog.cpp
index f9923cc..e6d1d41 100644 (file)
--- a/examples/designer/taskmenuextension/tictactoedialog.cpp
+++ b/examples/designer/taskmenuextension/tictactoedialog.cpp
@@ -38,13 +38,15 @@
 **
 ****************************************************************************/
 
+#include "tictactoe.h"
+#include "tictactoedialog.h"
+
+#include <QtDesigner/QDesignerFormWindowInterface>
+#include <QtDesigner/QDesignerFormWindowCursorInterface>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QVBoxLayout>
-#include <QtDesigner>
-
-#include "tictactoe.h"
-#include "tictactoedialog.h"
+#include <QVariant>
 
 //! [0]
 TicTacToeDialog::TicTacToeDialog(TicTacToe *tic, QWidget *parent)

diff --git a/examples/designer/taskmenuextension/tictactoeplugin.cpp b/examples/designer/taskmenuextension/tictactoeplugin.cpp
index c6d9e89..2c953f6 100644 (file)
--- a/examples/designer/taskmenuextension/tictactoeplugin.cpp
+++ b/examples/designer/taskmenuextension/tictactoeplugin.cpp
@@ -38,14 +38,14 @@
 **
 ****************************************************************************/
 
-#include <QtDesigner>
-#include <QtGui>
-#include <QtPlugin>
-
 #include "tictactoe.h"
 #include "tictactoeplugin.h"
 #include "tictactoetaskmenu.h"
 
+#include <QtDesigner/QDesignerFormEditorInterface>
+#include <QtDesigner/QExtensionManager>
+#include <QtPlugin>
+
 //! [0]
 TicTacToePlugin::TicTacToePlugin(QObject *parent)
     : QObject(parent)

diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
index 41a2ffc..961d5a1 100644 (file)
--- a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
+++ b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
@@ -38,13 +38,13 @@
 **
 ****************************************************************************/
 
-#include <QtDesigner>
-#include <QtWidgets>
-
 #include "tictactoe.h"
 #include "tictactoedialog.h"
 #include "tictactoetaskmenu.h"
 
+#include <QtDesigner/QDesignerFormEditorInterface>
+#include <QAction>
+
 //! [0]
 TicTacToeTaskMenu::TicTacToeTaskMenu(TicTacToe *tic, QObject *parent)
     : QObject(parent)

diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.cpp b/examples/designer/worldtimeclockplugin/worldtimeclock.cpp
index bad16c8..1a4d8fc 100644 (file)
--- a/examples/designer/worldtimeclockplugin/worldtimeclock.cpp
+++ b/examples/designer/worldtimeclockplugin/worldtimeclock.cpp
@@ -38,10 +38,12 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
-
 #include "worldtimeclock.h"
 
+#include <QMouseEvent>
+#include <QPainter>
+#include <QTimer>
+
 WorldTimeClock::WorldTimeClock(QWidget *parent)
     : QWidget(parent)
 {