Compile with refactor

Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856 Reviewed-on: http://codereview.qt-project.org/4940 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-14 15:35:32 +02:00
parent 4840be0239
commit eedcc340f1
84 changed files with 92 additions and 81 deletions
--- a/src/plugins/directshow/camera/dscameraservice.cpp
+++ b/src/plugins/directshow/camera/dscameraservice.cpp
@@ -41,7 +41,7 @@

 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #include <QVideoWidgetControl.h>


--- a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
+++ b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
@@ -41,7 +41,7 @@

 #include <QDebug>
 #include <QFile>
-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>

 #include "dsvideodevicecontrol.h"
 #include "dscamerasession.h"
--- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h
+++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h
@@ -43,7 +43,7 @@
 #define DSVIDEOWIDGETCONTROL_H

 #include <QtCore/qobject.h>
-#include <QtGui>
+#include <QtWidgets>
 #include <QtMultimedia/qvideoframe.h>
 #include <QtMultimedia/qabstractvideosurface.h>
 #include <QtMultimedia/qvideosurfaceformat.h>
--- a/src/plugins/gstreamer/camerabuttonlistener_meego.cpp
+++ b/src/plugins/gstreamer/camerabuttonlistener_meego.cpp
@@ -41,9 +41,9 @@

 #include "camerabuttonlistener_meego.h"

-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 #include <QtGui/qevent.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #include <QtCore/qdebug.h>

 CameraButtonListener::CameraButtonListener(QObject *parent) :
--- a/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp
+++ b/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp
@@ -44,8 +44,8 @@
 #include "qgstutils.h"

 #include <QtGui/qevent.h>
-#include <QtGui/qapplication.h>
-#include <QtGui/qx11info_x11.h>
+#include <QtWidgets/qapplication.h>
+#include <QtWidgets/qx11info_x11.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qthread.h>

--- a/src/plugins/gstreamer/qgstreamervideowidget.cpp
+++ b/src/plugins/gstreamer/qgstreamervideowidget.cpp
@@ -44,7 +44,7 @@

 #include <QtCore/qcoreevent.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 #include <QtGui/qpainter.h>

 #ifdef Q_WS_X11
--- a/src/plugins/gstreamer/qgstxvimagebuffer.cpp
+++ b/src/plugins/gstreamer/qgstxvimagebuffer.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qthread.h>
 #include <QtCore/qvariant.h>
-#include <QtGui/qx11info_x11.h>
+#include <QtWidgets/qx11info_x11.h>

 #include "qgstxvimagebuffer.h"
 #include "qvideosurfacegstsink.h"
--- a/src/plugins/gstreamer/qvideosurfacegstsink.cpp
+++ b/src/plugins/gstreamer/qvideosurfacegstsink.cpp
@@ -49,7 +49,7 @@
 #include "qgstvideobuffer.h"

 #if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
-#include <QtGui/qx11info_x11.h>
+#include <QtWidgets/qx11info_x11.h>
 #include "qgstxvimagebuffer.h"
 #endif

--- a/src/plugins/gstreamer/qx11videosurface.cpp
+++ b/src/plugins/gstreamer/qx11videosurface.cpp
@@ -41,7 +41,7 @@

 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/qx11info_x11.h>
+#include <QtWidgets/qx11info_x11.h>
 #include <qvideosurfaceformat.h>

 #ifndef QT_NO_XVIDEO
--- a/src/plugins/gstreamer/qx11videosurface.h
+++ b/src/plugins/gstreamer/qx11videosurface.h
@@ -42,7 +42,7 @@
 #ifndef QX11VIDEOSURFACE_H
 #define QX11VIDEOSURFACE_H

-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #include <qabstractvideosurface.h>

 #ifndef QT_NO_XVIDEO
--- a/src/plugins/qt7/mediaplayer/qt7playercontrol.h
+++ b/src/plugins/qt7/mediaplayer/qt7playercontrol.h
@@ -47,7 +47,7 @@
 #include <qmediaplayercontrol.h>
 #include <qmediaplayer.h>

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


 QT_BEGIN_NAMESPACE
--- a/src/plugins/qt7/mediaplayer/qt7playersession.h
+++ b/src/plugins/qt7/mediaplayer/qt7playersession.h
@@ -50,7 +50,7 @@
 #include <qmediaplayercontrol.h>
 #include <qmediaplayer.h>

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


 QT_BEGIN_NAMESPACE
--- a/src/plugins/qt7/qt7movierenderer.h
+++ b/src/plugins/qt7/qt7movierenderer.h
@@ -50,7 +50,7 @@
 #include <qvideorenderercontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>
 #include "qt7videooutput.h"

 #include <QuartzCore/CVOpenGLTexture.h>
--- a/src/plugins/qt7/qt7movievideowidget.h
+++ b/src/plugins/qt7/qt7movievideowidget.h
@@ -48,7 +48,7 @@
 #include <qvideowindowcontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>
 #include "qt7videooutput.h"

 #include <QuartzCore/CVOpenGLTexture.h>
--- a/src/plugins/qt7/qt7movieviewoutput.h
+++ b/src/plugins/qt7/qt7movieviewoutput.h
@@ -47,7 +47,7 @@
 #include <qvideowindowcontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>
 #include "qt7videooutput.h"


--- a/src/plugins/qt7/qt7movieviewrenderer.h
+++ b/src/plugins/qt7/qt7movieviewrenderer.h
@@ -48,7 +48,7 @@
 #include <qvideowindowcontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>
 #include "qt7videooutput.h"
 #include <qvideoframe.h>

--- a/src/plugins/qt7/qt7videooutput.h
+++ b/src/plugins/qt7/qt7videooutput.h
@@ -50,7 +50,7 @@
 #include <qvideorenderercontrol.h>
 #include <qmediaplayer.h>

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


 QT_BEGIN_NAMESPACE
--- a/src/plugins/simulator/camera/simulatorvideoinputdevicecontrol.cpp
+++ b/src/plugins/simulator/camera/simulatorvideoinputdevicecontrol.cpp
@@ -41,7 +41,7 @@

 #include "simulatorvideoinputdevicecontrol.h"

-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 #include <QtCore/QStringList>
--- a/src/plugins/simulator/qsimulatorserviceplugin.cpp
+++ b/src/plugins/simulator/qsimulatorserviceplugin.cpp
@@ -41,7 +41,7 @@

 #include <QtCore/qstring.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>
 #include <QtCore/QDir>
 #include <QtCore/QDebug>

--- a/src/plugins/v4l/radio/v4lradioservice.cpp
+++ b/src/plugins/v4l/radio/v4lradioservice.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>

 #include "v4lradioservice.h"
 #include "v4lradiocontrol.h"