diff options
Diffstat (limited to 'src/multimedia')
26 files changed, 41 insertions, 41 deletions
diff --git a/src/multimedia/mediaservices/base/qgraphicsvideoitem.h b/src/multimedia/mediaservices/base/qgraphicsvideoitem.h index 5a2d2a8..db5babd 100644 --- a/src/multimedia/mediaservices/base/qgraphicsvideoitem.h +++ b/src/multimedia/mediaservices/base/qgraphicsvideoitem.h @@ -56,7 +56,7 @@ QT_MODULE(Multimedia) class QVideoSurfaceFormat; class QGraphicsVideoItemPrivate; -class Q_MULTIMEDIA_EXPORT QGraphicsVideoItem : public QGraphicsObject +class Q_MEDIASERVICES_EXPORT QGraphicsVideoItem : public QGraphicsObject { Q_OBJECT Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObject) diff --git a/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h index e6b6dca..4dd53df 100644 --- a/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h +++ b/src/multimedia/mediaservices/base/qlocalmediaplaylistprovider.h @@ -52,7 +52,7 @@ QT_MODULE(Multimedia) class QLocalMediaPlaylistProviderPrivate; -class Q_MULTIMEDIA_EXPORT QLocalMediaPlaylistProvider : public QMediaPlaylistProvider +class Q_MEDIASERVICES_EXPORT QLocalMediaPlaylistProvider : public QMediaPlaylistProvider { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qmediacontent.h b/src/multimedia/mediaservices/base/qmediacontent.h index 47fa6e1..c00e443 100644 --- a/src/multimedia/mediaservices/base/qmediacontent.h +++ b/src/multimedia/mediaservices/base/qmediacontent.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) class QMediaContentPrivate; -class Q_MULTIMEDIA_EXPORT QMediaContent +class Q_MEDIASERVICES_EXPORT QMediaContent { public: QMediaContent(); diff --git a/src/multimedia/mediaservices/base/qmediacontrol.h b/src/multimedia/mediaservices/base/qmediacontrol.h index 819c959..941c004 100644 --- a/src/multimedia/mediaservices/base/qmediacontrol.h +++ b/src/multimedia/mediaservices/base/qmediacontrol.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) class QMediaControlPrivate; -class Q_MULTIMEDIA_EXPORT QMediaControl : public QObject +class Q_MEDIASERVICES_EXPORT QMediaControl : public QObject { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qmediaobject.h b/src/multimedia/mediaservices/base/qmediaobject.h index 70b4f33..067bb56 100644 --- a/src/multimedia/mediaservices/base/qmediaobject.h +++ b/src/multimedia/mediaservices/base/qmediaobject.h @@ -56,7 +56,7 @@ QT_MODULE(Multimedia) class QMediaService; class QMediaObjectPrivate; -class Q_MULTIMEDIA_EXPORT QMediaObject : public QObject +class Q_MEDIASERVICES_EXPORT QMediaObject : public QObject { Q_OBJECT Q_PROPERTY(int notifyInterval READ notifyInterval WRITE setNotifyInterval NOTIFY notifyIntervalChanged) diff --git a/src/multimedia/mediaservices/base/qmediaplaylist.h b/src/multimedia/mediaservices/base/qmediaplaylist.h index 9125fd6..6cae7c5 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylist.h +++ b/src/multimedia/mediaservices/base/qmediaplaylist.h @@ -57,7 +57,7 @@ QT_MODULE(Multimedia) class QMediaPlaylistProvider; class QMediaPlaylistPrivate; -class Q_MULTIMEDIA_EXPORT QMediaPlaylist : public QObject +class Q_MEDIASERVICES_EXPORT QMediaPlaylist : public QObject { Q_OBJECT Q_PROPERTY(QMediaPlaylist::PlaybackMode playbackMode READ playbackMode WRITE setPlaybackMode NOTIFY playbackModeChanged) diff --git a/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h index 36f00ae..2dc4575 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h +++ b/src/multimedia/mediaservices/base/qmediaplaylistcontrol.h @@ -56,7 +56,7 @@ QT_MODULE(Multimedia) class QMediaPlaylistProvider; -class Q_MULTIMEDIA_EXPORT QMediaPlaylistControl : public QMediaControl +class Q_MEDIASERVICES_EXPORT QMediaPlaylistControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h index 5fc10f7..ed8e832 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h +++ b/src/multimedia/mediaservices/base/qmediaplaylistioplugin.h @@ -62,7 +62,7 @@ class QByteArray; class QIODevice; class QStringList; -class Q_MULTIMEDIA_EXPORT QMediaPlaylistReader +class Q_MEDIASERVICES_EXPORT QMediaPlaylistReader { public: virtual ~QMediaPlaylistReader(); @@ -72,7 +72,7 @@ public: virtual void close() = 0; }; -class Q_MULTIMEDIA_EXPORT QMediaPlaylistWriter +class Q_MEDIASERVICES_EXPORT QMediaPlaylistWriter { public: virtual ~QMediaPlaylistWriter(); @@ -81,7 +81,7 @@ public: virtual void close() = 0; }; -struct Q_MULTIMEDIA_EXPORT QMediaPlaylistIOInterface : public QFactoryInterface +struct Q_MEDIASERVICES_EXPORT QMediaPlaylistIOInterface : public QFactoryInterface { virtual bool canRead(QIODevice *device, const QByteArray &format = QByteArray() ) const = 0; virtual bool canRead(const QUrl& location, const QByteArray &format = QByteArray()) const = 0; @@ -97,7 +97,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaPlaylistIOInterface : public QFactoryInterface #define QMediaPlaylistIOInterface_iid "com.nokia.Qt.QMediaPlaylistIOInterface" Q_DECLARE_INTERFACE(QMediaPlaylistIOInterface, QMediaPlaylistIOInterface_iid); -class Q_MULTIMEDIA_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMediaPlaylistIOInterface +class Q_MEDIASERVICES_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMediaPlaylistIOInterface { Q_OBJECT Q_INTERFACES(QMediaPlaylistIOInterface:QFactoryInterface) diff --git a/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h index 6cb9d9c..42c76f9 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h +++ b/src/multimedia/mediaservices/base/qmediaplaylistnavigator.h @@ -56,7 +56,7 @@ QT_MODULE(Multimedia) class QMediaPlaylistNavigatorPrivate; -class Q_MULTIMEDIA_EXPORT QMediaPlaylistNavigator : public QObject +class Q_MEDIASERVICES_EXPORT QMediaPlaylistNavigator : public QObject { Q_OBJECT Q_PROPERTY(QMediaPlaylist::PlaybackMode playbackMode READ playbackMode WRITE setPlaybackMode NOTIFY playbackModeChanged) diff --git a/src/multimedia/mediaservices/base/qmediaplaylistprovider.h b/src/multimedia/mediaservices/base/qmediaplaylistprovider.h index 31e6d5f..c68ed89 100644 --- a/src/multimedia/mediaservices/base/qmediaplaylistprovider.h +++ b/src/multimedia/mediaservices/base/qmediaplaylistprovider.h @@ -58,7 +58,7 @@ class QString; class QMediaPlaylistProviderPrivate; -class Q_MULTIMEDIA_EXPORT QMediaPlaylistProvider : public QObject +class Q_MEDIASERVICES_EXPORT QMediaPlaylistProvider : public QObject { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qmediaresource.h b/src/multimedia/mediaservices/base/qmediaresource.h index 5c381ba..0ecf008 100644 --- a/src/multimedia/mediaservices/base/qmediaresource.h +++ b/src/multimedia/mediaservices/base/qmediaresource.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) -class Q_MULTIMEDIA_EXPORT QMediaResource +class Q_MEDIASERVICES_EXPORT QMediaResource { public: QMediaResource(); diff --git a/src/multimedia/mediaservices/base/qmediaservice.h b/src/multimedia/mediaservices/base/qmediaservice.h index 3963348..5df3fd7 100644 --- a/src/multimedia/mediaservices/base/qmediaservice.h +++ b/src/multimedia/mediaservices/base/qmediaservice.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) class QMediaServicePrivate; -class Q_MULTIMEDIA_EXPORT QMediaService : public QObject +class Q_MEDIASERVICES_EXPORT QMediaService : public QObject { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qmediaserviceprovider.h b/src/multimedia/mediaservices/base/qmediaserviceprovider.h index 24d2078..eeea5d2 100644 --- a/src/multimedia/mediaservices/base/qmediaserviceprovider.h +++ b/src/multimedia/mediaservices/base/qmediaserviceprovider.h @@ -57,7 +57,7 @@ QT_MODULE(Multimedia) class QMediaService; class QMediaServiceProviderHintPrivate; -class Q_MULTIMEDIA_EXPORT QMediaServiceProviderHint +class Q_MEDIASERVICES_EXPORT QMediaServiceProviderHint { public: enum Type { Null, ContentType, Device, SupportedFeatures }; @@ -98,7 +98,7 @@ private: QSharedDataPointer<QMediaServiceProviderHintPrivate> d; }; -class Q_MULTIMEDIA_EXPORT QMediaServiceProvider : public QObject +class Q_MEDIASERVICES_EXPORT QMediaServiceProvider : public QObject { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h b/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h index ab55f84..ca25f91 100644 --- a/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h +++ b/src/multimedia/mediaservices/base/qmediaserviceproviderplugin.h @@ -61,7 +61,7 @@ QT_MODULE(Multimedia) class QMediaService; -struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface : public QFactoryInterface +struct Q_MEDIASERVICES_EXPORT QMediaServiceProviderFactoryInterface : public QFactoryInterface { virtual QStringList keys() const = 0; virtual QMediaService* create(QString const& key) = 0; @@ -73,7 +73,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface : public QFacto Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProviderFactoryInterface_iid) -struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface +struct Q_MEDIASERVICES_EXPORT QMediaServiceSupportedFormatsInterface { virtual ~QMediaServiceSupportedFormatsInterface() {} virtual QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0; @@ -85,7 +85,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface Q_DECLARE_INTERFACE(QMediaServiceSupportedFormatsInterface, QMediaServiceSupportedFormatsInterface_iid) -struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedDevicesInterface +struct Q_MEDIASERVICES_EXPORT QMediaServiceSupportedDevicesInterface { virtual ~QMediaServiceSupportedDevicesInterface() {} virtual QList<QByteArray> devices(const QByteArray &service) const = 0; @@ -97,7 +97,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedDevicesInterface Q_DECLARE_INTERFACE(QMediaServiceSupportedDevicesInterface, QMediaServiceSupportedDevicesInterface_iid) -struct Q_MULTIMEDIA_EXPORT QMediaServiceFeaturesInterface +struct Q_MEDIASERVICES_EXPORT QMediaServiceFeaturesInterface { virtual ~QMediaServiceFeaturesInterface() {} virtual QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const = 0; @@ -107,7 +107,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceFeaturesInterface "com.nokia.Qt.QMediaServiceFeaturesInterface/1.0" Q_DECLARE_INTERFACE(QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid) -class Q_MULTIMEDIA_EXPORT QMediaServiceProviderPlugin : public QObject, public QMediaServiceProviderFactoryInterface +class Q_MEDIASERVICES_EXPORT QMediaServiceProviderPlugin : public QObject, public QMediaServiceProviderFactoryInterface { Q_OBJECT Q_INTERFACES(QMediaServiceProviderFactoryInterface:QFactoryInterface) diff --git a/src/multimedia/mediaservices/base/qmediatimerange.h b/src/multimedia/mediaservices/base/qmediatimerange.h index 33b2f27..5983db2 100644 --- a/src/multimedia/mediaservices/base/qmediatimerange.h +++ b/src/multimedia/mediaservices/base/qmediatimerange.h @@ -54,7 +54,7 @@ QT_MODULE(Multimedia) class QMediaTimeRangePrivate; -class Q_MULTIMEDIA_EXPORT QMediaTimeInterval +class Q_MEDIASERVICES_EXPORT QMediaTimeInterval { public: QMediaTimeInterval(); @@ -78,10 +78,10 @@ private: qint64 e; }; -Q_MULTIMEDIA_EXPORT bool operator==(const QMediaTimeInterval&, const QMediaTimeInterval&); -Q_MULTIMEDIA_EXPORT bool operator!=(const QMediaTimeInterval&, const QMediaTimeInterval&); +Q_MEDIASERVICES_EXPORT bool operator==(const QMediaTimeInterval&, const QMediaTimeInterval&); +Q_MEDIASERVICES_EXPORT bool operator!=(const QMediaTimeInterval&, const QMediaTimeInterval&); -class Q_MULTIMEDIA_EXPORT QMediaTimeRange +class Q_MEDIASERVICES_EXPORT QMediaTimeRange { public: @@ -122,10 +122,10 @@ private: QSharedDataPointer<QMediaTimeRangePrivate> d; }; -Q_MULTIMEDIA_EXPORT bool operator==(const QMediaTimeRange&, const QMediaTimeRange&); -Q_MULTIMEDIA_EXPORT bool operator!=(const QMediaTimeRange&, const QMediaTimeRange&); -Q_MULTIMEDIA_EXPORT QMediaTimeRange operator+(const QMediaTimeRange&, const QMediaTimeRange&); -Q_MULTIMEDIA_EXPORT QMediaTimeRange operator-(const QMediaTimeRange&, const QMediaTimeRange&); +Q_MEDIASERVICES_EXPORT bool operator==(const QMediaTimeRange&, const QMediaTimeRange&); +Q_MEDIASERVICES_EXPORT bool operator!=(const QMediaTimeRange&, const QMediaTimeRange&); +Q_MEDIASERVICES_EXPORT QMediaTimeRange operator+(const QMediaTimeRange&, const QMediaTimeRange&); +Q_MEDIASERVICES_EXPORT QMediaTimeRange operator-(const QMediaTimeRange&, const QMediaTimeRange&); QT_END_NAMESPACE diff --git a/src/multimedia/mediaservices/base/qmetadatacontrol.h b/src/multimedia/mediaservices/base/qmetadatacontrol.h index e91c88b..48206fa 100644 --- a/src/multimedia/mediaservices/base/qmetadatacontrol.h +++ b/src/multimedia/mediaservices/base/qmetadatacontrol.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) -class Q_MULTIMEDIA_EXPORT QMetaDataControl : public QMediaControl +class Q_MEDIASERVICES_EXPORT QMetaDataControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qpaintervideosurface_p.h b/src/multimedia/mediaservices/base/qpaintervideosurface_p.h index 20628c4..07b7e01 100644 --- a/src/multimedia/mediaservices/base/qpaintervideosurface_p.h +++ b/src/multimedia/mediaservices/base/qpaintervideosurface_p.h @@ -89,7 +89,7 @@ public: virtual void updateColors(int brightness, int contrast, int hue, int saturation) = 0; }; -class Q_MULTIMEDIA_EXPORT QPainterVideoSurface : public QAbstractVideoSurface +class Q_MEDIASERVICES_EXPORT QPainterVideoSurface : public QAbstractVideoSurface { Q_OBJECT public: diff --git a/src/multimedia/mediaservices/base/qvideodevicecontrol.h b/src/multimedia/mediaservices/base/qvideodevicecontrol.h index b86a35c..0b9235b 100644 --- a/src/multimedia/mediaservices/base/qvideodevicecontrol.h +++ b/src/multimedia/mediaservices/base/qvideodevicecontrol.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) -class Q_MULTIMEDIA_EXPORT QVideoDeviceControl : public QMediaControl +class Q_MEDIASERVICES_EXPORT QVideoDeviceControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qvideooutputcontrol.h b/src/multimedia/mediaservices/base/qvideooutputcontrol.h index ad69911..f87bb3c 100644 --- a/src/multimedia/mediaservices/base/qvideooutputcontrol.h +++ b/src/multimedia/mediaservices/base/qvideooutputcontrol.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) -class Q_MULTIMEDIA_EXPORT QVideoOutputControl : public QMediaControl +class Q_MEDIASERVICES_EXPORT QVideoOutputControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qvideorenderercontrol.h b/src/multimedia/mediaservices/base/qvideorenderercontrol.h index 29a66ea..28e3d85 100644 --- a/src/multimedia/mediaservices/base/qvideorenderercontrol.h +++ b/src/multimedia/mediaservices/base/qvideorenderercontrol.h @@ -53,7 +53,7 @@ QT_MODULE(Multimedia) class QAbstractVideoSurface; -class Q_MULTIMEDIA_EXPORT QVideoRendererControl : public QMediaControl +class Q_MEDIASERVICES_EXPORT QVideoRendererControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qvideowidget.h b/src/multimedia/mediaservices/base/qvideowidget.h index 8033d40..3722857 100644 --- a/src/multimedia/mediaservices/base/qvideowidget.h +++ b/src/multimedia/mediaservices/base/qvideowidget.h @@ -55,7 +55,7 @@ QT_MODULE(Multimedia) class QMediaObject; class QVideoWidgetPrivate; -class Q_MULTIMEDIA_EXPORT QVideoWidget : public QWidget +class Q_MEDIASERVICES_EXPORT QVideoWidget : public QWidget { Q_OBJECT Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObject) diff --git a/src/multimedia/mediaservices/base/qvideowidgetcontrol.h b/src/multimedia/mediaservices/base/qvideowidgetcontrol.h index 1fe43cc..1013beb 100644 --- a/src/multimedia/mediaservices/base/qvideowidgetcontrol.h +++ b/src/multimedia/mediaservices/base/qvideowidgetcontrol.h @@ -57,7 +57,7 @@ QT_MODULE(Multimedia) class QVideoWidgetControlPrivate; -class Q_MULTIMEDIA_EXPORT QVideoWidgetControl : public QMediaControl +class Q_MEDIASERVICES_EXPORT QVideoWidgetControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/mediaservices/base/qvideowindowcontrol.h b/src/multimedia/mediaservices/base/qvideowindowcontrol.h index 74c1786..47ba520 100644 --- a/src/multimedia/mediaservices/base/qvideowindowcontrol.h +++ b/src/multimedia/mediaservices/base/qvideowindowcontrol.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) -class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl +class Q_MEDIASERVICES_EXPORT QVideoWindowControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/mediaservices/effects/qsoundeffect_p.h b/src/multimedia/mediaservices/effects/qsoundeffect_p.h index 419e4f8..64ddb77 100644 --- a/src/multimedia/mediaservices/effects/qsoundeffect_p.h +++ b/src/multimedia/mediaservices/effects/qsoundeffect_p.h @@ -63,7 +63,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSoundEffectPrivate; -class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject +class Q_MEDIASERVICES_EXPORT QSoundEffect : public QObject { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/multimedia/mediaservices/playback/qmediaplayer.h b/src/multimedia/mediaservices/playback/qmediaplayer.h index be66a63..d75c58a 100644 --- a/src/multimedia/mediaservices/playback/qmediaplayer.h +++ b/src/multimedia/mediaservices/playback/qmediaplayer.h @@ -57,7 +57,7 @@ QT_MODULE(Multimedia) class QMediaPlaylist; class QMediaPlayerPrivate; -class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaObject +class Q_MEDIASERVICES_EXPORT QMediaPlayer : public QMediaObject { Q_OBJECT Q_PROPERTY(QMediaContent media READ media WRITE setMedia NOTIFY mediaChanged) diff --git a/src/multimedia/mediaservices/playback/qmediaplayercontrol.h b/src/multimedia/mediaservices/playback/qmediaplayercontrol.h index 25bc2f5..7a3c24e 100644 --- a/src/multimedia/mediaservices/playback/qmediaplayercontrol.h +++ b/src/multimedia/mediaservices/playback/qmediaplayercontrol.h @@ -58,7 +58,7 @@ QT_MODULE(Multimedia) class QMediaPlaylist; -class Q_MULTIMEDIA_EXPORT QMediaPlayerControl : public QMediaControl +class Q_MEDIASERVICES_EXPORT QMediaPlayerControl : public QMediaControl { Q_OBJECT |