From f4348fe3ae91ac47f45495681738505ff6005453 Mon Sep 17 00:00:00 2001
From: Sze Howe Koh <szehowe.koh@gmail.com>
Date: Sun, 28 Apr 2013 15:01:25 +0800
Subject: [PATCH] Decouple qmediametadata.h from qmultimedia.h
qmultimedia.h is included in more places, but qmediametadata.h is
larger. This patch should reduce unnecessary #include-ing.
Change-Id: I4a3d174bafc555d794bb75087c1f6b79745ae903
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
---
examples/multimediawidgets/camera/camera.cpp | 1 +
examples/multimediawidgets/player/player.cpp | 2 +-
src/imports/multimedia/qdeclarativemediametadata_p.h | 1 +
src/multimedia/playback/playlistfileparser.cpp | 2 +-
src/multimedia/qmultimedia.h | 1 -
.../android/mediaplayer/qandroidmetadatareadercontrol.cpp | 1 +
.../avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm | 2 +-
src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp | 1 +
src/plugins/directshow/player/directshowmetadatacontrol.cpp | 2 +-
src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp | 1 +
src/plugins/gstreamer/camerabin/camerabinmetadata.cpp | 2 ++
.../gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp | 2 ++
.../gstreamer/mediaplayer/qgstreamermetadataprovider.cpp | 1 +
src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp | 1 +
src/plugins/qt7/mediaplayer/qt7playermetadata.mm | 1 +
src/plugins/wmf/player/mfmetadatacontrol.cpp | 1 +
tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp | 1 +
tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | 1 +
tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp | 1 +
.../unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp | 1 +
.../unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp | 1 +
.../unit/qmultimedia_common/mockcameraimagecapturecontrol.h | 1 +
22 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 2b7a96f82..bd0644db6 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -46,6 +46,7 @@
#include <QMediaService>
#include <QMediaRecorder>
#include <QCameraViewfinder>
+#include <QMediaMetaData>
#include <QMessageBox>
#include <QPalette>
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index a1142bef4..377a0ffb9 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -47,9 +47,9 @@
#include <QMediaService>
#include <QMediaPlaylist>
#include <QVideoProbe>
+#include <QMediaMetaData>
#include <QtWidgets>
-
Player::Player(QWidget *parent)
: QWidget(parent)
, videoWidget(0)
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h
index 5b7c46993..1983effa0 100644
--- a/src/imports/multimedia/qdeclarativemediametadata_p.h
+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
@@ -54,6 +54,7 @@
//
#include <QtQml/qqml.h>
+#include <QtMultimedia/qmediametadata.h>
#include "qmediaobject.h"
QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/playback/playlistfileparser.cpp b/src/multimedia/playback/playlistfileparser.cpp
index 72bb0cb2a..b7b65c98f 100644
--- a/src/multimedia/playback/playlistfileparser.cpp
+++ b/src/multimedia/playback/playlistfileparser.cpp
@@ -43,7 +43,7 @@
#include <qfileinfo.h>
#include <QtNetwork/QNetworkReply>
#include "qmediaobject_p.h"
-#include "qmultimedia.h"
+#include "qmediametadata.h"
QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/qmultimedia.h b/src/multimedia/qmultimedia.h
index 22028be6c..be4737a70 100644
--- a/src/multimedia/qmultimedia.h
+++ b/src/multimedia/qmultimedia.h
@@ -47,7 +47,6 @@
#include <QtCore/qstring.h>
#include <QtMultimedia/qtmultimediadefs.h>
-#include <QtMultimedia/qmediametadata.h>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp b/src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp
index 9b2f4e17b..e52c46387 100644
--- a/src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp
+++ b/src/plugins/android/mediaplayer/qandroidmetadatareadercontrol.cpp
@@ -42,6 +42,7 @@
#include "qandroidmetadatareadercontrol.h"
#include "jmediametadataretriever.h"
+#include <QtMultimedia/qmediametadata.h>
#include <qsize.h>
#include <QDate>
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm
index 01d325cf4..3a626bcde 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm
@@ -42,7 +42,7 @@
#include "avfmediaplayermetadatacontrol.h"
#include "avfmediaplayersession.h"
-#include <QtMultimedia/qmultimedia.h>
+#include <QtMultimedia/qmediametadata.h>
#import <AVFoundation/AVFoundation.h>
diff --git a/src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp b/src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp
index 95f85f5e3..99e3c5125 100644
--- a/src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp
+++ b/src/plugins/blackberry/mediaplayer/bbmetadatareadercontrol.cpp
@@ -39,6 +39,7 @@
**
****************************************************************************/
#include "bbmetadatareadercontrol.h"
+#include <QtMultimedia/qmediametadata.h>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index f4bbe16a7..341d2cf1d 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -44,9 +44,9 @@
#include <qnetwork.h>
#include "directshowmetadatacontrol.h"
-
#include "directshowplayerservice.h"
+#include <QtMultimedia/qmediametadata.h>
#include <QtCore/qcoreapplication.h>
#ifndef QT_NO_WMSDK
diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
index 0fca0c523..79cfca3bf 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
@@ -46,6 +46,7 @@
#include <private/qgstvideobuffer_p.h>
#include <private/qvideosurfacegstsink_p.h>
#include <private/qgstutils_p.h>
+#include <QtMultimedia/qmediametadata.h>
#include <QtCore/qdebug.h>
#include <QtCore/qbuffer.h>
#include <QtGui/qimagereader.h>
diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
index 788233c6b..353fd8be6 100644
--- a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
@@ -41,6 +41,8 @@
#include "camerabinmetadata.h"
+#include <QtMultimedia/qmediametadata.h>
+
#include <gst/gst.h>
#include <gst/gstversion.h>
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
index dd3d6a4fb..fd7fb7d82 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
@@ -41,6 +41,8 @@
#include "qgstreamercapturemetadatacontrol.h"
+#include <QtMultimedia/qmediametadata.h>
+
#include <gst/gst.h>
#include <gst/gstversion.h>
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index 841c13ff6..22f203665 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -42,6 +42,7 @@
#include "qgstreamermetadataprovider.h"
#include "qgstreamerplayersession.h"
#include <QDebug>
+#include <QtMultimedia/qmediametadata.h>
#include <gst/gstversion.h>
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
index 36db67054..04d612b06 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
@@ -52,6 +52,7 @@
#include <gst/gstvalue.h>
#include <gst/base/gstbasesrc.h>
+#include <QtMultimedia/qmediametadata.h>
#include <QtCore/qdatetime.h>
#include <QtCore/qdebug.h>
#include <QtCore/qsize.h>
diff --git a/src/plugins/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/qt7/mediaplayer/qt7playermetadata.mm
index 18e2f920e..84d434be2 100644
--- a/src/plugins/qt7/mediaplayer/qt7playermetadata.mm
+++ b/src/plugins/qt7/mediaplayer/qt7playermetadata.mm
@@ -43,6 +43,7 @@
#include "qt7playermetadata.h"
#include "qt7playersession.h"
#include <QtCore/qvarlengtharray.h>
+#include <QtMultimedia/qmediametadata.h>
#import <QTKit/QTMovie.h>
diff --git a/src/plugins/wmf/player/mfmetadatacontrol.cpp b/src/plugins/wmf/player/mfmetadatacontrol.cpp
index f27370ed2..23e81f48d 100644
--- a/src/plugins/wmf/player/mfmetadatacontrol.cpp
+++ b/src/plugins/wmf/player/mfmetadatacontrol.cpp
@@ -39,6 +39,7 @@
**
****************************************************************************/
+#include <qmediametadata.h>
#include <qdatetime.h>
#include <qimage.h>
diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
index b6b3f1632..57f820b54 100644
--- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -46,6 +46,7 @@
#include "qdeclarativeaudio_p.h"
#include "qdeclarativemediametadata_p.h"
+#include <QtMultimedia/qmediametadata.h>
#include <qmediaplayercontrol.h>
#include <qmediaservice.h>
#include <private/qmediaserviceprovider_p.h>
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
index 0ac266809..8d0bf889e 100644
--- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
+++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp
@@ -45,6 +45,7 @@
#include <QtCore/qtimer.h>
+#include <QtMultimedia/qmediametadata.h>
#include <qmediaobject.h>
#include <qmediaservice.h>
#include <qmetadatareadercontrol.h>
diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
index 37c7e096a..514678617 100644
--- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
+++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
@@ -43,6 +43,7 @@
#include <QtTest/QtTest>
#include <QDebug>
+#include <QtMultimedia/qmediametadata.h>
#include <qmediaobject.h>
#include <qmediacontrol.h>
#include <qmediaservice.h>
diff --git a/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
index b9b835843..b03ded400 100644
--- a/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
+++ b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
@@ -41,6 +41,7 @@
#include <QtCore/QString>
#include <QtTest/QtTest>
#include <QtCore/QCoreApplication>
+#include <QtMultimedia/qmediametadata.h>
#include "mockmetadatareadercontrol.h"
diff --git a/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp b/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
index 8e08f8090..9baf91b70 100644
--- a/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
+++ b/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
@@ -41,6 +41,7 @@
#include <QtCore/QString>
#include <QtTest/QtTest>
#include <QtCore/QCoreApplication>
+#include <QtMultimedia/qmediametadata.h>
#include "qmetadatawritercontrol.h"
#include "mockmetadatawritercontrol.h"
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
index cc374e91a..c8e174a82 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h
@@ -44,6 +44,7 @@
#include <QDateTime>
#include <QTimer>
+#include <QtMultimedia/qmediametadata.h>
#include "qcameraimagecapturecontrol.h"
#include "qcameracontrol.h"
--
GitLab