diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-24 16:24:15 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-24 16:24:15 +0200 |
commit | e44cecb8a51d5637543d2c6b1e91ed6765694391 (patch) | |
tree | adda389afb3025994e7fb11e507e8def981e2dea | |
parent | b1bf17740fc917381ff2accc649a07e377fc697c (diff) |
QtPhonon: Widget library split.refactor
36 files changed, 69 insertions, 68 deletions
diff --git a/demos/qmediaplayer/mediaplayer.h b/demos/qmediaplayer/mediaplayer.h index 0b9dcf3..6ff4ade 100644 --- a/demos/qmediaplayer/mediaplayer.h +++ b/demos/qmediaplayer/mediaplayer.h @@ -42,13 +42,13 @@ #ifndef MEDIALAYER_H #define MEDIAPLAYER_H -#include <QtGui/QWidget> -#include <QtGui/QApplication> +#include <QtWidgets/QWidget> +#include <QtWidgets/QApplication> #include <QtCore/QTimerEvent> -#include <QtGui/QShowEvent> -#include <QtGui/QIcon> +#include <QtWidgets/QShowEvent> +#include <QtWidgets/QIcon> #include <QtCore/QBasicTimer> -#include <QtGui/QAction> +#include <QtWidgets/QAction> #include <phonon/audiooutput.h> #include <phonon/backendcapabilities.h> diff --git a/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp b/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp index a9d0694..c350ac6 100644 --- a/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp +++ b/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp @@ -17,8 +17,8 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include "abstractvideorenderer.h" -#include <QtGui/QApplication> -#include <QtGui/QDesktopWidget> +#include <QtWidgets/QApplication> +#include <QtWidgets/QDesktopWidget> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/ds9/videorenderer_default.cpp b/src/3rdparty/phonon/ds9/videorenderer_default.cpp index 0045a49..cb4e2d3 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_default.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_default.cpp @@ -20,8 +20,8 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #ifndef QT_NO_PHONON_VIDEO -#include <QtGui/QWidget> -#include <QtGui/QPainter> +#include <QtWidgets/QWidget> +#include <QtWidgets/QPainter> #include <uuids.h> diff --git a/src/3rdparty/phonon/ds9/videorenderer_evr.cpp b/src/3rdparty/phonon/ds9/videorenderer_evr.cpp index ff39ecc..3a9ca73 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_evr.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_evr.cpp @@ -21,8 +21,8 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #ifndef QT_NO_PHONON_VIDEO -#include <QtGui/QWidget> -#include <QtGui/QPainter> +#include <QtWidgets/QWidget> +#include <QtWidgets/QPainter> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp index 9c7993c..e269926 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp @@ -23,9 +23,9 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include "qmeminputpin.h" #include "qbasefilter.h" -#include <QtGui/QPainter> -#include <QtGui/QPaintEngine> -#include <QtGui/QApplication> +#include <QtWidgets/QPainter> +#include <QtWidgets/QPaintEngine> +#include <QtWidgets/QApplication> #include <QtCore/QTime> #define _USE_MATH_DEFINES //for pi diff --git a/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp b/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp index 545b31e..0495da2 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp @@ -20,8 +20,8 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #ifndef QT_NO_PHONON_VIDEO -#include <QtGui/QWidget> -#include <QtGui/QPainter> +#include <QtWidgets/QWidget> +#include <QtWidgets/QPainter> #include <d3d9.h> #include <vmr9.h> diff --git a/src/3rdparty/phonon/ds9/videowidget.cpp b/src/3rdparty/phonon/ds9/videowidget.cpp index 09d42a4..bf4ccd1 100644 --- a/src/3rdparty/phonon/ds9/videowidget.cpp +++ b/src/3rdparty/phonon/ds9/videowidget.cpp @@ -17,8 +17,8 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include "videowidget.h" -#include <QtGui/QPainter> -#include <QtGui/QPaintEvent> +#include <QtWidgets/QPainter> +#include <QtWidgets/QPaintEvent> #include <QtCore/QTimer> #include <QtCore/QSettings> diff --git a/src/3rdparty/phonon/ds9/videowidget.h b/src/3rdparty/phonon/ds9/videowidget.h index fc8a6e3..c9ec537 100644 --- a/src/3rdparty/phonon/ds9/videowidget.h +++ b/src/3rdparty/phonon/ds9/videowidget.h @@ -18,7 +18,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #ifndef PHONON_VIDEOWIDGET_H #define PHONON_VIDEOWIDGET_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <phonon/videowidgetinterface.h> #include "backendnode.h" diff --git a/src/3rdparty/phonon/gstreamer/videowidget.cpp b/src/3rdparty/phonon/gstreamer/videowidget.cpp index a4c6f79..0a4983b 100644 --- a/src/3rdparty/phonon/gstreamer/videowidget.cpp +++ b/src/3rdparty/phonon/gstreamer/videowidget.cpp @@ -21,8 +21,8 @@ #include <QtGui/QPalette> #include <QtGui/QImage> #include <QtGui/QPainter> -#include <QtGui/QBoxLayout> -#include <QApplication> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QApplication> #include <gst/gst.h> #include <gst/interfaces/propertyprobe.h> #include "mediaobject.h" diff --git a/src/3rdparty/phonon/gstreamer/x11renderer.cpp b/src/3rdparty/phonon/gstreamer/x11renderer.cpp index 968f3a8..9061391 100644 --- a/src/3rdparty/phonon/gstreamer/x11renderer.cpp +++ b/src/3rdparty/phonon/gstreamer/x11renderer.cpp @@ -20,9 +20,9 @@ #ifndef Q_WS_QWS -#include <QtGui/QPalette> -#include <QtGui/QApplication> -#include <QtGui/QPainter> +#include <QtWidgets/QPalette> +#include <QtWidgets/QApplication> +#include <QtWidgets/QPainter> #include <X11/Xlib.h> #include <gst/gst.h> #include <gst/interfaces/xoverlay.h> diff --git a/src/3rdparty/phonon/gstreamer/x11renderer.h b/src/3rdparty/phonon/gstreamer/x11renderer.h index 8e2ea19..558015f 100644 --- a/src/3rdparty/phonon/gstreamer/x11renderer.h +++ b/src/3rdparty/phonon/gstreamer/x11renderer.h @@ -21,7 +21,7 @@ #include "videowidget.h" #include "common.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <gst/gst.h> diff --git a/src/3rdparty/phonon/mmf/abstractvideooutput.h b/src/3rdparty/phonon/mmf/abstractvideooutput.h index 61bcd0f..2cee106 100644 --- a/src/3rdparty/phonon/mmf/abstractvideooutput.h +++ b/src/3rdparty/phonon/mmf/abstractvideooutput.h @@ -19,7 +19,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #ifndef PHONON_MMF_ABSTRACTVIDEOOUTPUT_H #define PHONON_MMF_ABSTRACTVIDEOOUTPUT_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QVector> #include <QRect> #include "defs.h" diff --git a/src/3rdparty/phonon/mmf/objectdump_symbian.cpp b/src/3rdparty/phonon/mmf/objectdump_symbian.cpp index edad537..6f1daf7 100644 --- a/src/3rdparty/phonon/mmf/objectdump_symbian.cpp +++ b/src/3rdparty/phonon/mmf/objectdump_symbian.cpp @@ -21,7 +21,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include <coecntrl.h> #include "objectdump_symbian.h" -#include <QtGui/private/qwidget_p.h> // to access QWExtra +#include <QtWidgets/private/qwidget_p.h> // to access QWExtra QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/mmf/videooutput_dsa.cpp b/src/3rdparty/phonon/mmf/videooutput_dsa.cpp index 4f9ad7f..908e53d 100644 --- a/src/3rdparty/phonon/mmf/videooutput_dsa.cpp +++ b/src/3rdparty/phonon/mmf/videooutput_dsa.cpp @@ -17,7 +17,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. */ #include <QtCore/private/qcore_symbian_p.h> // for qt_TRect2QRect -#include <QtGui/private/qwidget_p.h> // to access QWExtra +#include <QtWidgets/private/qwidget_p.h> // to access QWExtra #include <QResizeEvent> #include <QMoveEvent> diff --git a/src/3rdparty/phonon/mmf/videooutput_surface.cpp b/src/3rdparty/phonon/mmf/videooutput_surface.cpp index e9b2d3f..95fee32 100644 --- a/src/3rdparty/phonon/mmf/videooutput_surface.cpp +++ b/src/3rdparty/phonon/mmf/videooutput_surface.cpp @@ -19,7 +19,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include <QResizeEvent> #include <QtCore/private/qcore_symbian_p.h> // for qt_TRect2QRect -#include <QtGui/private/qwidget_p.h> // to access QWExtra +#include <QtWidgets/private/qwidget_p.h> // to access QWExtra #include "utils.h" #include "videooutput_surface.h" diff --git a/src/3rdparty/phonon/mmf/videowidget.h b/src/3rdparty/phonon/mmf/videowidget.h index 3b6283e..ff89296 100644 --- a/src/3rdparty/phonon/mmf/videowidget.h +++ b/src/3rdparty/phonon/mmf/videowidget.h @@ -22,7 +22,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include "abstractvideooutput.h" #include "mmf_medianode.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <phonon/videowidget.h> #include <phonon/videowidgetinterface.h> diff --git a/src/3rdparty/phonon/phonon/effectwidget.cpp b/src/3rdparty/phonon/phonon/effectwidget.cpp index edcbe1f..c2d3ee5 100644 --- a/src/3rdparty/phonon/phonon/effectwidget.cpp +++ b/src/3rdparty/phonon/phonon/effectwidget.cpp @@ -29,12 +29,12 @@ #include "effect.h" #include "effectparameter.h" #include "phonondefs_p.h" -#include <QtGui/QBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QSpinBox> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QSlider> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QSlider> #include <limits> #ifdef min diff --git a/src/3rdparty/phonon/phonon/effectwidget.h b/src/3rdparty/phonon/phonon/effectwidget.h index 17a310f..427e644 100644 --- a/src/3rdparty/phonon/phonon/effectwidget.h +++ b/src/3rdparty/phonon/phonon/effectwidget.h @@ -25,7 +25,7 @@ #include "phonon_export.h" #include "phonondefs.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp index 741a74c..c1c9f34 100644 --- a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp +++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp @@ -29,7 +29,7 @@ #include "phononnamespace_p.h" #include <QtCore/QMimeData> #include <QtCore/QStringList> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include "factory_p.h" QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/platform.cpp b/src/3rdparty/phonon/phonon/platform.cpp index 49c4561..30ea6e4 100644 --- a/src/3rdparty/phonon/phonon/platform.cpp +++ b/src/3rdparty/phonon/phonon/platform.cpp @@ -25,9 +25,9 @@ #include "factory_p.h" #include <QtCore/QCoreApplication> #include <QtCore/QUrl> -#include <QtGui/QIcon> -#include <QtGui/QStyle> -#include <QtGui/QApplication> +#include <QtWidgets/QIcon> +#include <QtWidgets/QStyle> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/seekslider.cpp b/src/3rdparty/phonon/phonon/seekslider.cpp index b5b25f0..e31d014 100644 --- a/src/3rdparty/phonon/phonon/seekslider.cpp +++ b/src/3rdparty/phonon/phonon/seekslider.cpp @@ -26,7 +26,7 @@ #include "phonondefs_p.h" #include <QtGui/QMouseEvent> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/seekslider.h b/src/3rdparty/phonon/phonon/seekslider.h index 0005029..14ff035 100644 --- a/src/3rdparty/phonon/phonon/seekslider.h +++ b/src/3rdparty/phonon/phonon/seekslider.h @@ -26,7 +26,7 @@ #include "phonon_export.h" #include "phonondefs.h" #include "phononnamespace.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/seekslider_p.h b/src/3rdparty/phonon/phonon/seekslider_p.h index 911ab25..2741150 100644 --- a/src/3rdparty/phonon/phonon/seekslider_p.h +++ b/src/3rdparty/phonon/phonon/seekslider_p.h @@ -25,11 +25,11 @@ #include "seekslider.h" #include "swiftslider_p.h" -#include <QtGui/QBoxLayout> -#include <QtGui/QLabel> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QLabel> #include <QtGui/QPixmap> -#include <QtGui/QIcon> -#include <QtGui/QStyle> +#include <QtWidgets/QIcon> +#include <QtWidgets/QStyle> #include "factory_p.h" #include <QtCore/QPointer> #include "platform_p.h" diff --git a/src/3rdparty/phonon/phonon/swiftslider.cpp b/src/3rdparty/phonon/phonon/swiftslider.cpp index 1e274aa..5fa5159 100644 --- a/src/3rdparty/phonon/phonon/swiftslider.cpp +++ b/src/3rdparty/phonon/phonon/swiftslider.cpp @@ -23,8 +23,8 @@ #include "swiftslider_p.h" #include <QtGui/QMouseEvent> -#include <QtGui/QStyle> -#include <QtGui/QStyleOption> +#include <QtWidgets/QStyle> +#include <QtWidgets/QStyleOption> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/swiftslider_p.h b/src/3rdparty/phonon/phonon/swiftslider_p.h index b063b47..fc7d285 100644 --- a/src/3rdparty/phonon/phonon/swiftslider_p.h +++ b/src/3rdparty/phonon/phonon/swiftslider_p.h @@ -23,7 +23,7 @@ #ifndef SWIFTSLIDER_H #define SWIFTSLIDER_H -#include <QtGui/QSlider> +#include <QtWidgets/QSlider> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/videoplayer.cpp b/src/3rdparty/phonon/phonon/videoplayer.cpp index 8851b05..f8cdfa5 100644 --- a/src/3rdparty/phonon/phonon/videoplayer.cpp +++ b/src/3rdparty/phonon/phonon/videoplayer.cpp @@ -25,7 +25,7 @@ #include "audiooutput.h" #include "videowidget.h" #include "path.h" -#include <QtGui/QBoxLayout> +#include <QtWidgets/QBoxLayout> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/videoplayer.h b/src/3rdparty/phonon/phonon/videoplayer.h index 7970f04..e058b91 100644 --- a/src/3rdparty/phonon/phonon/videoplayer.h +++ b/src/3rdparty/phonon/phonon/videoplayer.h @@ -26,7 +26,7 @@ #include "phonon_export.h" #include "phononnamespace.h" #include "mediasource.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/videowidget.cpp b/src/3rdparty/phonon/phonon/videowidget.cpp index 4575dfd..3b40a13 100644 --- a/src/3rdparty/phonon/phonon/videowidget.cpp +++ b/src/3rdparty/phonon/phonon/videowidget.cpp @@ -27,7 +27,7 @@ #include "phonondefs_p.h" #include "phononnamespace_p.h" -#include <QtGui/QAction> +#include <QtWidgets/QAction> #define IFACES4 VideoWidgetInterface44 #define IFACES0 VideoWidgetInterface, IFACES4 #define PHONON_INTERFACENAME IFACES0 diff --git a/src/3rdparty/phonon/phonon/videowidget.h b/src/3rdparty/phonon/phonon/videowidget.h index 804e61a..cc848a0 100644 --- a/src/3rdparty/phonon/phonon/videowidget.h +++ b/src/3rdparty/phonon/phonon/videowidget.h @@ -25,7 +25,7 @@ #include "phonon_export.h" #include "phonondefs.h" #include "abstractvideooutput.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/videowidget_p.h b/src/3rdparty/phonon/phonon/videowidget_p.h index 3335135..e0691f7 100644 --- a/src/3rdparty/phonon/phonon/videowidget_p.h +++ b/src/3rdparty/phonon/phonon/videowidget_p.h @@ -25,7 +25,7 @@ #include "videowidget.h" #include "abstractvideooutput_p.h" -#include <QtGui/QBoxLayout> +#include <QtWidgets/QBoxLayout> #include <QtCore/QEvent> #include <QtCore/QCoreApplication> #include <QtGui/QPalette> diff --git a/src/3rdparty/phonon/phonon/volumeslider.h b/src/3rdparty/phonon/phonon/volumeslider.h index f5ef34f..453a6e5 100644 --- a/src/3rdparty/phonon/phonon/volumeslider.h +++ b/src/3rdparty/phonon/phonon/volumeslider.h @@ -25,7 +25,7 @@ #include "phonon_export.h" #include "phonondefs.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/phonon/volumeslider_p.h b/src/3rdparty/phonon/phonon/volumeslider_p.h index 623275f..cf73261 100644 --- a/src/3rdparty/phonon/phonon/volumeslider_p.h +++ b/src/3rdparty/phonon/phonon/volumeslider_p.h @@ -25,13 +25,13 @@ #include "volumeslider.h" #include "swiftslider_p.h" -#include <QtGui/QBoxLayout> -#include <QtGui/QLabel> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QLabel> #include <QtGui/QPixmap> -#include <QtGui/QToolButton> +#include <QtWidgets/QToolButton> #include "factory_p.h" #include "audiooutput.h" -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtCore/QPointer> #include "platform_p.h" diff --git a/src/3rdparty/phonon/qt7/videoframe.h b/src/3rdparty/phonon/qt7/videoframe.h index 5069607..df59b85 100644 --- a/src/3rdparty/phonon/qt7/videoframe.h +++ b/src/3rdparty/phonon/qt7/videoframe.h @@ -23,8 +23,8 @@ #undef check // avoid name clash; #include <QtCore/QRect> -#include <QtGui/QPainter> -#include <QtGui/QImage> +#include <QtWidgets/QPainter> +#include <QtWidgets/QImage> QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/qt7/videowidget.h b/src/3rdparty/phonon/qt7/videowidget.h index 8d084ec..3a50ff4 100644 --- a/src/3rdparty/phonon/qt7/videowidget.h +++ b/src/3rdparty/phonon/qt7/videowidget.h @@ -18,7 +18,7 @@ #ifndef Phonon_QT7_VIDEOWIDGET_H #define Phonon_QT7_VIDEOWIDGET_H -#include <QtGui/QPaintEngine> +#include <QtWidgets/QPaintEngine> #include <phonon/videowidgetinterface.h> #include "medianode.h" diff --git a/src/phonon/phonon.pro b/src/phonon/phonon.pro index 9da6a25..f7cfc03 100644 --- a/src/phonon/phonon.pro +++ b/src/phonon/phonon.pro @@ -1,6 +1,7 @@ load(qt_module) TARGET = phonon +QT += widgets QPRO_PWD = $$PWD include($$QT_SOURCE_TREE/src/qbase.pri) diff --git a/tests/auto/mediaobject/dummy/videowidget.cpp b/tests/auto/mediaobject/dummy/videowidget.cpp index cd474ed..06829f5 100644 --- a/tests/auto/mediaobject/dummy/videowidget.cpp +++ b/tests/auto/mediaobject/dummy/videowidget.cpp @@ -41,11 +41,11 @@ #include "videowidget.h" #include <QtCore/QEvent> -#include <QtGui/QResizeEvent> -#include <QtGui/QPalette> -#include <QtGui/QImage> -#include <QtGui/QPainter> -#include <QtGui/QBoxLayout> +#include <QtWidgets/QResizeEvent> +#include <QtWidgets/QPalette> +#include <QtWidgets/QImage> +#include <QtWidgets/QPainter> +#include <QtWidgets/QBoxLayout> #include <QApplication> #include "mediaobject.h" |