diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-12-23 11:14:06 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 19:56:14 +0000 |
| commit | f83b3dd1ac60c04229d53b72a9d2c15f8cdd5abc (patch) | |
| tree | 4bebf265422784c1b172f2d6b66d9910c35a194a /src/multimediawidgets/qvideowidget.cpp | |
| parent | ca1584428b438cb65d5b2aaaca624e9e17578ebd (diff) | |
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>
Diffstat (limited to 'src/multimediawidgets/qvideowidget.cpp')
| -rw-r--r-- | src/multimediawidgets/qvideowidget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index 42d489524..c2a594309 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -491,7 +491,7 @@ void QVideoWidgetPrivate::clearService() bool QVideoWidgetPrivate::createWidgetBackend() { - if (QMediaControl *control = service->requestControl(QVideoWidgetControl_iid)) { + if (QObject *control = service->requestControl(QVideoWidgetControl_iid)) { if (QVideoWidgetControl *widgetControl = qobject_cast<QVideoWidgetControl *>(control)) { widgetBackend = new QVideoWidgetControlBackend(service, widgetControl, q_func()); @@ -506,7 +506,7 @@ bool QVideoWidgetPrivate::createWidgetBackend() bool QVideoWidgetPrivate::createWindowBackend() { - if (QMediaControl *control = service->requestControl(QVideoWindowControl_iid)) { + if (QObject *control = service->requestControl(QVideoWindowControl_iid)) { if (QVideoWindowControl *windowControl = qobject_cast<QVideoWindowControl *>(control)) { windowBackend = new QWindowVideoWidgetBackend(service, windowControl, q_func()); currentBackend = windowBackend; @@ -522,7 +522,7 @@ bool QVideoWidgetPrivate::createWindowBackend() bool QVideoWidgetPrivate::createRendererBackend() { - QMediaControl *control = service + QObject *control = service ? service->requestControl(QVideoRendererControl_iid) : nullptr; rendererBackend = new QRendererVideoWidgetBackend(service, |