From 3d30c0fb60fd43cfdc3fdd4ffb839f1e863ccef6 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 7 May 2011 22:20:17 +0200
Subject: fix remaining includes

Made easy thanks to the fixqt4includes
script
---
 src/widgets/dialogs/qwizard_win.cpp              |  2 +-
 src/widgets/platforms/x11/qkde_p.h               |  2 +-
 src/widgets/platforms/x11/qx11embed_x11.h        |  2 +-
 src/widgets/styles/qgtkpainter.cpp               |  4 +--
 src/widgets/styles/qgtkpainter_p.h               |  2 +-
 src/widgets/styles/qgtkstyle.cpp                 | 44 ++++++++++++------------
 src/widgets/styles/qgtkstyle.h                   |  4 +--
 src/widgets/styles/qgtkstyle_p.cpp               | 16 ++++-----
 src/widgets/styles/qgtkstyle_p.h                 |  4 +--
 src/widgets/widgets.pro                          |  2 +-
 src/widgets/widgets/qmaccocoaviewcontainer_mac.h |  2 +-
 src/widgets/widgets/qmacnativewidget_mac.h       |  2 +-
 12 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp
index 3480c6853c..3aee39887b 100644
--- a/src/widgets/dialogs/qwizard_win.cpp
+++ b/src/widgets/dialogs/qwizard_win.cpp
@@ -48,7 +48,7 @@
 #include "qpaintengine.h"
 #include "qapplication.h"
 #include <QtGui/QMouseEvent>
-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QDesktopWidget>
 
 // Note, these tests are duplicates in qwindowsxpstyle_p.h.
 #ifdef Q_CC_GNU
diff --git a/src/widgets/platforms/x11/qkde_p.h b/src/widgets/platforms/x11/qkde_p.h
index 4e108f6e9e..f1f7c57f15 100644
--- a/src/widgets/platforms/x11/qkde_p.h
+++ b/src/widgets/platforms/x11/qkde_p.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qglobal.h>
 #include <QtGui/QPalette>
-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>
 
 //
 //  W A R N I N G
diff --git a/src/widgets/platforms/x11/qx11embed_x11.h b/src/widgets/platforms/x11/qx11embed_x11.h
index 30929f7ba9..c6af4f491a 100644
--- a/src/widgets/platforms/x11/qx11embed_x11.h
+++ b/src/widgets/platforms/x11/qx11embed_x11.h
@@ -42,7 +42,7 @@
 #ifndef QX11EMBED_X11_H
 #define QX11EMBED_X11_H
 
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/styles/qgtkpainter.cpp b/src/widgets/styles/qgtkpainter.cpp
index 68ade04984..0d86540974 100644
--- a/src/widgets/styles/qgtkpainter.cpp
+++ b/src/widgets/styles/qgtkpainter.cpp
@@ -48,8 +48,8 @@
 // and takes care of converting all such calls into cached Qt pixmaps.
 
 #include <private/qstylehelper_p.h>
-#include <QtGui/QWidget>
-#include <QtGui/QStyleOption>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QStyleOption>
 #include <QtGui/QPixmapCache>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/styles/qgtkpainter_p.h b/src/widgets/styles/qgtkpainter_p.h
index 1c253798a8..121466622b 100644
--- a/src/widgets/styles/qgtkpainter_p.h
+++ b/src/widgets/styles/qgtkpainter_p.h
@@ -56,7 +56,7 @@
 #include <QtCore/qglobal.h>
 #if !defined(QT_NO_STYLE_GTK)
 
-#include <QtGui/QCleanlooksStyle>
+#include <QtWidgets/QCleanlooksStyle>
 #include <QtGui/QPainter>
 #include <QtGui/QPalette>
 #include <QtGui/QFont>
diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp
index 277e3025b5..047eb97195 100644
--- a/src/widgets/styles/qgtkstyle.cpp
+++ b/src/widgets/styles/qgtkstyle.cpp
@@ -45,29 +45,29 @@
 #include <private/qapplication_p.h>
 #include <QtCore/QLibrary>
 #include <QtCore/QSettings>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QStatusBar>
-#include <QtGui/QLineEdit>
-#include <QtGui/QWidget>
-#include <QtGui/QListView>
-#include <QtGui/QApplication>
-#include <QtGui/QStyleOption>
-#include <QtGui/QPushButton>
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QListView>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QStyleOption>
+#include <QtWidgets/QPushButton>
 #include <QtGui/QPainter>
