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>

3 files changed, 0 insertions, 31 deletions

diff --git a/src/multimediawidgets/doc/snippets/multimedia-snippets/video.cpp b/src/multimediawidgets/doc/snippets/multimedia-snippets/video.cpp
index 917d1e318..434d7b8c6 100644
--- a/src/multimediawidgets/doc/snippets/multimedia-snippets/video.cpp
+++ b/src/multimediawidgets/doc/snippets/multimedia-snippets/video.cpp
@@ -39,7 +39,6 @@
 
 // Video related snippets
 // Extracted from src/multimedia/doc/snippets/multimedia-snippets/video.cpp
-#include "qmediaservice.h"
 #include "qmediaplayer.h"
 #include "qvideowidgetcontrol.h"
 #include "qvideowindowcontrol.h"
@@ -54,11 +53,9 @@ class VideoExample : public QObject {
 public:
     void VideoGraphicsItem();
     void VideoWidget();
-    void VideoWidgetControl();
 
 private:
     // Common naming
-    QMediaService *mediaService;
     QMediaPlaylist *playlist;
     QVideoWidget *videoWidget;
     QFormLayout *layout;
@@ -86,14 +83,6 @@ void VideoExample::VideoWidget()
     player->stop();
 }
 
-void VideoExample::VideoWidgetControl()
-{
-    //! [Video widget control]
-    QVideoWidgetControl *widgetControl = mediaService->requestControl<QVideoWidgetControl *>();
-    layout->addWidget(widgetControl->videoWidget());
-    //! [Video widget control]
-}
-
 void VideoExample::VideoGraphicsItem()
 {
     //! [Video graphics item]
diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp
index 66f09d672..81c9de716 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem.cpp
@@ -63,30 +63,19 @@ public:
     QGraphicsVideoItem *q_ptr = nullptr;
 
     QPainterVideoSurface *surface = nullptr;
-    QMediaService *service = nullptr;
     Qt::AspectRatioMode aspectRatioMode = Qt::KeepAspectRatio;
     QRectF rect;
     QRectF boundingRect;
     QRectF sourceRect;
     QSizeF nativeSize;
 
-    void clearService();
     void updateRects();
 
     void _q_present();
     void _q_formatChanged(const QVideoSurfaceFormat &format);
     void _q_updateNativeSize();
-    void _q_serviceDestroyed();
 };
 
-void QGraphicsVideoItemPrivate::clearService()
-{
-    if (service) {
-        QObject::disconnect(service, SIGNAL(destroyed()), q_ptr, SLOT(_q_serviceDestroyed()));
-        service = nullptr;
-    }
-}
-
 void QGraphicsVideoItemPrivate::updateRects()
 {
     q_ptr->prepareGeometryChange();
@@ -139,14 +128,6 @@ void QGraphicsVideoItemPrivate::_q_updateNativeSize()
     }
 }
 
-void QGraphicsVideoItemPrivate::_q_serviceDestroyed()
-{
-    service = nullptr;
-
-    surface->stop();
-}
-
-
 /*!
     \class QGraphicsVideoItem
 
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h
index ab193b327..23d729057 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.h
+++ b/src/multimediawidgets/qgraphicsvideoitem.h
@@ -99,7 +99,6 @@ private:
     Q_DECLARE_PRIVATE(QGraphicsVideoItem)
     Q_PRIVATE_SLOT(d_func(), void _q_present())
     Q_PRIVATE_SLOT(d_func(), void _q_updateNativeSize())
-    Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed())
 };
 
 QT_END_NAMESPACE