Get rid of QMediaControl

The class was serving no purpose that QObject doesn't offer,
so remove that layer and use QObject as the base class for
those controls.

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

4 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/wmf/decoder/mfdecoderservice.cpp b/src/plugins/wmf/decoder/mfdecoderservice.cpp
index c6ed3976a..eb2069a23 100644
--- a/src/plugins/wmf/decoder/mfdecoderservice.cpp
+++ b/src/plugins/wmf/decoder/mfdecoderservice.cpp
@@ -49,7 +49,7 @@ MFAudioDecoderService::~MFAudioDecoderService()
 {
 }
 
-QMediaControl* MFAudioDecoderService::requestControl(const char *name)
+QObject *MFAudioDecoderService::requestControl(const char *name)
 {
     if (qstrcmp(name, QAudioDecoderControl_iid) == 0) {
         return new MFAudioDecoderControl(this);
@@ -57,7 +57,7 @@ QMediaControl* MFAudioDecoderService::requestControl(const char *name)
     return 0;
 }
 
-void MFAudioDecoderService::releaseControl(QMediaControl *control)
+void MFAudioDecoderService::releaseControl(QObject *control)
 {
     if (control && control->inherits("MFAudioDecoderControl")) {
         delete control;
diff --git a/src/plugins/wmf/decoder/mfdecoderservice.h b/src/plugins/wmf/decoder/mfdecoderservice.h
index 14899ee39..3749bc8df 100644
--- a/src/plugins/wmf/decoder/mfdecoderservice.h
+++ b/src/plugins/wmf/decoder/mfdecoderservice.h
@@ -49,8 +49,8 @@ public:
     MFAudioDecoderService(QObject *parent = 0);
     ~MFAudioDecoderService();
 
-    QMediaControl* requestControl(const char *name);
-    void releaseControl(QMediaControl *control);
+    QObject *requestControl(const char *name);
+    void releaseControl(QObject *control);
 };
 
 #endif//MFDECODERSERVICE_H
diff --git a/src/plugins/wmf/player/mfplayerservice.cpp b/src/plugins/wmf/player/mfplayerservice.cpp
index b73390ac7..a0dcc713e 100644
--- a/src/plugins/wmf/player/mfplayerservice.cpp
+++ b/src/plugins/wmf/player/mfplayerservice.cpp
@@ -76,7 +76,7 @@ MFPlayerService::~MFPlayerService()
     m_session->Release();
 }
 
-QMediaControl* MFPlayerService::requestControl(const char *name)
+QObject *MFPlayerService::requestControl(const char *name)
 {
     if (qstrcmp(name, QMediaPlayerControl_iid) == 0) {
         return m_player;
@@ -113,7 +113,7 @@ QMediaControl* MFPlayerService::requestControl(const char *name)
     return 0;
 }
 
-void MFPlayerService::releaseControl(QMediaControl *control)
+void MFPlayerService::releaseControl(QObject *control)
 {
     if (!control) {
         qWarning("QMediaService::releaseControl():"
diff --git a/src/plugins/wmf/player/mfplayerservice.h b/src/plugins/wmf/player/mfplayerservice.h
index 78423c0b1..7dcf13142 100644
--- a/src/plugins/wmf/player/mfplayerservice.h
+++ b/src/plugins/wmf/player/mfplayerservice.h
@@ -67,8 +67,8 @@ public:
     MFPlayerService(QObject *parent = 0);
     ~MFPlayerService();
 
-    QMediaControl* requestControl(const char *name);
-    void releaseControl(QMediaControl *control);
+    QObject *requestControl(const char *name);
+    void releaseControl(QObject *control);
 
     MFAudioEndpointControl* audioEndpointControl() const;
     MFVideoRendererControl* videoRendererControl() const;