-#include <QtGui/QMainWindow>
-#include <QtGui/QToolBar>
-#include <QtGui/QHeaderView>
-#include <QtGui/QMenuBar>
-#include <QtGui/QComboBox>
-#include <QtGui/QSpinBox>
-#include <QtGui/QScrollBar>
-#include <QtGui/QAbstractButton>
-#include <QtGui/QToolButton>
-#include <QtGui/QGroupBox>
-#include <QtGui/QRadioButton>
-#include <QtGui/QCheckBox>
-#include <QtGui/QTreeView>
-#include <QtGui/QStyledItemDelegate>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QAbstractButton>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QStyledItemDelegate>
 #include <qpixmapcache.h>
 #undef signals // Collides with GTK stymbols
 #include <private/qgtkpainter_p.h>
diff --git a/src/widgets/styles/qgtkstyle.h b/src/widgets/styles/qgtkstyle.h
index 616ce24509..abf8ed4fbd 100644
--- a/src/widgets/styles/qgtkstyle.h
+++ b/src/widgets/styles/qgtkstyle.h
@@ -42,10 +42,10 @@
 #ifndef QGTKSTYLE_H
 #define QGTKSTYLE_H
 
-#include <QtGui/QCleanlooksStyle>
+#include <QtWidgets/QCleanlooksStyle>
 #include <QtGui/QPalette>
 #include <QtGui/QFont>
-#include <QtGui/QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/styles/qgtkstyle_p.cpp b/src/widgets/styles/qgtkstyle_p.cpp
index d7c53c9a91..e0ebf51c5b 100644
--- a/src/widgets/styles/qgtkstyle_p.cpp
+++ b/src/widgets/styles/qgtkstyle_p.cpp
@@ -65,15 +65,15 @@
 #include <private/qapplication_p.h>
 #include <private/qiconloader_p.h>
 
-#include <QtGui/QMenu>
-#include <QtGui/QStyle>
-#include <QtGui/QApplication>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QApplication>
 #include <QtGui/QPixmapCache>
-#include <QtGui/QStatusBar>
-#include <QtGui/QMenuBar>
-#include <QtGui/QToolBar>
-#include <QtGui/QToolButton>
-#include <QtGui/QX11Info>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QX11Info>
 
 #include <private/qt_x11_p.h>
 
diff --git a/src/widgets/styles/qgtkstyle_p.h b/src/widgets/styles/qgtkstyle_p.h
index 15a98c8257..8c84eb3b9d 100644
--- a/src/widgets/styles/qgtkstyle_p.h
+++ b/src/widgets/styles/qgtkstyle_p.h
@@ -60,9 +60,9 @@
 #include <QtCore/qstringbuilder.h>
 #include <QtCore/qcoreapplication.h>
 
-#include <QtGui/QFileDialog>
+#include <QtWidgets/QFileDialog>
 
-#include <QtGui/QGtkStyle>
+#include <QtWidgets/QGtkStyle>
 #include <private/qcleanlooksstyle_p.h>
 
 #undef signals // Collides with GTK stymbols
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index c70f969f2c..d46e20fc32 100644
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@@ -3,7 +3,7 @@ QPRO_PWD   = $$PWD
 QT = core-private gui-private
 
 CONFIG += module
-MODULE_PRI = ../modules/qt_gui.pri
+MODULE_PRI = ../modules/qt_widgets.pri
 
 DEFINES   += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h
index 9b5befb40f..eb5997c95f 100644
--- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h
+++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h
@@ -42,7 +42,7 @@
 #ifndef QCOCOAVIEWCONTAINER_H
 #define QCOCOAVIEWCONTAINER_H
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/widgets/qmacnativewidget_mac.h b/src/widgets/widgets/qmacnativewidget_mac.h
index 98c618d1ad..c824f626d2 100644
--- a/src/widgets/widgets/qmacnativewidget_mac.h
+++ b/src/widgets/widgets/qmacnativewidget_mac.h
@@ -42,7 +42,7 @@
 #ifndef QMACNATIVEWIDGET_H
 #define QMACNATIVEWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_HEADER
 
-- 
cgit v1.2.3