From eedcc340f1c1e8bb09759946a4b2c241e219cc58 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Wed, 14 Sep 2011 15:35:32 +0200
Subject: 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>
---
 src/plugins/directshow/camera/dscameraservice.cpp                 | 2 +-
 src/plugins/directshow/camera/dsvideodevicecontrol.cpp            | 2 +-
 src/plugins/directshow/camera/dsvideowidgetcontrol.h              | 2 +-
 src/plugins/gstreamer/camerabuttonlistener_meego.cpp              | 4 ++--
 src/plugins/gstreamer/qgstreamergltexturerenderer.cpp             | 4 ++--
 src/plugins/gstreamer/qgstreamervideowidget.cpp                   | 2 +-
 src/plugins/gstreamer/qgstxvimagebuffer.cpp                       | 2 +-
 src/plugins/gstreamer/qvideosurfacegstsink.cpp                    | 2 +-
 src/plugins/gstreamer/qx11videosurface.cpp                        | 2 +-
 src/plugins/gstreamer/qx11videosurface.h                          | 2 +-
 src/plugins/qt7/mediaplayer/qt7playercontrol.h                    | 2 +-
 src/plugins/qt7/mediaplayer/qt7playersession.h                    | 2 +-
 src/plugins/qt7/qt7movierenderer.h                                | 2 +-
 src/plugins/qt7/qt7movievideowidget.h                             | 2 +-
 src/plugins/qt7/qt7movieviewoutput.h                              | 2 +-
 src/plugins/qt7/qt7movieviewrenderer.h                            | 2 +-
 src/plugins/qt7/qt7videooutput.h                                  | 2 +-
 src/plugins/simulator/camera/simulatorvideoinputdevicecontrol.cpp | 2 +-
 src/plugins/simulator/qsimulatorserviceplugin.cpp                 | 2 +-
 src/plugins/v4l/radio/v4lradioservice.cpp                         | 2 +-
 20 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp
index 01da662c0..3b42a18d1 100644
--- 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>
 
 
diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
index 243e8403d..11da5d357 100644
--- 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"
diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h
index 35048ab79..62eb502f4 100644
--- 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>
diff --git a/src/plugins/gstreamer/camerabuttonlistener_meego.cpp b/src/plugins/gstreamer/camerabuttonlistener_meego.cpp
index c5cdf2ff9..5ee1daf42 100644
--- 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) :
diff --git a/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp b/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp
index af68096bd..615d23d82 100644
--- 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>
 
diff --git a/src/plugins/gstreamer/qgstreamervideowidget.cpp b/src/plugins/gstreamer/qgstreamervideowidget.cpp
index e1bf0037d..61c47f01b 100644
--- 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
diff --git a/src/plugins/gstreamer/qgstxvimagebuffer.cpp b/src/plugins/gstreamer/qgstxvimagebuffer.cpp
index 55e58e2e0..31839920b 100644
--- 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"
diff --git a/src/plugins/gstreamer/qvideosurfacegstsink.cpp b/src/plugins/gstreamer/qvideosurfacegstsink.cpp
index 58fabeda4..6ccc1b1c5 100644
--- 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
 
diff --git a/src/plugins/gstreamer/qx11videosurface.cpp b/src/plugins/gstreamer/qx11videosurface.cpp
index 035f9452d..f12be3e1b 100644
--- 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
diff --git a/src/plugins/gstreamer/qx11videosurface.h b/src/plugins/gstreamer/qx11videosurface.h
index cac7a757e..ecc84e368 100644
--- 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
diff --git a/src/plugins/qt7/mediaplayer/qt7playercontrol.h b/src/plugins/qt7/mediaplayer/qt7playercontrol.h
index 15ea20a4a..54b9f4e87 100644
--- 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
diff --git a/src/plugins/qt7/mediaplayer/qt7playersession.h b/src/plugins/qt7/mediaplayer/qt7playersession.h
index de49a2398..c6e01151a 100644
--- 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
diff --git a/src/plugins/qt7/qt7movierenderer.h b/src/plugins/qt7/qt7movierenderer.h
index 0dc100da3..705515833 100644
--- 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>
diff --git a/src/plugins/qt7/qt7movievideowidget.h b/src/plugins/qt7/qt7movievideowidget.h
index 8556e1866..d3e607801 100644
--- 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>
diff --git a/src/plugins/qt7/qt7movieviewoutput.h b/src/plugins/qt7/qt7movieviewoutput.h
index dffbbddbb..d48255d34 100644
--- 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"
 
 
diff --git a/src/plugins/qt7/qt7movieviewrenderer.h b/src/plugins/qt7/qt7movieviewrenderer.h
index 65eebf7f6..6d5cef7da 100644
--- 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>
 
diff --git a/src/plugins/qt7/qt7videooutput.h b/src/plugins/qt7/qt7videooutput.h
index 34feb391b..15b93c937 100644
--- 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
diff --git a/src/plugins/simulator/camera/simulatorvideoinputdevicecontrol.cpp b/src/plugins/simulator/camera/simulatorvideoinputdevicecontrol.cpp
index 55f9c9f45..95c4e2da9 100644
--- 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>
diff --git a/src/plugins/simulator/qsimulatorserviceplugin.cpp b/src/plugins/simulator/qsimulatorserviceplugin.cpp
index 2971f59f7..e0e6d1293 100644
--- 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>
 
diff --git a/src/plugins/v4l/radio/v4lradioservice.cpp b/src/plugins/v4l/radio/v4lradioservice.cpp
index 122993229..1d9ad2fcb 100644
--- 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"
-- 
cgit v1.2.3