diff options
| author | Piotr Srebrny <piotr.srebrny@qt.io> | 2021-06-09 13:22:35 +0200 |
|---|---|---|
| committer | Piotr Srebrny <piotr.srebrny@qt.io> | 2021-06-09 14:53:38 +0200 |
| commit | 0a401b43832d44dc7a3992272e290e8bf890390b (patch) | |
| tree | 229a60d8deb28171d4599a0a122d001891c612a5 /src/multimedia/playback | |
| parent | 312dffc919abd0624830c12a331e1aa2954dafac (diff) | |
Replace deprecated Q_ENUMS with Q_ENUM
Change-Id: I86d37b25783c844af92a6ef260547cb26848b1fb
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/playback')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 6 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaplaylist.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 1b1ab6e75..5903356b8 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -74,9 +74,6 @@ class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QObject Q_PROPERTY(Error error READ error NOTIFY errorChanged) Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) Q_PROPERTY(QObject *videoOutput READ videoOutput WRITE setVideoOutput NOTIFY videoOutputChanged) - Q_ENUMS(PlaybackState) - Q_ENUMS(MediaStatus) - Q_ENUMS(Error) public: enum PlaybackState @@ -85,6 +82,7 @@ public: PlayingState, PausedState }; + Q_ENUM(PlaybackState) enum MediaStatus { @@ -97,6 +95,7 @@ public: EndOfMedia, InvalidMedia }; + Q_ENUM(MediaStatus) enum Error { @@ -106,6 +105,7 @@ public: NetworkError, AccessDeniedError }; + Q_ENUM(Error) explicit QMediaPlayer(QObject *parent = nullptr); ~QMediaPlayer(); diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h index 9fee6c10e..734dd07c0 100644 --- a/src/multimedia/playback/qmediaplaylist.h +++ b/src/multimedia/playback/qmediaplaylist.h @@ -55,11 +55,12 @@ class Q_MULTIMEDIA_EXPORT QMediaPlaylist : public QObject Q_PROPERTY(QMediaPlaylist::PlaybackMode playbackMode READ playbackMode WRITE setPlaybackMode NOTIFY playbackModeChanged) Q_PROPERTY(QUrl currentMedia READ currentMedia NOTIFY currentMediaChanged) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) - Q_ENUMS(PlaybackMode Error) public: enum PlaybackMode { CurrentItemOnce, CurrentItemInLoop, Sequential, Loop }; + Q_ENUM(PlaybackMode) enum Error { NoError, FormatError, FormatNotSupportedError, NetworkError, AccessDeniedError }; + Q_ENUM(Error) explicit QMediaPlaylist(QObject *parent = nullptr); virtual ~QMediaPlaylist(); |