And finally kill QMediaService

This removes the past piece of the old service architecture
from Qt Multimedia.

Change-Id: I607f82a546b2a2e29024b987fed3ba6e3645ae48
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

17 files changed, 12 insertions, 92 deletions

diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp
index bd933dff6..fa3aa1e01 100644
--- a/src/multimedia/controls/qaudiodecodercontrol.cpp
+++ b/src/multimedia/controls/qaudiodecodercontrol.cpp
@@ -50,8 +50,8 @@ QT_BEGIN_NAMESPACE
 
     \ingroup multimedia_control
 
-    \brief The QAudioDecoderControl class provides access to the audio decoding
-    functionality of a QMediaService.
+    \brief The QAudioDecoderControl class provides access audio decoding
+    functionality.
 
     \preliminary
 */
diff --git a/src/multimedia/controls/qaudiodecodercontrol.h b/src/multimedia/controls/qaudiodecodercontrol.h
index 945a67000..b77457ce1 100644
--- a/src/multimedia/controls/qaudiodecodercontrol.h
+++ b/src/multimedia/controls/qaudiodecodercontrol.h
@@ -40,7 +40,6 @@
 #ifndef QAUDIODECODERCONTROL_H
 #define QAUDIODECODERCONTROL_H
 
-#include <QtMultimedia/qmediaservice.h>
 #include <QtMultimedia/qaudiodecoder.h>
 
 #include <QtCore/qpair.h>
diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h
index c61e452dc..f306e3e7a 100644
--- a/src/multimedia/controls/qcameracontrol.h
+++ b/src/multimedia/controls/qcameracontrol.h
@@ -42,7 +42,6 @@
 
 #include <QtCore/qobject.h>
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmediaservice.h>
 
 #include <QtMultimedia/qcamera.h>
 
diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h
index 59b448bd8..f0182e8e8 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.h
+++ b/src/multimedia/controls/qcameraexposurecontrol.h
@@ -42,7 +42,6 @@
 
 #include <QtCore/qobject.h>
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmediaservice.h>
 
 #include <QtMultimedia/qcameraexposure.h>
 #include <QtMultimedia/qcamera.h>
diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h
index 536eb44a7..aafae5b97 100644
--- a/src/multimedia/controls/qcamerafocuscontrol.h
+++ b/src/multimedia/controls/qcamerafocuscontrol.h
@@ -42,7 +42,6 @@
 
 #include <QtCore/qobject.h>
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmediaservice.h>
 
 #include <QtMultimedia/qcamerafocus.h>
 
diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h
index e04be102f..d59e9c201 100644
--- a/src/multimedia/controls/qcameraimagecapturecontrol.h
+++ b/src/multimedia/controls/qcameraimagecapturecontrol.h
@@ -40,7 +40,6 @@
 #ifndef QCAMERAIMAGECAPTURECONTROL_H
 #define QCAMERAIMAGECAPTURECONTROL_H
 
-#include <QtMultimedia/qmediaservice.h>
 #include <QtMultimedia/qcameraimagecapture.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h
index ad7acbd69..1ded5e573 100644
--- a/src/multimedia/controls/qcameraimageprocessingcontrol.h
+++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h
@@ -42,7 +42,6 @@
 
 #include <QtCore/qobject.h>
 #include <QtMultimedia/qtmultimediaglobal.h>
-#include <QtMultimedia/qmediaservice.h>
 
 #include <QtMultimedia/qcamera.h>
 #include <QtMultimedia/qmediaenumdebug.h>
diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp
index eb188df6b..5eddbf164 100644
--- a/src/multimedia/controls/qmediaplayercontrol.cpp
+++ b/src/multimedia/controls/qmediaplayercontrol.cpp
@@ -53,9 +53,8 @@ QT_BEGIN_NAMESPACE
 
 
     \brief The QMediaPlayerControl class provides access to the media playing
-    functionality of a QMediaService.
+    functionality.
 
-    If a QMediaService can play media is will implement QMediaPlayerControl.
     This control provides a means to set the \l {setMedia()}{media} to play,
     \l {play()}{start}, \l {pause()} {pause} and \l {stop()}{stop} playback,
     \l {setPosition()}{seek}, and control the \l {setVolume()}{volume}.
@@ -66,23 +65,10 @@ QT_BEGIN_NAMESPACE
     The functionality provided by this control is exposed to application
     code through the QMediaPlayer class.
 
