slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackberry: Add Q_DECL_OVERRIDE keywords

Browse Source 
Change-Id: Ibd6cf76ac41e16cbf65182994d68eb81c315f0af
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Thomas McGuire
2012-09-05 13:34:03 +02:00
committed by Qt by Nokia
parent bce8b5486d
commit d62b1c5213
4 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/blackberry/bbmediaplayercontrol.h
View File

@@ -63,40 +63,40 @@ public:
explicit BbMediaPlayerControl(QObject *parent = 0);
~BbMediaPlayerControl();
QMediaPlayer::State state() const;
QMediaPlayer::State state() const Q_DECL_OVERRIDE;
QMediaPlayer::MediaStatus mediaStatus() const;
QMediaPlayer::MediaStatus mediaStatus() const Q_DECL_OVERRIDE;
qint64 duration() const;
qint64 duration() const Q_DECL_OVERRIDE;
qint64 position() const;
void setPosition(qint64 position);
qint64 position() const Q_DECL_OVERRIDE;
void setPosition(qint64 position) Q_DECL_OVERRIDE;
int volume() const;
void setVolume(int volume);
int volume() const Q_DECL_OVERRIDE;
void setVolume(int volume) Q_DECL_OVERRIDE;
bool isMuted() const;
void setMuted(bool muted);
bool isMuted() const Q_DECL_OVERRIDE;
void setMuted(bool muted) Q_DECL_OVERRIDE;
int bufferStatus() const;
int bufferStatus() const Q_DECL_OVERRIDE;
bool isAudioAvailable() const;
bool isVideoAvailable() const;
bool isAudioAvailable() const Q_DECL_OVERRIDE;
bool isVideoAvailable() const Q_DECL_OVERRIDE;
bool isSeekable() const;
bool isSeekable() const Q_DECL_OVERRIDE;
QMediaTimeRange availablePlaybackRanges() const;
QMediaTimeRange availablePlaybackRanges() const Q_DECL_OVERRIDE;
qreal playbackRate() const;
void setPlaybackRate(qreal rate);
qreal playbackRate() const Q_DECL_OVERRIDE;
void setPlaybackRate(qreal rate) Q_DECL_OVERRIDE;
QMediaContent media() const;
const QIODevice *mediaStream() const;
void setMedia(const QMediaContent &media, QIODevice *stream);
QMediaContent media() const Q_DECL_OVERRIDE;
const QIODevice *mediaStream() const Q_DECL_OVERRIDE;
void setMedia(const QMediaContent &media, QIODevice *stream) Q_DECL_OVERRIDE;
void play();
void pause();
void stop();
void play() Q_DECL_OVERRIDE;
void pause() Q_DECL_OVERRIDE;
void stop() Q_DECL_OVERRIDE;
void setVideoControl(BbVideoWindowControl *videoControl);
bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;

4
src/plugins/blackberry/bbmediaplayerservice.h
View File

@@ -56,8 +56,8 @@ public:
explicit BbMediaPlayerService(QObject *parent = 0);
~BbMediaPlayerService();
QMediaControl *requestControl(const char *name);
void releaseControl(QMediaControl *control);
QMediaControl *requestControl(const char *name) Q_DECL_OVERRIDE;
void releaseControl(QMediaControl *control) Q_DECL_OVERRIDE;
private:
void updateControls();

6
src/plugins/blackberry/bbserviceplugin.h
View File

@@ -55,9 +55,9 @@ class BbServicePlugin
public:
BbServicePlugin();
QMediaService *create(const QString &key);
void release(QMediaService *service);
QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const;
QMediaService *create(const QString &key) Q_DECL_OVERRIDE;
void release(QMediaService *service) Q_DECL_OVERRIDE;
QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const Q_DECL_OVERRIDE;
};
QT_END_NAMESPACE

36
src/plugins/blackberry/bbvideowindowcontrol.h
View File

@@ -57,33 +57,33 @@ public:
explicit BbVideoWindowControl(QObject *parent = 0);
~BbVideoWindowControl();
WId winId() const;
void setWinId(WId id);
WId winId() const Q_DECL_OVERRIDE;
void setWinId(WId id) Q_DECL_OVERRIDE;
QRect displayRect() const;
void setDisplayRect(const QRect &rect);
QRect displayRect() const Q_DECL_OVERRIDE;
void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE;
bool isFullScreen() const;
void setFullScreen(bool fullScreen);
bool isFullScreen() const Q_DECL_OVERRIDE;
void setFullScreen(bool fullScreen) Q_DECL_OVERRIDE;
void repaint();
void repaint() Q_DECL_OVERRIDE;
QSize nativeSize() const;
QSize nativeSize() const Q_DECL_OVERRIDE;
Qt::AspectRatioMode aspectRatioMode() const;
void setAspectRatioMode(Qt::AspectRatioMode mode);
Qt::AspectRatioMode aspectRatioMode() const Q_DECL_OVERRIDE;
void setAspectRatioMode(Qt::AspectRatioMode mode) Q_DECL_OVERRIDE;
int brightness() const;
void setBrightness(int brightness);
int brightness() const Q_DECL_OVERRIDE;
void setBrightness(int brightness) Q_DECL_OVERRIDE;
int contrast() const;
void setContrast(int contrast);
int contrast() const Q_DECL_OVERRIDE;
void setContrast(int contrast) Q_DECL_OVERRIDE;
int hue() const;
void setHue(int hue);
int hue() const Q_DECL_OVERRIDE;
void setHue(int hue) Q_DECL_OVERRIDE;
int saturation() const;
void setSaturation(int saturation);
int saturation() const Q_DECL_OVERRIDE;
void setSaturation(int saturation) Q_DECL_OVERRIDE;
//
// Called by media control