fix remaining includes

Made easy thanks to the fixqt4includes script
2011-05-07 22:20:17 +02:00 · 2011-05-07 22:20:17 +02:00 · 3d30c0fb60
commit 3d30c0fb60
parent b597565788
16 changed files with 50 additions and 50 deletions
--- a/src/opengl/gl2paintengineex/qtriangulator.cpp
+++ b/src/opengl/gl2paintengineex/qtriangulator.cpp
@ -41,7 +41,7 @@

 #include "qtriangulator_p.h"

-#include <QtGui/qdialog.h>
+#include <QtWidgets/qdialog.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qpainter.h>
 #include <QtGui/qpainterpath.h>
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@ -40,11 +40,11 @@
 ****************************************************************************/

 #include <QApplication>
-#include <QtGui/private/qapplication_p.h>
+#include <private/qapplication_p.h>
 #include <QPixmap>
 #include <QDebug>

-#include <QtGui/private/qapplication_p.h>
+#include <private/qapplication_p.h>
 #include <QtGui/QPlatformGLContext>
 #include <QtGui/QPlatformWindow>
 #include <QtGui/QWindowContext>
--- a/src/opengl/qgraphicsshadereffect_p.h
+++ b/src/opengl/qgraphicsshadereffect_p.h
@ -53,7 +53,7 @@
 // We mean it.
 //

-#include <QtGui/qgraphicseffect.h>
+#include <QtWidgets/qgraphicseffect.h>

 QT_BEGIN_HEADER

--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@ -39,11 +39,11 @@
 **
 ****************************************************************************/

-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtGui/QColormap>
-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QDesktopWidget>
 #include <QtGui/QPaintDevice>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>

 #include <qglframebufferobject.h>
 #include <qglpixelbuffer.h>
--- 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
--- 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
--- 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

--- 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
--- 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>
--- 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>
--- 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

--- 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>

--- 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
--- 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
--- 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

--- 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