-    The interface name of QMediaPlayerControl is \c org.qt-project.qt.mediaplayercontrol/5.0 as
-    defined in QMediaPlayerControl_iid.
-
     \sa QMediaPlayer
 */
 
 /*!
-    \macro QMediaPlayerControl_iid
-
-    \c org.qt-project.qt.mediaplayercontrol/5.0
-
-    Defines the interface name of the QMediaPlayerControl class.
-
-    \relates QMediaPlayerControl
-*/
-
-/*!
     Constructs a new media player control with the given \a parent.
 */
 QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h
index 886311917..ac4404451 100644
--- a/src/multimedia/controls/qmediaplayercontrol.h
+++ b/src/multimedia/controls/qmediaplayercontrol.h
@@ -40,7 +40,6 @@
 #ifndef QMEDIAPLAYERCONTROL_H
 #define QMEDIAPLAYERCONTROL_H
 
-#include <QtMultimedia/qmediaservice.h>
 #include <QtMultimedia/qmediaplayer.h>
 #include <QtMultimedia/qmediatimerange.h>
 #include <QtMultimedia/qaudiodeviceinfo.h>
@@ -127,9 +126,6 @@ protected:
     explicit QMediaPlayerControl(QObject *parent = nullptr);
 };
 
-#define QMediaPlayerControl_iid "org.qt-project.qt.mediaplayercontrol/5.0"
-Q_MEDIA_DECLARE_CONTROL(QMediaPlayerControl, QMediaPlayerControl_iid)
-
 QT_END_NAMESPACE
 
 
diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp
index 5778053d5..e6eb1779f 100644
--- a/src/multimedia/controls/qmediarecordercontrol.cpp
+++ b/src/multimedia/controls/qmediarecordercontrol.cpp
@@ -51,13 +51,8 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia_control
 
     \brief The QMediaRecorderControl class provides access to the recording
-    functionality of a QMediaService.
+    functionality.
 
-    Generally you will use the QMediaRecorder class in application code - this
-    class is mostly used when implementing a new QMediaService or if there is
-    access to specific low level functionality not otherwise present in QMediaRecorder.
-
-    If a QMediaService can record media it will implement QMediaRecorderControl.
     This control provides a means to set the \l {outputLocation()}{output location},
     and record, pause and stop recording via the \l setState() method.  It also
     provides feedback on the \l {duration()}{duration} of the recording.
diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h
index dfa40f85d..5831b8948 100644
--- a/src/multimedia/controls/qmediarecordercontrol.h
+++ b/src/multimedia/controls/qmediarecordercontrol.h
@@ -40,7 +40,6 @@
 #ifndef QMEDIARECORDERCONTROL_H
 #define QMEDIARECORDERCONTROL_H
 
-#include <QtMultimedia/qmediaservice.h>
 #include <QtMultimedia/qmediarecorder.h>
 #include <QtMultimedia/qmediametadata.h>
 
diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp
index a948026a9..cef021bc0 100644
--- a/src/multimedia/controls/qmediastreamscontrol.cpp
+++ b/src/multimedia/controls/qmediastreamscontrol.cpp
@@ -62,21 +62,6 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterMediaStreamControlMetaTypes)
 
     The QMediaStreamsControl class provides descriptions of the available media streams
     and allows individual streams to be activated and deactivated.
