diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-01-05 09:32:38 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-22 06:59:28 +0000 |
| commit | 3585c53dc8977198cd08aa01d554cde0e201dd48 (patch) | |
| tree | 870d4f2b718ef2554c38d7ca56536069407d5ac7 /src/multimedia/controls | |
| parent | 5c281da180e86cf1d60e41f124568441f7a0634e (diff) | |
Rename QMediaObject to QMediaSource
That actually describes what those classes are.
Change-Id: I9ce01707bb260ff6452359e211f2c22b5740e61b
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/controls')
8 files changed, 10 insertions, 10 deletions
diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index 9490b563b..d29cc9124 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -41,7 +41,7 @@ #define QCAMERACONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qcamera.h> diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h index 7331e7392..7fc8ae93b 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.h +++ b/src/multimedia/controls/qcameraexposurecontrol.h @@ -41,7 +41,7 @@ #define QCAMERAEXPOSURECONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qcameraexposure.h> #include <QtMultimedia/qcamera.h> diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h index 3ff51b9f5..871f240da 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ b/src/multimedia/controls/qcamerafocuscontrol.h @@ -41,7 +41,7 @@ #define QCAMERAFOCUSCONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qcamerafocus.h> diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h index 1d8a0d23b..ee5aa1c0e 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h @@ -41,7 +41,7 @@ #define QCAMERAIMAGEPROCESSINGCONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qcamera.h> #include <QtMultimedia/qmediaenumdebug.h> diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index 1a8fb792c..18b94a795 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE QMediaMetaData namespace. The functionality provided by this control is exposed to application - code by the meta-data members of QMediaObject, and so meta-data access + code by the meta-data members of QMediaSource, and so meta-data access is potentially available in any of the media object classes. Any media service may implement QMetaDataReaderControl. @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE \c org.qt-project.qt.metadatareadercontrol/5.0 as defined in QMetaDataReaderControl_iid. - \sa QMediaService::requestControl(), QMediaObject + \sa QMediaService::requestControl(), QMediaSource */ /*! diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index 04729d61b..e45777a15 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -41,7 +41,7 @@ #define QMETADATAREADERCONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmultimedia.h> diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp index 14a22492f..e57a0c873 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ b/src/multimedia/controls/qmetadatawritercontrol.cpp @@ -61,14 +61,14 @@ QT_BEGIN_NAMESPACE QMediaMetaData namespace. The functionality provided by this control is exposed to application code - by the meta-data members of QMediaObject, and so meta-data access is + by the meta-data members of QMediaSource, and so meta-data access is potentially available in any of the media object classes. Any media service may implement QMetaDataControl. The interface name of QMetaDataWriterControl is \c org.qt-project.qt.metadatawritercontrol/5.0 as defined in QMetaDataWriterControl_iid. - \sa QMediaService::requestControl(), QMediaObject + \sa QMediaService::requestControl(), QMediaSource */ /*! diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index 5181974f0..c10ff1fcd 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -41,7 +41,7 @@ #define QMETADATAWRITERCONTROL_H #include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaobject.h> +#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmultimedia.h> |