From 7517dcca3bf611fc9ff9a0f7cd52f3dcde140893 Mon Sep 17 00:00:00 2001 From: Jonas Rabbe Date: Mon, 19 Mar 2012 13:35:30 +1000 Subject: Updated IID, services, and controls to use qt-project URL Instead of com.nokia.qt we should use org.qt-project.qt. All the identifiers have also been updated to use pure lowercase, and where used the version numbers have been updated to 5.0. Change-Id: Ib209327f5205f5a086a5932394504a8a52e1f712 Reviewed-by: Dmytro Poplavskiy --- src/multimedia/audio/qaudiosystemplugin.h | 2 +- src/multimedia/controls/qaudiodecodercontrol_p.cpp | 4 ++-- src/multimedia/controls/qaudiodecodercontrol_p.h | 2 +- src/multimedia/controls/qaudioencodercontrol.cpp | 4 ++-- src/multimedia/controls/qaudioencodercontrol.h | 2 +- .../controls/qcameracapturebufferformatcontrol.cpp | 4 ++-- .../controls/qcameracapturebufferformatcontrol.h | 2 +- .../controls/qcameracapturedestinationcontrol.cpp | 4 ++-- .../controls/qcameracapturedestinationcontrol.h | 2 +- src/multimedia/controls/qcameracontrol.cpp | 4 ++-- src/multimedia/controls/qcameracontrol.h | 2 +- src/multimedia/controls/qcameraexposurecontrol.cpp | 4 ++-- src/multimedia/controls/qcameraexposurecontrol.h | 2 +- src/multimedia/controls/qcamerafeedbackcontrol.cpp | 4 ++-- src/multimedia/controls/qcamerafeedbackcontrol.h | 2 +- src/multimedia/controls/qcameraflashcontrol.cpp | 4 ++-- src/multimedia/controls/qcameraflashcontrol.h | 2 +- src/multimedia/controls/qcamerafocuscontrol.cpp | 4 ++-- src/multimedia/controls/qcamerafocuscontrol.h | 2 +- src/multimedia/controls/qcameraimagecapturecontrol.cpp | 4 ++-- src/multimedia/controls/qcameraimagecapturecontrol.h | 2 +- .../controls/qcameraimageprocessingcontrol.cpp | 4 ++-- .../controls/qcameraimageprocessingcontrol.h | 2 +- src/multimedia/controls/qcameralockscontrol.cpp | 4 ++-- src/multimedia/controls/qcameralockscontrol.h | 2 +- .../controls/qcameraviewfinderresolutioncontrol.cpp | 4 ++-- .../controls/qcameraviewfinderresolutioncontrol.h | 2 +- src/multimedia/controls/qcamerazoomcontrol.cpp | 4 ++-- src/multimedia/controls/qcamerazoomcontrol.h | 2 +- src/multimedia/controls/qimageencodercontrol.cpp | 4 ++-- src/multimedia/controls/qimageencodercontrol.h | 2 +- src/multimedia/controls/qmediaaudioprobecontrol.cpp | 4 ++-- src/multimedia/controls/qmediaaudioprobecontrol.h | 2 +- src/multimedia/controls/qmediaavailabilitycontrol.cpp | 4 ++-- src/multimedia/controls/qmediaavailabilitycontrol.h | 2 +- src/multimedia/controls/qmediacontainercontrol.cpp | 4 ++-- src/multimedia/controls/qmediacontainercontrol.h | 2 +- .../controls/qmediagaplessplaybackcontrol.cpp | 4 ++-- src/multimedia/controls/qmediagaplessplaybackcontrol.h | 2 +- src/multimedia/controls/qmedianetworkaccesscontrol.h | 2 +- src/multimedia/controls/qmediaplayercontrol.cpp | 4 ++-- src/multimedia/controls/qmediaplayercontrol.h | 2 +- src/multimedia/controls/qmediaplaylistcontrol.cpp | 4 ++-- src/multimedia/controls/qmediaplaylistcontrol_p.h | 2 +- .../controls/qmediaplaylistsourcecontrol.cpp | 4 ++-- .../controls/qmediaplaylistsourcecontrol_p.h | 2 +- src/multimedia/controls/qmediarecordercontrol.cpp | 4 ++-- src/multimedia/controls/qmediarecordercontrol.h | 2 +- src/multimedia/controls/qmediastreamscontrol.cpp | 4 ++-- src/multimedia/controls/qmediastreamscontrol.h | 2 +- src/multimedia/controls/qmediavideoprobecontrol.cpp | 4 ++-- src/multimedia/controls/qmediavideoprobecontrol.h | 2 +- src/multimedia/controls/qmetadatareadercontrol.cpp | 4 ++-- src/multimedia/controls/qmetadatareadercontrol.h | 2 +- src/multimedia/controls/qmetadatawritercontrol.cpp | 4 ++-- src/multimedia/controls/qmetadatawritercontrol.h | 2 +- src/multimedia/controls/qradiodatacontrol.cpp | 4 ++-- src/multimedia/controls/qradiodatacontrol.h | 2 +- src/multimedia/controls/qradiotunercontrol.cpp | 4 ++-- src/multimedia/controls/qradiotunercontrol.h | 2 +- src/multimedia/controls/qvideodevicecontrol.cpp | 4 ++-- src/multimedia/controls/qvideodevicecontrol.h | 2 +- src/multimedia/controls/qvideoencodercontrol.cpp | 4 ++-- src/multimedia/controls/qvideoencodercontrol.h | 2 +- src/multimedia/controls/qvideorenderercontrol.cpp | 4 ++-- src/multimedia/controls/qvideorenderercontrol.h | 2 +- .../gsttools_headers/qgstbufferpoolinterface_p.h | 2 +- .../gsttools_headers/qgstreamerbushelper_p.h | 4 ++-- src/multimedia/playback/qaudioendpointselector.cpp | 4 ++-- src/multimedia/playback/qaudioendpointselector.h | 2 +- src/multimedia/playback/qmediaplaylistioplugin_p.h | 2 +- src/multimedia/qmediabindableinterface.h | 2 +- src/multimedia/qmediaserviceproviderplugin.h | 18 +++++++++--------- .../qtmultimediaquicktools_headers/qsgvideonode_p.h | 2 +- src/multimediawidgets/qvideowidgetcontrol.cpp | 4 ++-- src/multimediawidgets/qvideowidgetcontrol.h | 2 +- src/multimediawidgets/qvideowindowcontrol.cpp | 4 ++-- src/multimediawidgets/qvideowindowcontrol.h | 2 +- src/plugins/audiocapture/audiocapture.json | 2 +- src/plugins/audiocapture/audiocaptureserviceplugin.h | 2 +- src/plugins/directshow/directshow.json | 2 +- src/plugins/directshow/dsserviceplugin.h | 2 +- src/plugins/gstreamer/gstreamer.json | 2 +- src/plugins/gstreamer/qgstreamerserviceplugin.h | 2 +- .../gstreamer/qgstreamervideorendererinterface.h | 2 +- src/plugins/m3u/qm3uhandler.h | 2 +- src/plugins/pulseaudio/qpulseaudioplugin.h | 2 +- src/plugins/qt7/qt7.json | 2 +- src/plugins/qt7/qt7serviceplugin.h | 2 +- src/plugins/qt7/qt7videooutput.h | 2 +- 90 files changed, 134 insertions(+), 134 deletions(-) (limited to 'src') diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h index d48d89c32..44e1646c6 100644 --- a/src/multimedia/audio/qaudiosystemplugin.h +++ b/src/multimedia/audio/qaudiosystemplugin.h @@ -69,7 +69,7 @@ struct Q_MULTIMEDIA_EXPORT QAudioSystemFactoryInterface }; #define QAudioSystemFactoryInterface_iid \ - "com.nokia.qt.QAudioSystemFactoryInterface" + "org.qt-project.qt.audiosystemfactory/5.0" Q_DECLARE_INTERFACE(QAudioSystemFactoryInterface, QAudioSystemFactoryInterface_iid) class Q_MULTIMEDIA_EXPORT QAudioSystemPlugin : public QObject, public QAudioSystemFactoryInterface diff --git a/src/multimedia/controls/qaudiodecodercontrol_p.cpp b/src/multimedia/controls/qaudiodecodercontrol_p.cpp index 760d7060d..72ecd10b7 100644 --- a/src/multimedia/controls/qaudiodecodercontrol_p.cpp +++ b/src/multimedia/controls/qaudiodecodercontrol_p.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE The functionality provided by this control is exposed to application code through the QAudioDecoder class. - The interface name of QAudioDecoderControl is \c com.nokia.Qt.QAudioDecoderControl/1.0 as + The interface name of QAudioDecoderControl is \c org.qt-project.qt.audiodecodercontrol/5.0 as defined in QAudioDecoderControl_iid. \sa QMediaService::requestControl(), QAudioDecoder @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE /*! \macro QAudioDecoderControl_iid - \c com.nokia.Qt.QAudioDecoderControl/1.0 + \c org.qt-project.qt.audiodecodercontrol/5.0 Defines the interface name of the QAudioDecoderControl class. diff --git a/src/multimedia/controls/qaudiodecodercontrol_p.h b/src/multimedia/controls/qaudiodecodercontrol_p.h index 0c3bf26ff..00f6f9552 100644 --- a/src/multimedia/controls/qaudiodecodercontrol_p.h +++ b/src/multimedia/controls/qaudiodecodercontrol_p.h @@ -101,7 +101,7 @@ protected: QAudioDecoderControl(QObject* parent = 0); }; -#define QAudioDecoderControl_iid "com.nokia.Qt.QAudioDecoderControl/1.0" +#define QAudioDecoderControl_iid "org.qt-project.qt.audiodecodercontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QAudioDecoderControl, QAudioDecoderControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qaudioencodercontrol.cpp b/src/multimedia/controls/qaudioencodercontrol.cpp index 99cd3d5b1..573dbe9f3 100644 --- a/src/multimedia/controls/qaudioencodercontrol.cpp +++ b/src/multimedia/controls/qaudioencodercontrol.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE The functionality provided by this control is exposed to application code through the QMediaRecorder class. - The interface name of QAudioEncoderControl is \c com.nokia.Qt.QAudioEncoderControl/1.0 as + The interface name of QAudioEncoderControl is \c org.qt-project.qt.audioencodercontrol/5.0 as defined in QAudioEncoderControl_iid. \sa QMediaService::requestControl(), QMediaRecorder @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE /*! \macro QAudioEncoderControl_iid - \c com.nokia.Qt.AudioEncoderControl/1.0 + \c org.qt-project.qt.audioencodercontrol/5.0 Defines the interface name of the QAudioEncoderControl class. diff --git a/src/multimedia/controls/qaudioencodercontrol.h b/src/multimedia/controls/qaudioencodercontrol.h index fb50cf472..35322ff40 100644 --- a/src/multimedia/controls/qaudioencodercontrol.h +++ b/src/multimedia/controls/qaudioencodercontrol.h @@ -84,7 +84,7 @@ protected: QAudioEncoderControl(QObject *parent = 0); }; -#define QAudioEncoderControl_iid "com.nokia.Qt.QAudioEncoderControl/1.0" +#define QAudioEncoderControl_iid "org.qt-project.qt.audioencodercontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QAudioEncoderControl, QAudioEncoderControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp index 4c14adaf8..108a2f9af 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \ingroup multimedia \ingroup multimedia_control - The interface name of QCameraCaptureBufferFormatControl is \c com.nokia.Qt.QCameraCaptureBufferFormatControl/1.0 as + The interface name of QCameraCaptureBufferFormatControl is \c org.qt-project.qt.cameracapturebufferformatcontrol/5.0 as defined in QCameraCaptureBufferFormatControl_iid. \sa QMediaService::requestControl() @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCameraCaptureBufferFormatControl_iid - \c com.nokia.Qt.QCameraCaptureBufferFormatControl/1.0 + \c org.qt-project.qt.cameracapturebufferformatcontrol/5.0 Defines the interface name of the QCameraCaptureBufferFormatControl class. diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h index 5956fe992..976fbdc87 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h @@ -69,7 +69,7 @@ protected: QCameraCaptureBufferFormatControl(QObject* parent = 0); }; -#define QCameraCaptureBufferFormatControl_iid "com.nokia.Qt.QCameraCaptureBufferFormatControl/1.0" +#define QCameraCaptureBufferFormatControl_iid "org.qt-project.qt.cameracapturebufferformatcontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraCaptureBufferFormatControl, QCameraCaptureBufferFormatControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp index 0476c5d80..8cf6a5bc1 100644 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp +++ b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \ingroup multimedia \ingroup multimedia_control - The interface name of QCameraCaptureDestinationControl is \c com.nokia.Qt.QCameraCaptureDestinationControl/1.0 as + The interface name of QCameraCaptureDestinationControl is \c org.qt-project.qt.cameracapturedestinationcontrol/5.0 as defined in QCameraCaptureDestinationControl_iid. @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCameraCaptureDestinationControl_iid - \c com.nokia.Qt.QCameraCaptureDestinationControl/1.0 + \c org.qt-project.qt.cameracapturedestinationcontrol/5.0 Defines the interface name of the QCameraCaptureDestinationControl class. diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.h b/src/multimedia/controls/qcameracapturedestinationcontrol.h index 360d1ed29..542c6921f 100644 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.h +++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h @@ -69,7 +69,7 @@ protected: QCameraCaptureDestinationControl(QObject* parent = 0); }; -#define QCameraCaptureDestinationControl_iid "com.nokia.Qt.QCameraCaptureDestinationControl/1.0" +#define QCameraCaptureDestinationControl_iid "org.qt-project.qt.cameracapturedestinationcontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraCaptureDestinationControl, QCameraCaptureDestinationControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp index 3bb9a9420..a8d8ccdf7 100644 --- a/src/multimedia/controls/qcameracontrol.cpp +++ b/src/multimedia/controls/qcameracontrol.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE This service is provided by a QMediaService object via QMediaService::control(). It is used by QCamera. - The interface name of QCameraControl is \c com.nokia.Qt.QCameraControl/1.0 as + The interface name of QCameraControl is \c org.qt-project.qt.cameracontrol/5.0 as defined in QCameraControl_iid. @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCameraControl_iid - \c com.nokia.Qt.QCameraControl/1.0 + \c org.qt-project.qt.cameracontrol/5.0 Defines the interface name of the QCameraControl class. diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index c4bb91feb..cb0e73dfd 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -89,7 +89,7 @@ protected: QCameraControl(QObject* parent = 0); }; -#define QCameraControl_iid "com.nokia.Qt.QCameraControl/1.0" +#define QCameraControl_iid "org.qt-project.qt.cameracontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraControl, QCameraControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp index f3ebeff4d..5b4572dca 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.cpp +++ b/src/multimedia/controls/qcameraexposurecontrol.cpp @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE \endtable - The interface name of QCameraExposureControl is \c com.nokia.Qt.QCameraExposureControl/1.0 as + The interface name of QCameraExposureControl is \c org.qt-project.qt.cameraexposurecontrol/5.0 as defined in QCameraExposureControl_iid. \sa QCamera @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCameraExposureControl_iid - \c com.nokia.Qt.QCameraExposureControl/1.0 + \c org.qt-project.qt.cameraexposurecontrol/5.0 Defines the interface name of the QCameraExposureControl class. diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h index c9e248222..227ff036f 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.h +++ b/src/multimedia/controls/qcameraexposurecontrol.h @@ -94,7 +94,7 @@ protected: QCameraExposureControl(QObject* parent = 0); }; -#define QCameraExposureControl_iid "com.nokia.Qt.QCameraExposureControl/1.0" +#define QCameraExposureControl_iid "org.qt-project.qt.cameraexposurecontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraExposureControl, QCameraExposureControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.cpp b/src/multimedia/controls/qcamerafeedbackcontrol.cpp index f1fe45c31..119032be9 100644 --- a/src/multimedia/controls/qcamerafeedbackcontrol.cpp +++ b/src/multimedia/controls/qcamerafeedbackcontrol.cpp @@ -67,7 +67,7 @@ if that type of feedback can be modified. Any attempts to change a locked feedback type will be ignored. - The interface name of QCameraFeedbackControl is \c com.nokia.Qt.QCameraFeedbackControl/1.0 as + The interface name of QCameraFeedbackControl is \c org.qt-project.qt.camerafeedbackcontrol/5.0 as defined in QCameraFeedbackControl_iid. \sa QCamera @@ -98,7 +98,7 @@ /*! \macro QCameraFeedbackControl_iid - \c com.nokia.Qt.QCameraFeedbackControl/1.0 + \c org.qt-project.qt.camerafeedbackcontrol/5.0 Defines the interface name of the QCameraFeedbackControl class. diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.h b/src/multimedia/controls/qcamerafeedbackcontrol.h index 0dd66c39a..0b68a0a98 100644 --- a/src/multimedia/controls/qcamerafeedbackcontrol.h +++ b/src/multimedia/controls/qcamerafeedbackcontrol.h @@ -91,7 +91,7 @@ protected: QCameraFeedbackControl(QObject* parent = 0); }; -#define QCameraFeedbackControl_iid "com.nokia.Qt.QCameraFeedbackControl/1.0" +#define QCameraFeedbackControl_iid "org.qt-project.qt.camerafeedbackcontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraFeedbackControl, QCameraFeedbackControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcameraflashcontrol.cpp b/src/multimedia/controls/qcameraflashcontrol.cpp index 6080dfabe..b98a9fa39 100644 --- a/src/multimedia/controls/qcameraflashcontrol.cpp +++ b/src/multimedia/controls/qcameraflashcontrol.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE Some camera devices may not have flash hardware, or may not be configurable. In that case, there will be no QCameraFlashControl available. - The interface name of QCameraFlashControl is \c com.nokia.Qt.QCameraFlashControl/1.0 as + The interface name of QCameraFlashControl is \c org.qt-project.qt.cameraflashcontrol/5.0 as defined in QCameraFlashControl_iid. \sa QCamera @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCameraFlashControl_iid - \c com.nokia.Qt.QCameraFlashControl/1.0 + \c org.qt-project.qt.cameraflashcontrol/5.0 Defines the interface name of the QCameraFlashControl class. diff --git a/src/multimedia/controls/qcameraflashcontrol.h b/src/multimedia/controls/qcameraflashcontrol.h index 4872c9d36..fbed527c7 100644 --- a/src/multimedia/controls/qcameraflashcontrol.h +++ b/src/multimedia/controls/qcameraflashcontrol.h @@ -75,7 +75,7 @@ protected: QCameraFlashControl(QObject* parent = 0); }; -#define QCameraFlashControl_iid "com.nokia.Qt.QCameraFlashControl/1.0" +#define QCameraFlashControl_iid "org.qt-project.qt.cameraflashcontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraFlashControl, QCameraFlashControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp index 3a0bc2103..dffcc106d 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.cpp +++ b/src/multimedia/controls/qcamerafocuscontrol.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE \ingroup multimedia \ingroup multimedia_control - The interface name of QCameraFocusControl is \c com.nokia.Qt.QCameraFocusControl/1.0 as + The interface name of QCameraFocusControl is \c org.qt-project.qt.camerafocuscontrol/5.0 as defined in QCameraFocusControl_iid. @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCameraFocusControl_iid - \c com.nokia.Qt.QCameraFocusControl/1.0 + \c org.qt-project.qt.camerafocuscontrol/5.0 Defines the interface name of the QCameraFocusControl class. diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h index 06e0cfa13..d04be27e2 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ b/src/multimedia/controls/qcamerafocuscontrol.h @@ -84,7 +84,7 @@ protected: QCameraFocusControl(QObject* parent = 0); }; -#define QCameraFocusControl_iid "com.nokia.Qt.QCameraFocusControl/1.0" +#define QCameraFocusControl_iid "org.qt-project.qt.camerafocuscontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraFocusControl, QCameraFocusControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp index 5a731682d..4384c4c70 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \ingroup multimedia \ingroup multimedia_control - The interface name of QCameraImageCaptureControl is \c com.nokia.Qt.QCameraImageCaptureControl/1.0 as + The interface name of QCameraImageCaptureControl is \c org.qt-project.qt.cameraimagecapturecontrol/5.0 as defined in QCameraImageCaptureControl_iid. @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCameraImageCaptureControl_iid - \c com.nokia.Qt.QCameraImageCaptureControl/1.0 + \c org.qt-project.qt.cameraimagecapturecontrol/5.0 Defines the interface name of the QCameraImageCaptureControl class. diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h index eb92b2afb..8b0cc9127 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ b/src/multimedia/controls/qcameraimagecapturecontrol.h @@ -86,7 +86,7 @@ protected: QCameraImageCaptureControl(QObject* parent = 0); }; -#define QCameraImageCaptureControl_iid "com.nokia.Qt.QCameraImageCaptureControl/1.0" +#define QCameraImageCaptureControl_iid "org.qt-project.qt.cameraimagecapturecontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraImageCaptureControl, QCameraImageCaptureControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp index ba1eda498..e6a1b5ac7 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp @@ -68,7 +68,7 @@ namespace for controlling image processing parameters, like white balance, contrast, saturation, sharpening and denoising. - The interface name of QCameraImageProcessingControl is \c com.nokia.Qt.QCameraImageProcessingControl/1.0 as + The interface name of QCameraImageProcessingControl is \c org.qt-project.qt.cameraimageprocessingcontrol/5.0 as defined in QCameraImageProcessingControl_iid. Camera service may choose the parameters of image processing pipeline depending @@ -91,7 +91,7 @@ namespace /*! \macro QCameraImageProcessingControl_iid - \c com.nokia.Qt.QCameraImageProcessingControl/1.0 + \c org.qt-project.qt.cameraimageprocessingcontrol/5.0 Defines the interface name of the QCameraImageProcessingControl class. diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h index 41200b2d3..faa3cfce8 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h @@ -88,7 +88,7 @@ protected: QCameraImageProcessingControl(QObject* parent = 0); }; -#define QCameraImageProcessingControl_iid "com.nokia.Qt.QCameraImageProcessingControl/1.0" +#define QCameraImageProcessingControl_iid "org.qt-project.qt.cameraimageprocessingcontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraImageProcessingControl, QCameraImageProcessingControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcameralockscontrol.cpp b/src/multimedia/controls/qcameralockscontrol.cpp index ec2761861..cefb8ceaf 100644 --- a/src/multimedia/controls/qcameralockscontrol.cpp +++ b/src/multimedia/controls/qcameralockscontrol.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE This service is provided by a QMediaService object via QMediaService::control(). It is used by QCamera. - The interface name of QCameraLocksControl is \c com.nokia.Qt.QCameraLocksControl/1.0 as + The interface name of QCameraLocksControl is \c org.qt-project.qt.cameralockscontrol/5.0 as defined in QCameraLocksControl_iid. @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCameraLocksControl_iid - \c com.nokia.Qt.QCameraLocksControl/1.0 + \c org.qt-project.qt.cameralockscontrol/5.0 Defines the interface name of the QCameraLocksControl class. diff --git a/src/multimedia/controls/qcameralockscontrol.h b/src/multimedia/controls/qcameralockscontrol.h index 09237d379..4b5e7c0e5 100644 --- a/src/multimedia/controls/qcameralockscontrol.h +++ b/src/multimedia/controls/qcameralockscontrol.h @@ -74,7 +74,7 @@ protected: QCameraLocksControl(QObject* parent = 0); }; -#define QCameraLocksControl_iid "com.nokia.Qt.QCameraLocksControl/1.0" +#define QCameraLocksControl_iid "org.qt-project.qt.cameralockscontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraLocksControl, QCameraLocksControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcameraviewfinderresolutioncontrol.cpp b/src/multimedia/controls/qcameraviewfinderresolutioncontrol.cpp index 62b1c92b5..3d93eda46 100644 --- a/src/multimedia/controls/qcameraviewfinderresolutioncontrol.cpp +++ b/src/multimedia/controls/qcameraviewfinderresolutioncontrol.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \brief The QCameraViewfinderResolutionControl class provides an abstract class for controlling camera viewfinder parameters. - The interface name of QCameraViewfinderResolutionControl is \c com.nokia.Qt.QCameraViewfinderResolutionControl/1.0 as + The interface name of QCameraViewfinderResolutionControl is \c org.qt-project.qt.cameraviewfinderresolutioncontrol/5.0 as defined in QCameraViewfinderResolutionControl_iid. \sa QMediaService::requestControl(), QCamera @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCameraViewfinderResolutionControl_iid - \c com.nokia.Qt.QCameraViewfinderResolutionControl/1.0 + \c org.qt-project.qt.cameraviewfinderresolutioncontrol/5.0 Defines the interface name of the QCameraViewfinderResolutionControl class. diff --git a/src/multimedia/controls/qcameraviewfinderresolutioncontrol.h b/src/multimedia/controls/qcameraviewfinderresolutioncontrol.h index 4204e225f..c59893f33 100644 --- a/src/multimedia/controls/qcameraviewfinderresolutioncontrol.h +++ b/src/multimedia/controls/qcameraviewfinderresolutioncontrol.h @@ -66,7 +66,7 @@ protected: }; -#define QCameraViewfinderResolutionControl_iid "com.nokia.Qt.QCameraViewfinderControl/1.0" +#define QCameraViewfinderResolutionControl_iid "org.qt-project.qt.cameraviewfindercontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderResolutionControl, QCameraViewfinderResolutionControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcamerazoomcontrol.cpp b/src/multimedia/controls/qcamerazoomcontrol.cpp index d60cc9fb7..d1a078607 100644 --- a/src/multimedia/controls/qcamerazoomcontrol.cpp +++ b/src/multimedia/controls/qcamerazoomcontrol.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE \ingroup multimedia \ingroup multimedia_control - The interface name of QCameraZoomControl is \c com.nokia.Qt.QCameraZoomControl/1.0 as + The interface name of QCameraZoomControl is \c org.qt-project.qt.camerazoomcontrol/5.0 as defined in QCameraZoomControl_iid. @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE /*! \macro QCameraZoomControl_iid - \c com.nokia.Qt.QCameraZoomControl/1.0 + \c org.qt-project.qt.camerazoomcontrol/5.0 Defines the interface name of the QCameraZoomControl class. diff --git a/src/multimedia/controls/qcamerazoomcontrol.h b/src/multimedia/controls/qcamerazoomcontrol.h index c2cbd57a6..b582d0111 100644 --- a/src/multimedia/controls/qcamerazoomcontrol.h +++ b/src/multimedia/controls/qcamerazoomcontrol.h @@ -82,7 +82,7 @@ protected: QCameraZoomControl(QObject* parent = 0); }; -#define QCameraZoomControl_iid "com.nokia.Qt.QCameraZoomControl/1.0" +#define QCameraZoomControl_iid "org.qt-project.qt.camerazoomcontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QCameraZoomControl, QCameraZoomControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qimageencodercontrol.cpp b/src/multimedia/controls/qimageencodercontrol.cpp index e53861a78..e1ac8a919 100644 --- a/src/multimedia/controls/qimageencodercontrol.cpp +++ b/src/multimedia/controls/qimageencodercontrol.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE provides functions for quering supported image \l {supportedImageCodecs()}{codecs} and \l {supportedResolutions()}{resolutions}. - The interface name of QImageEncoderControl is \c com.nokia.Qt.QImageEncoderControl/1.0 as + The interface name of QImageEncoderControl is \c org.qt-project.qt.imageencodercontrol/5.0 as defined in QImageEncoderControl_iid. \sa QImageEncoderSettings, QMediaService::requestControl() @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE /*! \macro QImageEncoderControl_iid - \c com.nokia.Qt.QImageEncoderControl/1.0 + \c org.qt-project.qt.imageencodercontrol/5.0 Defines the interface name of the QImageEncoderControl class. diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h index d46ff55ca..555338fc4 100644 --- a/src/multimedia/controls/qimageencodercontrol.h +++ b/src/multimedia/controls/qimageencodercontrol.h @@ -80,7 +80,7 @@ protected: QImageEncoderControl(QObject *parent = 0); }; -#define QImageEncoderControl_iid "com.nokia.Qt.QImageEncoderControl/1.0" +#define QImageEncoderControl_iid "org.qt-project.qt.imageencodercontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QImageEncoderControl, QImageEncoderControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.cpp b/src/multimedia/controls/qmediaaudioprobecontrol.cpp index 3068fd30c..ba9a1b700 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.cpp +++ b/src/multimedia/controls/qmediaaudioprobecontrol.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE \l QAudioProbe is the client facing class for probing audio - this class is implemented by media backends to provide this functionality. - The interface name of QMediaAudioProbeControl is \c com.nokia.Qt.QMediaAudioProbeControl/1.0 as + The interface name of QMediaAudioProbeControl is \c org.qt-project.qt.mediaaudioprobecontrol/5.0 as defined in QMediaAudioProbeControl_iid. \sa QAudioProbe, QMediaService::requestControl(), QMediaPlayer, QCamera @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE /*! \macro QMediaAudioProbeControl_iid - \c com.nokia.Qt.QMediaAudioProbeControl/1.0 + \c org.qt-project.qt.mediaaudioprobecontrol/5.0 Defines the interface name of the QMediaAudioProbeControl class. diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h index f5359b9ad..42eccf0b3 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.h +++ b/src/multimedia/controls/qmediaaudioprobecontrol.h @@ -65,7 +65,7 @@ protected: explicit QMediaAudioProbeControl(QObject *parent = 0); }; -#define QMediaAudioProbeControl_iid "com.nokia.Qt.QMediaAudioProbeControl/1.0" +#define QMediaAudioProbeControl_iid "org.qt-project.qt.mediaaudioprobecontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaAudioProbeControl, QMediaAudioProbeControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.cpp b/src/multimedia/controls/qmediaavailabilitycontrol.cpp index 76f615049..9a0c1ca05 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.cpp +++ b/src/multimedia/controls/qmediaavailabilitycontrol.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE An instance of QMediaObject (or its derived classes) can report any changes in availability via this control. - The interface name of QMediaAvailabilityControl is \c com.nokia.Qt.QMediaAvailabilityControl/1.0 as + The interface name of QMediaAvailabilityControl is \c org.qt-project.qt.mediaavailabilitycontrol/5.0 as defined in QMediaAvailabilityControl_iid. \sa QMediaService::requestControl(), QMediaObject @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE /*! \macro QMediaAvailabilityControl_iid - \c com.nokia.Qt.QMediaAvailabilityControl/1.0 + \c org.qt-project.qt.mediaavailabilitycontrol/5.0 Defines the interface name of the QMediaAvailabilityControl class. diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index 4b0b8a024..479db4916 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -68,7 +68,7 @@ protected: QMediaAvailabilityControl(QObject* parent = 0); }; -#define QMediaAvailabilityControl_iid "com.nokia.Qt.QMediaAvailabilityControl/1.0" +#define QMediaAvailabilityControl_iid "org.qt-project.qt.mediaavailabilitycontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaAvailabilityControl, QMediaAvailabilityControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp index 647ba0ce1..0f41daaf6 100644 --- a/src/multimedia/controls/qmediacontainercontrol.cpp +++ b/src/multimedia/controls/qmediacontainercontrol.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE The functionality provided by this control is exposed to application code through the QMediaRecorder class. - The interface name of QMediaContainerControl is \c com.nokia.Qt.QMediaContainerControl/1.0 as + The interface name of QMediaContainerControl is \c org.qt-project.qt.mediacontainercontrol/5.0 as defined in QMediaContainerControl_iid. \sa QMediaService::requestControl(), QMediaRecorder @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE /*! \macro QMediaContainerControl_iid - \c com.nokia.Qt.QMediaContainerControl/1.0 + \c org.qt-project.qt.mediacontainercontrol/5.0 Defines the interface name of the QMediaContainerControl class. diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h index 85582d521..16a9fba6e 100644 --- a/src/multimedia/controls/qmediacontainercontrol.h +++ b/src/multimedia/controls/qmediacontainercontrol.h @@ -69,7 +69,7 @@ protected: QMediaContainerControl(QObject *parent = 0); }; -#define QMediaContainerControl_iid "com.nokia.Qt.QMediaContainerControl/1.0" +#define QMediaContainerControl_iid "org.qt-project.qt.mediacontainercontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaContainerControl, QMediaContainerControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp index 2c4b0b068..0b8be4cbf 100644 --- a/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp +++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp @@ -60,7 +60,7 @@ code through the QMediaPlayer class. The interface name of QMediaGaplessPlaybackControl is - \c com.nokia.Qt.QMediaGaplessPlaybackControl/1.0 as defined in QMediaGaplessPlaybackControl_iid. + \c org.qt-project.qt.mediagaplessplaybackcontrol/5.0 as defined in QMediaGaplessPlaybackControl_iid. \sa QMediaService::requestControl(), QMediaPlayer */ @@ -68,7 +68,7 @@ /*! \macro QMediaGaplessPlaybackControl_iid - \c com.nokia.Qt.QMediaGaplessPlaybackControl/1.0 + \c org.qt-project.qt.mediagaplessplaybackcontrol/5.0 Defines the interface name of the QMediaGaplessPlaybackControl class. diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.h b/src/multimedia/controls/qmediagaplessplaybackcontrol.h index 735a887cc..63fc98e62 100644 --- a/src/multimedia/controls/qmediagaplessplaybackcontrol.h +++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.h @@ -72,7 +72,7 @@ protected: QMediaGaplessPlaybackControl(QObject* parent = 0); }; -#define QMediaGaplessPlaybackControl_iid "com.nokia.Qt.QMediaGaplessPlaybackControl/1.0" +#define QMediaGaplessPlaybackControl_iid "org.qt-project.qt.mediagaplessplaybackcontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaGaplessPlaybackControl, QMediaGaplessPlaybackControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h index 2c568f84a..ad558035f 100644 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.h +++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h @@ -72,7 +72,7 @@ protected: QMediaNetworkAccessControl(QObject *parent = 0); }; -#define QMediaNetworkAccessControl_iid "com.nokia.Qt.QMediaNetworkAccessControl/1.0" +#define QMediaNetworkAccessControl_iid "org.qt-project.qt.medianetworkaccesscontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaNetworkAccessControl, QMediaNetworkAccessControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp index edf597191..f8d172a43 100644 --- a/src/multimedia/controls/qmediaplayercontrol.cpp +++ b/src/multimedia/controls/qmediaplayercontrol.cpp @@ -68,7 +68,7 @@ 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 com.nokia.Qt.QMediaPlayerControl/1.0 as + The interface name of QMediaPlayerControl is \c org.qt-project.qt.mediaplayercontrol/5.0 as defined in QMediaPlayerControl_iid. \sa QMediaService::requestControl(), QMediaPlayer @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE /*! \macro QMediaPlayerControl_iid - \c com.nokia.Qt.QMediaPlayerControl/1.0 + \c org.qt-project.qt.mediaplayercontrol/5.0 Defines the interface name of the QMediaPlayerControl class. diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h index 271241573..b4ec3334b 100644 --- a/src/multimedia/controls/qmediaplayercontrol.h +++ b/src/multimedia/controls/qmediaplayercontrol.h @@ -119,7 +119,7 @@ protected: QMediaPlayerControl(QObject* parent = 0); }; -#define QMediaPlayerControl_iid "com.nokia.Qt.QMediaPlayerControl/1.0" +#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/qmediaplaylistcontrol.cpp b/src/multimedia/controls/qmediaplaylistcontrol.cpp index c33485512..9b0e06206 100644 --- a/src/multimedia/controls/qmediaplaylistcontrol.cpp +++ b/src/multimedia/controls/qmediaplaylistcontrol.cpp @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE The functionality provided by the control is exposed to application code through the QMediaPlaylist class. - The interface name of QMediaPlaylistControl is \c com.nokia.Qt.QMediaPlaylistControl/1.0 as + The interface name of QMediaPlaylistControl is \c org.qt-project.qt.mediaplaylistcontrol/5.0 as defined in QMediaPlaylistControl_iid. \sa QMediaService::requestControl(), QMediaPlayer @@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE /*! \macro QMediaPlaylistControl_iid - \c com.nokia.Qt.QMediaPlaylistControl/1.0 + \c org.qt-project.qt.mediaplaylistcontrol/5.0 Defines the interface name of the QMediaPlaylistControl class. diff --git a/src/multimedia/controls/qmediaplaylistcontrol_p.h b/src/multimedia/controls/qmediaplaylistcontrol_p.h index ac2b57f17..0ddb83210 100644 --- a/src/multimedia/controls/qmediaplaylistcontrol_p.h +++ b/src/multimedia/controls/qmediaplaylistcontrol_p.h @@ -99,7 +99,7 @@ protected: QMediaPlaylistControl(QObject* parent = 0); }; -#define QMediaPlaylistControl_iid "com.nokia.Qt.QMediaPlaylistControl/1.0" +#define QMediaPlaylistControl_iid "org.qt-project.qt.mediaplaylistcontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistControl, QMediaPlaylistControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp index e9e815646..a5016df9c 100644 --- a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp +++ b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE advance the playlist with QMediaPlaylist::next() when playback of the current media is finished. - The interface name of QMediaPlaylistSourceControl is \c com.nokia.Qt.QMediaPlaylistSourceControl/1.0 as + The interface name of QMediaPlaylistSourceControl is \c org.qt-project.qt.mediaplaylistsourcecontrol/5.0 as defined in QMediaPlaylistSourceControl_iid. \sa QMediaService::requestControl(), QMediaPlayer @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE /*! \macro QMediaPlaylistSourceControl_iid - \c com.nokia.Qt.QMediaPlaylistSourceControl/1.0 + \c org.qt-project.qt.mediaplaylistsourcecontrol/5.0 Defines the interface name of the QMediaPlaylistSourceControl class. diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h index be7d8a234..13de986d0 100644 --- a/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h +++ b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h @@ -82,7 +82,7 @@ protected: QMediaPlaylistSourceControl(QObject* parent = 0); }; -#define QMediaPlaylistSourceControl_iid "com.nokia.Qt.QMediaPlaylistSourceControl/1.0" +#define QMediaPlaylistSourceControl_iid "org.qt-project.qt.mediaplaylistsourcecontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistSourceControl, QMediaPlaylistSourceControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp index 6caefd9bb..e952c7dcb 100644 --- a/src/multimedia/controls/qmediarecordercontrol.cpp +++ b/src/multimedia/controls/qmediarecordercontrol.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE The functionality provided by this control is exposed to application code through the QMediaRecorder class. - The interface name of QMediaRecorderControl is \c com.nokia.Qt.QMediaRecorderControl/1.0 as + The interface name of QMediaRecorderControl is \c org.qt-project.qt.mediarecordercontrol/5.0 as defined in QMediaRecorderControl_iid. \sa QMediaService::requestControl(), QMediaRecorder @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE /*! \macro QMediaRecorderControl_iid - \c com.nokia.Qt.QMediaRecorderControl/1.0 + \c org.qt-project.qt.mediarecordercontrol/5.0 Defines the interface name of the QMediaRecorderControl class. diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h index 73e5430df..d8e7ea5b1 100644 --- a/src/multimedia/controls/qmediarecordercontrol.h +++ b/src/multimedia/controls/qmediarecordercontrol.h @@ -91,7 +91,7 @@ protected: QMediaRecorderControl(QObject* parent = 0); }; -#define QMediaRecorderControl_iid "com.nokia.Qt.QMediaRecorderControl/1.0" +#define QMediaRecorderControl_iid "org.qt-project.qt.mediarecordercontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp index 6faad2f0e..ba06b011d 100644 --- a/src/multimedia/controls/qmediastreamscontrol.cpp +++ b/src/multimedia/controls/qmediastreamscontrol.cpp @@ -69,7 +69,7 @@ namespace 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 com.nokia.Qt.MediaStreamsControl as + The interface name of QMediaStreamsControl is \c org.qt-project.qt.mediastreamscontrol/5.0 as defined in QMediaStreamsControl_iid. \sa QMediaService::requestControl() @@ -78,7 +78,7 @@ namespace /*! \macro QMediaStreamsControl_iid - \c com.nokia.Qt.MediaStreamsControl + \c org.qt-project.qt.mediastreamscontrol/5.0 Defines the interface name of the QMediaStreamsControl class. diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index ad676dcae..e429f4ca2 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -80,7 +80,7 @@ protected: QMediaStreamsControl(QObject *parent = 0); }; -#define QMediaStreamsControl_iid "com.nokia.Qt.QMediaStreamsControl/1.0" +#define QMediaStreamsControl_iid "org.qt-project.qt.mediastreamscontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaStreamsControl, QMediaStreamsControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmediavideoprobecontrol.cpp b/src/multimedia/controls/qmediavideoprobecontrol.cpp index 9a723c0a9..0193896cc 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.cpp +++ b/src/multimedia/controls/qmediavideoprobecontrol.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE \l QVideoProbe is the client facing class for probing video - this class is implemented by media backends to provide this functionality. - The interface name of QMediaVideoProbeControl is \c com.nokia.Qt.QMediaVideoProbeControl/1.0 as + The interface name of QMediaVideoProbeControl is \c org.qt-project.qt.mediavideoprobecontrol/5.0 as defined in QMediaVideoProbeControl_iid. \sa QVideoProbe, QMediaService::requestControl(), QMediaPlayer, QCamera @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE /*! \macro QMediaVideoProbeControl_iid - \c com.nokia.Qt.QMediaVideoProbeControl/1.0 + \c org.qt-project.qt.mediavideoprobecontrol/5.0 Defines the interface name of the QMediaVideoProbeControl class. diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h index d2031ca4e..ee7667e22 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.h +++ b/src/multimedia/controls/qmediavideoprobecontrol.h @@ -67,7 +67,7 @@ protected: explicit QMediaVideoProbeControl(QObject *parent = 0); }; -#define QMediaVideoProbeControl_iid "com.nokia.Qt.QMediaVideoProbeControl/1.0" +#define QMediaVideoProbeControl_iid "org.qt-project.qt.mediavideoprobecontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMediaVideoProbeControl, QMediaVideoProbeControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index a173a933f..01ba89ec6 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE service may implement QMetaDataReaderControl. The interface name of QMetaDataReaderControl is - \c com.nokia.Qt.QMetaDataReaderControl/1.0 as defined in + \c org.qt-project.qt.metadatareadercontrol/5.0 as defined in QMetaDataReaderControl_iid. \sa QMediaService::requestControl(), QMediaObject @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE /*! \macro QMetaDataReaderControl_iid - \c com.nokia.Qt.QMetaDataReaderControl/1.0 + \c org.qt-project.qt.metadatareadercontrol/5.0 Defines the interface name of the QMetaDataReaderControl class. diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index 331bd90a6..b40c06d1c 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -79,7 +79,7 @@ protected: QMetaDataReaderControl(QObject *parent = 0); }; -#define QMetaDataReaderControl_iid "com.nokia.Qt.QMetaDataReaderControl/1.0" +#define QMetaDataReaderControl_iid "org.qt-project.qt.metadatareadercontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMetaDataReaderControl, QMetaDataReaderControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp index 06439626f..1fa13f743 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ b/src/multimedia/controls/qmetadatawritercontrol.cpp @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE potentially available in any of the media object classes. Any media service may implement QMetaDataControl. - The interface name of QMetaDataWriterControl is \c com.nokia.Qt.QMetaDataWriterControl/1.0 as + The interface name of QMetaDataWriterControl is \c org.qt-project.qt.metadatawritercontrol/5.0 as defined in QMetaDataWriterControl_iid. \sa QMediaService::requestControl(), QMediaObject @@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE /*! \macro QMetaDataWriterControl_iid - \c com.nokia.Qt.QMetaDataWriterControl/1.0 + \c org.qt-project.qt.metadatawritercontrol/5.0 Defines the interface name of the QMetaDataWriterControl class. diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index fe451d52b..8d09df7c8 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -82,7 +82,7 @@ protected: QMetaDataWriterControl(QObject *parent = 0); }; -#define QMetaDataWriterControl_iid "com.nokia.Qt.QMetaDataWriterControl/1.0" +#define QMetaDataWriterControl_iid "org.qt-project.qt.metadatawritercontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QMetaDataWriterControl, QMetaDataWriterControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qradiodatacontrol.cpp b/src/multimedia/controls/qradiodatacontrol.cpp index 19656f6ec..778c532b0 100644 --- a/src/multimedia/controls/qradiodatacontrol.cpp +++ b/src/multimedia/controls/qradiodatacontrol.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE The functionality provided by this control is exposed to application code through the QRadioData class. - The interface name of QRadioDataControl is \c com.nokia.Qt.QRadioDataControl/5.0 as + The interface name of QRadioDataControl is \c org.qt-project.qt.radiodatacontrol/5.0 as defined in QRadioDataControl_iid. \sa QMediaService::requestControl(), QRadioData @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE /*! \macro QRadioDataControl_iid - \c com.nokia.Qt.QRadioDataControl/5.0 + \c org.qt-project.qt.radiodatacontrol/5.0 Defines the interface name of the QRadioDataControl class. diff --git a/src/multimedia/controls/qradiodatacontrol.h b/src/multimedia/controls/qradiodatacontrol.h index 11723f8c8..3dd65f539 100644 --- a/src/multimedia/controls/qradiodatacontrol.h +++ b/src/multimedia/controls/qradiodatacontrol.h @@ -83,7 +83,7 @@ protected: QRadioDataControl(QObject *parent = 0); }; -#define QRadioDataControl_iid "com.nokia.Qt.QRadioDataControl/5.0" +#define QRadioDataControl_iid "org.qt-project.qt.radiodatacontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QRadioDataControl, QRadioDataControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qradiotunercontrol.cpp b/src/multimedia/controls/qradiotunercontrol.cpp index c0f3cc146..ca47ca663 100644 --- a/src/multimedia/controls/qradiotunercontrol.cpp +++ b/src/multimedia/controls/qradiotunercontrol.cpp @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE The functionality provided by this control is exposed to application code through the QRadioTuner class. - The interface name of QRadioTunerControl is \c com.nokia.Qt.QRadioTunerControl/1.0 as + The interface name of QRadioTunerControl is \c org.qt-project.qt.radiotunercontrol/5.0 as defined in QRadioTunerControl_iid. \sa QMediaService::requestControl(), QRadioTuner @@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE /*! \macro QRadioTunerControl_iid - \c com.nokia.Qt.QRadioTunerControl/1.0 + \c org.qt-project.qt.radiotunercontrol/5.0 Defines the interface name of the QRadioTunerControl class. diff --git a/src/multimedia/controls/qradiotunercontrol.h b/src/multimedia/controls/qradiotunercontrol.h index 2e64fbfaa..a33dcabf9 100644 --- a/src/multimedia/controls/qradiotunercontrol.h +++ b/src/multimedia/controls/qradiotunercontrol.h @@ -114,7 +114,7 @@ protected: QRadioTunerControl(QObject *parent = 0); }; -#define QRadioTunerControl_iid "com.nokia.Qt.QRadioTunerControl/1.0" +#define QRadioTunerControl_iid "org.qt-project.qt.radiotunercontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QRadioTunerControl, QRadioTunerControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qvideodevicecontrol.cpp b/src/multimedia/controls/qvideodevicecontrol.cpp index 028a28087..f9fa0e9ec 100644 --- a/src/multimedia/controls/qvideodevicecontrol.cpp +++ b/src/multimedia/controls/qvideodevicecontrol.cpp @@ -56,14 +56,14 @@ QT_BEGIN_NAMESPACE available on a system and allows one to be selected as the endpoint of a media service. - The interface name of QVideoDeviceControl is \c com.nokia.Qt.VideoDeviceControl as + The interface name of QVideoDeviceControl is \c org.qt-project.qt.videodevicecontrol/5.0 as defined in QVideoDeviceControl_iid. */ /*! \macro QVideoDeviceControl_iid - \c com.nokia.Qt.VideoDeviceControl + \c org.qt-project.qt.videodevicecontrol/5.0 Defines the interface name of the QVideoDeviceControl class. diff --git a/src/multimedia/controls/qvideodevicecontrol.h b/src/multimedia/controls/qvideodevicecontrol.h index 9394ea840..3197ce454 100644 --- a/src/multimedia/controls/qvideodevicecontrol.h +++ b/src/multimedia/controls/qvideodevicecontrol.h @@ -77,7 +77,7 @@ protected: QVideoDeviceControl(QObject *parent = 0); }; -#define QVideoDeviceControl_iid "com.nokia.Qt.QVideoDeviceControl/1.0" +#define QVideoDeviceControl_iid "org.qt-project.qt.videodevicecontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QVideoDeviceControl, QVideoDeviceControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qvideoencodercontrol.cpp b/src/multimedia/controls/qvideoencodercontrol.cpp index 244f27fad..a5a6af71f 100644 --- a/src/multimedia/controls/qvideoencodercontrol.cpp +++ b/src/multimedia/controls/qvideoencodercontrol.cpp @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE The functionality provided by this control is exposed to application code through the QMediaRecorder class. - The interface name of QVideoEncoderControl is \c com.nokia.Qt.QVideoEncoderControl/1.0 as + The interface name of QVideoEncoderControl is \c org.qt-project.qt.videoencodercontrol/5.0 as defined in QVideoEncoderControl_iid. \sa QMediaRecorder, QVideoEncoderSettings, QMediaService::requestControl() @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE /*! \macro QVideoEncoderControl_iid - \c com.nokia.Qt.QVideoEncoderControl/1.0 + \c org.qt-project.qt.videoencodercontrol/5.0 Defines the interface name of the QVideoEncoderControl class. diff --git a/src/multimedia/controls/qvideoencodercontrol.h b/src/multimedia/controls/qvideoencodercontrol.h index 0a86e41a0..ea3c49f91 100644 --- a/src/multimedia/controls/qvideoencodercontrol.h +++ b/src/multimedia/controls/qvideoencodercontrol.h @@ -87,7 +87,7 @@ protected: QVideoEncoderControl(QObject *parent = 0); }; -#define QVideoEncoderControl_iid "com.nokia.Qt.QVideoEncoderControl/1.0" +#define QVideoEncoderControl_iid "org.qt-project.qt.videoencodercontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QVideoEncoderControl, QVideoEncoderControl_iid) QT_END_NAMESPACE diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp index e217765cb..4ee4a51fd 100644 --- a/src/multimedia/controls/qvideorenderercontrol.cpp +++ b/src/multimedia/controls/qvideorenderercontrol.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE QVideoRendererControl is one of a number of possible video output controls. - The interface name of QVideoRendererControl is \c com.nokia.Qt.QVideoRendererControl/1.0 as + The interface name of QVideoRendererControl is \c org.qt-project.qt.videorenderercontrol/5.0 as defined in QVideoRendererControl_iid. \sa QMediaService::requestControl(), QVideoWidget @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE /*! \macro QVideoRendererControl_iid - \c com.nokia.Qt.QVideoRendererControl/1.0 + \c org.qt-project.qt.videorenderercontrol/5.0 Defines the interface name of the QVideoRendererControl class. diff --git a/src/multimedia/controls/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h index 5b983acdc..c93117d6c 100644 --- a/src/multimedia/controls/qvideorenderercontrol.h +++ b/src/multimedia/controls/qvideorenderercontrol.h @@ -70,7 +70,7 @@ protected: QVideoRendererControl(QObject *parent = 0); }; -#define QVideoRendererControl_iid "com.nokia.Qt.QVideoRendererControl/1.0" +#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/gsttools_headers/qgstbufferpoolinterface_p.h b/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h index 7bb906aa5..42c4fb55c 100644 --- a/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h +++ b/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h @@ -89,7 +89,7 @@ public: virtual QAbstractVideoBuffer *prepareVideoBuffer(GstBuffer *buffer, int bytesPerLine) = 0; }; -#define QGstBufferPoolInterface_iid "com.nokia.Qt.QGstBufferPoolInterface" +#define QGstBufferPoolInterface_iid "org.qt-project.qt.gstbufferpool/5.0" Q_DECLARE_INTERFACE(QGstBufferPoolInterface, QGstBufferPoolInterface_iid) class QGstBufferPoolPlugin : public QObject, public QGstBufferPoolInterface diff --git a/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h b/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h index a4f565c13..145a26f68 100644 --- a/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h +++ b/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h @@ -65,7 +65,7 @@ public: //returns true if message was processed and should be dropped, false otherwise virtual bool processSyncMessage(const QGstreamerMessage &message) = 0; }; -#define QGstreamerSyncMessageFilter_iid "com.nokia.Qt.QGstreamerSyncMessageFilter/1.0" +#define QGstreamerSyncMessageFilter_iid "org.qt-project.qt.gstreamersyncmessagefilter/5.0" Q_DECLARE_INTERFACE(QGstreamerSyncMessageFilter, QGstreamerSyncMessageFilter_iid) @@ -74,7 +74,7 @@ public: //returns true if message was processed and should be dropped, false otherwise virtual bool processBusMessage(const QGstreamerMessage &message) = 0; }; -#define QGstreamerBusMessageFilter_iid "com.nokia.Qt.QGstreamerBusMessageFilter/1.0" +#define QGstreamerBusMessageFilter_iid "org.qt-project.qt.gstreamerbusmessagefilter/5.0" Q_DECLARE_INTERFACE(QGstreamerBusMessageFilter, QGstreamerBusMessageFilter_iid) diff --git a/src/multimedia/playback/qaudioendpointselector.cpp b/src/multimedia/playback/qaudioendpointselector.cpp index f66cb5bd8..21104ec6c 100644 --- a/src/multimedia/playback/qaudioendpointselector.cpp +++ b/src/multimedia/playback/qaudioendpointselector.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE endpoints available on a system and allows one to be selected as the audio of a media service. - The interface name of QAudioEndpointSelector is \c com.nokia.Qt.QAudioEndpointSelector/1.0 as + The interface name of QAudioEndpointSelector is \c org.qt-project.qt.audioendpointselector/5.0 as defined in QAudioEndpointSelector_iid. \sa QMediaService::requestControl() @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE /*! \macro QAudioEndpointSelector_iid - \c com.nokia.Qt.QAudioEndpointSelector/1.0 + \c org.qt-project.qt.audioendpointselector/5.0 Defines the interface name of the QAudioEndpointSelector class. diff --git a/src/multimedia/playback/qaudioendpointselector.h b/src/multimedia/playback/qaudioendpointselector.h index df0779875..85e1ae651 100644 --- a/src/multimedia/playback/qaudioendpointselector.h +++ b/src/multimedia/playback/qaudioendpointselector.h @@ -75,7 +75,7 @@ protected: QAudioEndpointSelector(QObject *parent = 0); }; -#define QAudioEndpointSelector_iid "com.nokia.Qt.QAudioEndpointSelector/1.0" +#define QAudioEndpointSelector_iid "org.qt-project.qt.audioendpointselector/5.0" Q_MEDIA_DECLARE_CONTROL(QAudioEndpointSelector, QAudioEndpointSelector_iid) QT_END_NAMESPACE diff --git a/src/multimedia/playback/qmediaplaylistioplugin_p.h b/src/multimedia/playback/qmediaplaylistioplugin_p.h index 5371a9392..197959238 100644 --- a/src/multimedia/playback/qmediaplaylistioplugin_p.h +++ b/src/multimedia/playback/qmediaplaylistioplugin_p.h @@ -104,7 +104,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaPlaylistIOInterface virtual QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) = 0; }; -#define QMediaPlaylistIOInterface_iid "com.nokia.Qt.QMediaPlaylistIOInterface" +#define QMediaPlaylistIOInterface_iid "org.qt-project.qt.mediaplaylistio/5.0" Q_DECLARE_INTERFACE(QMediaPlaylistIOInterface, QMediaPlaylistIOInterface_iid); class Q_MULTIMEDIA_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMediaPlaylistIOInterface diff --git a/src/multimedia/qmediabindableinterface.h b/src/multimedia/qmediabindableinterface.h index e9a131cb8..d1d569610 100644 --- a/src/multimedia/qmediabindableinterface.h +++ b/src/multimedia/qmediabindableinterface.h @@ -66,7 +66,7 @@ protected: }; #define QMediaBindableInterface_iid \ - "com.nokia.Qt.QMediaBindableInterface/1.0" + "org.qt-project.qt.mediabindable/5.0" Q_DECLARE_INTERFACE(QMediaBindableInterface, QMediaBindableInterface_iid) QT_END_NAMESPACE diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index 0d98a28e9..346a4438c 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -112,7 +112,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface }; #define QMediaServiceProviderFactoryInterface_iid \ - "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" + "org.qt-project.qt.mediaserviceproviderfactory/5.0" Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProviderFactoryInterface_iid) @@ -124,7 +124,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface }; #define QMediaServiceSupportedFormatsInterface_iid \ - "com.nokia.Qt.QMediaServiceSupportedFormatsInterface/1.0" + "org.qt-project.qt.mediaservicesupportedformats/5.0" Q_DECLARE_INTERFACE(QMediaServiceSupportedFormatsInterface, QMediaServiceSupportedFormatsInterface_iid) @@ -136,7 +136,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedDevicesInterface }; #define QMediaServiceSupportedDevicesInterface_iid \ - "com.nokia.Qt.QMediaServiceSupportedDevicesInterface/1.0" + "org.qt-project.qt.mediaservicesupporteddevices/5.0" Q_DECLARE_INTERFACE(QMediaServiceSupportedDevicesInterface, QMediaServiceSupportedDevicesInterface_iid) @@ -149,7 +149,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceFeaturesInterface #define QMediaServiceFeaturesInterface_iid \ - "com.nokia.Qt.QMediaServiceFeaturesInterface/1.0" + "org.qt-project.qt.mediaservicefeatures/5.0" Q_DECLARE_INTERFACE(QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid) @@ -171,7 +171,7 @@ public: Required: QVideoOutputControl Optional: QVideoWindowControl, QVideoRendererControl, QVideoWidgetControl */ -#define Q_MEDIASERVICE_MEDIAPLAYER "com.nokia.qt.mediaplayer" +#define Q_MEDIASERVICE_MEDIAPLAYER "org.qt-project.qt.mediaplayer" /*! Service with support for recording from audio sources @@ -181,7 +181,7 @@ public: Recommended: QAudioEncoderControl Optional: QMediaContainerControl */ -#define Q_MEDIASERVICE_AUDIOSOURCE "com.nokia.qt.audiosource" +#define Q_MEDIASERVICE_AUDIOSOURCE "org.qt-project.qt.audiosource" /*! Service with support for camera use. @@ -195,7 +195,7 @@ public: Required: QVideoOutputControl Optional: QVideoWindowControl, QVideoRendererControl, QVideoWidgetControl */ -#define Q_MEDIASERVICE_CAMERA "com.nokia.qt.camera" +#define Q_MEDIASERVICE_CAMERA "org.qt-project.qt.camera" /*! Service with support for radio tuning. @@ -205,14 +205,14 @@ public: Recommended: QAudioEncoderControl Optional: QMediaContainerControl */ -#define Q_MEDIASERVICE_RADIO "com.nokia.qt.radio" +#define Q_MEDIASERVICE_RADIO "org.qt-project.qt.radio" /*! Service with support for decoding audio. Required Controls: QAudioDecoderControl Optional: that streams control */ -#define Q_MEDIASERVICE_AUDIODECODER "com.nokia.qt.audiodecode" +#define Q_MEDIASERVICE_AUDIODECODER "org.qt-project.qt.audiodecode" diff --git a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h index 6bdfc2b91..87f15b252 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h @@ -80,7 +80,7 @@ public: virtual QSGVideoNode *createNode(const QVideoSurfaceFormat &format) = 0; }; -#define QSGVideoNodeFactoryInterface_iid "com.nokia.Qt.QSGVideoNodeFactoryInterface" +#define QSGVideoNodeFactoryInterface_iid "org.qt-project.qt.sgvideonodefactory/5.0" Q_DECLARE_INTERFACE(QSGVideoNodeFactoryInterface, QSGVideoNodeFactoryInterface_iid) class QSGVideoNodeFactoryPlugin : public QObject, public QSGVideoNodeFactoryInterface diff --git a/src/multimediawidgets/qvideowidgetcontrol.cpp b/src/multimediawidgets/qvideowidgetcontrol.cpp index 0b98b8695..9c68c945e 100644 --- a/src/multimediawidgets/qvideowidgetcontrol.cpp +++ b/src/multimediawidgets/qvideowidgetcontrol.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE QVideoWidgetControl is one of number of possible video output controls. - The interface name of QVideoWidgetControl is \c com.nokia.Qt.QVideoWidgetControl/1.0 as + The interface name of QVideoWidgetControl is \c org.qt-project.qt.videowidgetcontrol/5.0 as defined in QVideoWidgetControl_iid. \sa QMediaService::requestControl(), QVideoWidget @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE /*! \macro QVideoWidgetControl_iid - \c com.nokia.Qt.QVideoWidgetControl/1.0 + \c org.qt-project.qt.videowidgetcontrol/5.0 Defines the interface name of the QVideoWidgetControl class. diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h index da47c3c7b..eb1fdbc17 100644 --- a/src/multimediawidgets/qvideowidgetcontrol.h +++ b/src/multimediawidgets/qvideowidgetcontrol.h @@ -94,7 +94,7 @@ protected: QVideoWidgetControl(QObject *parent = 0); }; -#define QVideoWidgetControl_iid "com.nokia.Qt.QVideoWidgetControl/1.0" +#define QVideoWidgetControl_iid "org.qt-project.qt.videowidgetcontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QVideoWidgetControl, QVideoWidgetControl_iid) QT_END_NAMESPACE diff --git a/src/multimediawidgets/qvideowindowcontrol.cpp b/src/multimediawidgets/qvideowindowcontrol.cpp index 3c56096cd..a4ed8eca3 100644 --- a/src/multimediawidgets/qvideowindowcontrol.cpp +++ b/src/multimediawidgets/qvideowindowcontrol.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE QVideoWindowControl is one of a number of possible video output controls. - The interface name of QVideoWindowControl is \c com.nokia.Qt.QVideoWindowControl/1.0 as + The interface name of QVideoWindowControl is \c org.qt-project.qt.videowindowcontrol/5.0 as defined in QVideoWindowControl_iid. \sa QMediaService::requestControl(), QVideoWidget @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE /*! \macro QVideoWindowControl_iid - \c com.nokia.Qt.QVideoWindowControl/1.0 + \c org.qt-project.qt.videowindowcontrol/5.0 Defines the interface name of the QVideoWindowControl class. diff --git a/src/multimediawidgets/qvideowindowcontrol.h b/src/multimediawidgets/qvideowindowcontrol.h index e895f0bf7..97c41a128 100644 --- a/src/multimediawidgets/qvideowindowcontrol.h +++ b/src/multimediawidgets/qvideowindowcontrol.h @@ -101,7 +101,7 @@ protected: QVideoWindowControl(QObject *parent = 0); }; -#define QVideoWindowControl_iid "com.nokia.Qt.QVideoWindowControl/1.0" +#define QVideoWindowControl_iid "org.qt-project.qt.videowindowcontrol/5.0" Q_MEDIA_DECLARE_CONTROL(QVideoWindowControl, QVideoWindowControl_iid) QT_END_NAMESPACE diff --git a/src/plugins/audiocapture/audiocapture.json b/src/plugins/audiocapture/audiocapture.json index 09a8897b1..d963a2e3e 100644 --- a/src/plugins/audiocapture/audiocapture.json +++ b/src/plugins/audiocapture/audiocapture.json @@ -1,3 +1,3 @@ { - "Keys": ["com.nokia.qt.audiosource"] + "Keys": ["org.qt-project.qt.audiosource"] } diff --git a/src/plugins/audiocapture/audiocaptureserviceplugin.h b/src/plugins/audiocapture/audiocaptureserviceplugin.h index dff93ca84..755d407f7 100644 --- a/src/plugins/audiocapture/audiocaptureserviceplugin.h +++ b/src/plugins/audiocapture/audiocaptureserviceplugin.h @@ -51,7 +51,7 @@ class AudioCaptureServicePlugin : public QMediaServiceProviderPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "audiocapture.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "audiocapture.json") public: QMediaService* create(QString const& key); diff --git a/src/plugins/directshow/directshow.json b/src/plugins/directshow/directshow.json index a96b09827..54c1c9f04 100644 --- a/src/plugins/directshow/directshow.json +++ b/src/plugins/directshow/directshow.json @@ -1,3 +1,3 @@ { - "Keys": ["com.nokia.qt.camera", "com.nokia.qt.mediaplayer"] + "Keys": ["org.qt-project.qt.camera", "org.qt-project.qt.mediaplayer"] } diff --git a/src/plugins/directshow/dsserviceplugin.h b/src/plugins/directshow/dsserviceplugin.h index 2c0b12619..adf91daed 100644 --- a/src/plugins/directshow/dsserviceplugin.h +++ b/src/plugins/directshow/dsserviceplugin.h @@ -54,7 +54,7 @@ class DSServicePlugin Q_OBJECT Q_INTERFACES(QMediaServiceSupportedDevicesInterface) Q_INTERFACES(QMediaServiceFeaturesInterface) - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0", FILE "directshow.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0", FILE "directshow.json") public: QMediaService* create(QString const& key); diff --git a/src/plugins/gstreamer/gstreamer.json b/src/plugins/gstreamer/gstreamer.json index 42d67a02f..3f6ccdafd 100644 --- a/src/plugins/gstreamer/gstreamer.json +++ b/src/plugins/gstreamer/gstreamer.json @@ -1,3 +1,3 @@ { - "Keys": ["com.nokia.qt.mediaplayer", "com.nokia.qt.audiosource", "com.nokia.qt.camera", "com.nokia.qt.audiodecode"] + "Keys": ["org.qt-project.qt.mediaplayer", "org.qt-project.qt.audiosource", "org.qt-project.qt.camera", "org.qt-project.qt.audiodecode"] } diff --git a/src/plugins/gstreamer/qgstreamerserviceplugin.h b/src/plugins/gstreamer/qgstreamerserviceplugin.h index 7695179af..96239a6da 100644 --- a/src/plugins/gstreamer/qgstreamerserviceplugin.h +++ b/src/plugins/gstreamer/qgstreamerserviceplugin.h @@ -60,7 +60,7 @@ class QGstreamerServicePlugin Q_INTERFACES(QMediaServiceSupportedDevicesInterface) Q_INTERFACES(QMediaServiceFeaturesInterface) Q_INTERFACES(QMediaServiceSupportedFormatsInterface) - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "gstreamer.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "gstreamer.json") public: QMediaService* create(QString const& key); void release(QMediaService *service); diff --git a/src/plugins/gstreamer/qgstreamervideorendererinterface.h b/src/plugins/gstreamer/qgstreamervideorendererinterface.h index 4b549053e..42f6d5d5a 100644 --- a/src/plugins/gstreamer/qgstreamervideorendererinterface.h +++ b/src/plugins/gstreamer/qgstreamervideorendererinterface.h @@ -68,7 +68,7 @@ public: //void readyChanged(bool); }; -#define QGstreamerVideoRendererInterface_iid "com.nokia.Qt.QGstreamerVideoRendererInterface/1.0" +#define QGstreamerVideoRendererInterface_iid "org.qt-project.qt.gstreamervideorenderer/5.0" Q_DECLARE_INTERFACE(QGstreamerVideoRendererInterface, QGstreamerVideoRendererInterface_iid) QT_END_NAMESPACE diff --git a/src/plugins/m3u/qm3uhandler.h b/src/plugins/m3u/qm3uhandler.h index b0dd29230..51b9757ba 100644 --- a/src/plugins/m3u/qm3uhandler.h +++ b/src/plugins/m3u/qm3uhandler.h @@ -50,7 +50,7 @@ QT_USE_NAMESPACE class QM3uPlaylistPlugin : public QMediaPlaylistIOPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaPlaylistIOInterface" FILE "m3u.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaplaylistio/5.0" FILE "m3u.json") public: explicit QM3uPlaylistPlugin(QObject *parent = 0); diff --git a/src/plugins/pulseaudio/qpulseaudioplugin.h b/src/plugins/pulseaudio/qpulseaudioplugin.h index 1540f7278..3c460e9d5 100644 --- a/src/plugins/pulseaudio/qpulseaudioplugin.h +++ b/src/plugins/pulseaudio/qpulseaudioplugin.h @@ -52,7 +52,7 @@ class QPulseAudioPlugin : public QAudioSystemPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.qt.QAudioSystemFactoryInterface" FILE "pulseaudio.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.audiosystemfactory/5.0" FILE "pulseaudio.json") public: QPulseAudioPlugin(QObject *parent = 0); diff --git a/src/plugins/qt7/qt7.json b/src/plugins/qt7/qt7.json index 6758633a6..c4a27ea01 100644 --- a/src/plugins/qt7/qt7.json +++ b/src/plugins/qt7/qt7.json @@ -1,3 +1,3 @@ { - "Keys": ["com.nokia.qt.mediaplayer"] + "Keys": ["org.qt-project.qt.mediaplayer"] } diff --git a/src/plugins/qt7/qt7serviceplugin.h b/src/plugins/qt7/qt7serviceplugin.h index ef8bed151..90d33245a 100644 --- a/src/plugins/qt7/qt7serviceplugin.h +++ b/src/plugins/qt7/qt7serviceplugin.h @@ -54,7 +54,7 @@ class QT7ServicePlugin { Q_OBJECT Q_INTERFACES(QMediaServiceFeaturesInterface) - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "qt7.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "qt7.json") public: QT7ServicePlugin(); diff --git a/src/plugins/qt7/qt7videooutput.h b/src/plugins/qt7/qt7videooutput.h index 86c9736d2..242b2e425 100644 --- a/src/plugins/qt7/qt7videooutput.h +++ b/src/plugins/qt7/qt7videooutput.h @@ -66,7 +66,7 @@ public: }; #define QT7VideoOutput_iid \ - "com.nokia.Qt.QT7VideoOutput/1.0" + "org.qt-project.qt.QT7VideoOutput/5.0" Q_DECLARE_INTERFACE(QT7VideoOutput, QT7VideoOutput_iid) class QT7VideoWindowControl : public QVideoWindowControl, public QT7VideoOutput -- cgit v1.2.3