-
-    The interface name of QMediaStreamsControl is \c org.qt-project.qt.mediastreamscontrol/5.0 as
-    defined in QMediaStreamsControl_iid.
-
-    \sa QMediaService::requestControl()
-*/
-
-/*!
-    \macro QMediaStreamsControl_iid
-
-    \c org.qt-project.qt.mediastreamscontrol/5.0
-
-    Defines the interface name of the QMediaStreamsControl class.
-
-    \relates QMediaStreamsControl
 */
 
 /*!
diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h
index 8fedd4995..1755e102d 100644
--- a/src/multimedia/controls/qmediastreamscontrol.h
+++ b/src/multimedia/controls/qmediastreamscontrol.h
@@ -41,7 +41,6 @@
 #ifndef QMEDIASTREAMSCONTROL_H
 #define QMEDIASTREAMSCONTROL_H
 
-#include <QtMultimedia/qmediaservice.h>
 #include <QtMultimedia/qmultimedia.h>
 #include <QtMultimedia/qtmultimediaglobal.h>
 #include <QtMultimedia/qmediaenumdebug.h>
@@ -75,9 +74,6 @@ protected:
     explicit QMediaStreamsControl(QObject *parent = nullptr);
 };
 
-#define QMediaStreamsControl_iid "org.qt-project.qt.mediastreamscontrol/5.0"
-Q_MEDIA_DECLARE_CONTROL(QMediaStreamsControl, QMediaStreamsControl_iid)
-
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QMediaStreamsControl::StreamType)
diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp
index 4683ed3c7..685c4fb29 100644
--- a/src/multimedia/controls/qvideorenderercontrol.cpp
+++ b/src/multimedia/controls/qvideorenderercontrol.cpp
@@ -52,27 +52,13 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia_control
 
     Using the surface() property of QVideoRendererControl a
-    QAbstractVideoSurface may be set as the video render target of a
-    QMediaService.
+    QAbstractVideoSurface may be set as the video render target.
 
     \snippet multimedia-snippets/video.cpp Video renderer control
 
     QVideoRendererControl is one of a number of possible video output controls.
 
-    The interface name of QVideoRendererControl is \c org.qt-project.qt.videorenderercontrol/5.0 as
-    defined in QVideoRendererControl_iid.
-
-    \sa QMediaService::requestControl(), QVideoWidget
-*/
-
-/*!
-    \macro QVideoRendererControl_iid
-
-    \c org.qt-project.qt.videorenderercontrol/5.0
-
-    Defines the interface name of the QVideoRendererControl class.
-
-    \relates QVideoRendererControl
+    \sa QVideoWidget
 */
 
 /*!
diff --git a/src/multimedia/controls/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h
index bc2f27fcf..3865b90ce 100644
--- a/src/multimedia/controls/qvideorenderercontrol.h
+++ b/src/multimedia/controls/qvideorenderercontrol.h
@@ -40,7 +40,8 @@
 #ifndef QVIDEORENDERERCONTROL_H
 #define QVIDEORENDERERCONTROL_H
 
-#include <QtMultimedia/qmediaservice.h>
+#include <QtCore/qobject.h>
+#include <QtMultimedia/qtmultimediaglobal.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -57,9 +58,6 @@ protected:
     explicit QVideoRendererControl(QObject *parent = nullptr);
 };
 
-#define QVideoRendererControl_iid "org.qt-project.qt.videorenderercontrol/5.0"
-Q_MEDIA_DECLARE_CONTROL(QVideoRendererControl, QVideoRendererControl_iid)
-
 QT_END_NAMESPACE
 
 
diff --git a/src/multimedia/controls/qvideowindowcontrol.cpp b/src/multimedia/controls/qvideowindowcontrol.cpp
index f5e2259a8..6520b12df 100644
--- a/src/multimedia/controls/qvideowindowcontrol.cpp
+++ b/src/multimedia/controls/qvideowindowcontrol.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 
     The winId() property QVideoWindowControl allows a platform specific window
-    ID to be set as the video render target of a QMediaService.  The
+    ID to be set as the video render target.  The
     displayRect() property is used to set the region of the window the video
     should be rendered to, and the aspectRatioMode() property indicates how the
     video should be scaled to fit the displayRect().
@@ -61,20 +61,7 @@ QT_BEGIN_NAMESPACE
 
     QVideoWindowControl is one of a number of possible video output controls.
 
-    The interface name of QVideoWindowControl is \c org.qt-project.qt.videowindowcontrol/5.0 as
-    defined in QVideoWindowControl_iid.
-
-    \sa QMediaService::requestControl(), QVideoWidget
-*/
-
-/*!
-    \macro QVideoWindowControl_iid
-
-    \c org.qt-project.qt.videowindowcontrol/5.0
-
-    Defines the interface name of the QVideoWindowControl class.
-
-    \relates QVideoWindowControl
+    \sa QVideoWidget
 */
 
 /*!
diff --git a/src/multimedia/controls/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h
index 7f7012494..f8222fdf9 100644
--- a/src/multimedia/controls/qvideowindowcontrol.h
+++ b/src/multimedia/controls/qvideowindowcontrol.h
@@ -40,7 +40,8 @@
 #ifndef QVIDEOWINDOWCONTROL_H
 #define QVIDEOWINDOWCONTROL_H
 
-#include <QtMultimedia/qmediaservice.h>
+#include <QtMultimedia/qtmultimediaglobal.h>
+#include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qsize.h>
 #include <QtGui/qwindowdefs.h>
@@ -95,9 +96,6 @@ protected:
     explicit QVideoWindowControl(QObject *parent = nullptr);
 };
 
-#define QVideoWindowControl_iid "org.qt-project.qt.videowindowcontrol/5.0"
-Q_MEDIA_DECLARE_CONTROL(QVideoWindowControl, QVideoWindowControl_iid)
-
 QT_END_NAMESPACE