diff --git a/designer/phononcollection.cpp b/designer/phononcollection.cpp --- a/designer/phononcollection.cpp +++ b/designer/phononcollection.cpp @@ -78,7 +78,7 @@ public: explicit PhononCollection(QObject *parent = 0); - virtual QList customWidgets() const; + virtual QList customWidgets() const override; private: QList m_plugins; diff --git a/designer/seeksliderplugin.h b/designer/seeksliderplugin.h --- a/designer/seeksliderplugin.h +++ b/designer/seeksliderplugin.h @@ -51,17 +51,17 @@ public: explicit SeekSliderPlugin(const QString &group, QObject *parent = 0); - virtual QString name() const; - virtual QString group() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; - virtual QString includeFile() const; - virtual QIcon icon() const; - virtual bool isContainer() const; - virtual QWidget *createWidget(QWidget *parent); - virtual bool isInitialized() const; - virtual void initialize(QDesignerFormEditorInterface *core); - virtual QString domXml() const; + virtual QString name() const override; + virtual QString group() const override; + virtual QString toolTip() const override; + virtual QString whatsThis() const override; + virtual QString includeFile() const override; + virtual QIcon icon() const override; + virtual bool isContainer() const override; + virtual QWidget *createWidget(QWidget *parent) override; + virtual bool isInitialized() const override; + virtual void initialize(QDesignerFormEditorInterface *core) override; + virtual QString domXml() const override; private: const QString m_group; diff --git a/designer/videoplayerplugin.h b/designer/videoplayerplugin.h --- a/designer/videoplayerplugin.h +++ b/designer/videoplayerplugin.h @@ -51,17 +51,17 @@ public: explicit VideoPlayerPlugin(const QString &group, QObject *parent = 0); - virtual QString name() const; - virtual QString group() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; - virtual QString includeFile() const; - virtual QIcon icon() const; - virtual bool isContainer() const; - virtual QWidget *createWidget(QWidget *parent); - virtual bool isInitialized() const; - virtual void initialize(QDesignerFormEditorInterface *core); - virtual QString domXml() const; + virtual QString name() const override; + virtual QString group() const override; + virtual QString toolTip() const override; + virtual QString whatsThis() const override; + virtual QString includeFile() const override; + virtual QIcon icon() const override; + virtual bool isContainer() const override; + virtual QWidget *createWidget(QWidget *parent) override; + virtual bool isInitialized() const override; + virtual void initialize(QDesignerFormEditorInterface *core) override; + virtual QString domXml() const override; private: const QString m_group; diff --git a/designer/videoplayertaskmenu.h b/designer/videoplayertaskmenu.h --- a/designer/videoplayertaskmenu.h +++ b/designer/videoplayertaskmenu.h @@ -80,7 +80,7 @@ Q_INTERFACES(QDesignerTaskMenuExtension) public: explicit VideoPlayerTaskMenu(Phonon::VideoPlayer *object, QObject *parent = 0); - virtual QList taskActions() const; + virtual QList taskActions() const override; private slots: void slotLoad(); @@ -106,7 +106,7 @@ protected: QObject *createExtension(QObject *object, - const QString &iid, QObject *parent) const; + const QString &iid, QObject *parent) const override; }; #endif // VIDEOPLAYERTASKMENU_H diff --git a/designer/videowidgetplugin.h b/designer/videowidgetplugin.h --- a/designer/videowidgetplugin.h +++ b/designer/videowidgetplugin.h @@ -31,17 +31,17 @@ public: explicit VideoWidgetPlugin(const QString &group, QObject *parent = 0); - virtual QString name() const; - virtual QString group() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; - virtual QString includeFile() const; - virtual QIcon icon() const; - virtual bool isContainer() const; - virtual QWidget *createWidget(QWidget *parent); - virtual bool isInitialized() const; - virtual void initialize(QDesignerFormEditorInterface *core); - virtual QString domXml() const; + virtual QString name() const override; + virtual QString group() const override; + virtual QString toolTip() const override; + virtual QString whatsThis() const override; + virtual QString includeFile() const override; + virtual QIcon icon() const override; + virtual bool isContainer() const override; + virtual QWidget *createWidget(QWidget *parent) override; + virtual bool isInitialized() const override; + virtual void initialize(QDesignerFormEditorInterface *core) override; + virtual QString domXml() const override; private: const QString m_group; diff --git a/designer/volumesliderplugin.h b/designer/volumesliderplugin.h --- a/designer/volumesliderplugin.h +++ b/designer/volumesliderplugin.h @@ -51,17 +51,17 @@ public: explicit VolumeSliderPlugin(const QString &group, QObject *parent = 0); - virtual QString name() const; - virtual QString group() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; - virtual QString includeFile() const; - virtual QIcon icon() const; - virtual bool isContainer() const; - virtual QWidget *createWidget(QWidget *parent); - virtual bool isInitialized() const; - virtual void initialize(QDesignerFormEditorInterface *core); - virtual QString domXml() const; + virtual QString name() const override; + virtual QString group() const override; + virtual QString toolTip() const override; + virtual QString whatsThis() const override; + virtual QString includeFile() const override; + virtual QIcon icon() const override; + virtual bool isContainer() const override; + virtual QWidget *createWidget(QWidget *parent) override; + virtual bool isInitialized() const override; + virtual void initialize(QDesignerFormEditorInterface *core) override; + virtual QString domXml() const override; private: const QString m_group; diff --git a/phonon/abstractaudiooutput_p.h b/phonon/abstractaudiooutput_p.h --- a/phonon/abstractaudiooutput_p.h +++ b/phonon/abstractaudiooutput_p.h @@ -34,7 +34,7 @@ P_DECLARE_PUBLIC(AbstractAudioOutput) PHONON_PRIVATEABSTRACTCLASS public: - virtual QObject *qObject() { return q_func(); } + virtual QObject *qObject() override { return q_func(); } protected: AbstractAudioOutputPrivate(CastId castId = AbstractAudioOutputPrivateType) : MediaNodePrivate(castId) diff --git a/phonon/abstractmediastream_p.h b/phonon/abstractmediastream_p.h --- a/phonon/abstractmediastream_p.h +++ b/phonon/abstractmediastream_p.h @@ -60,7 +60,7 @@ virtual void setStreamSeekable(bool s); virtual void writeData(const QByteArray &data); virtual void endOfData(); - void phononObjectDestroyed(MediaNodePrivate *); + void phononObjectDestroyed(MediaNodePrivate *) override; AbstractMediaStream *q_ptr; qint64 streamSize; diff --git a/phonon/effect_p.h b/phonon/effect_p.h --- a/phonon/effect_p.h +++ b/phonon/effect_p.h @@ -39,7 +39,7 @@ P_DECLARE_PUBLIC(Effect) PHONON_PRIVATECLASS public: - virtual QObject *qObject() { return q_func(); } + virtual QObject *qObject() override { return q_func(); } protected: EffectPrivate() { diff --git a/phonon/experimental/videodataoutput2.h b/phonon/experimental/videodataoutput2.h --- a/phonon/experimental/videodataoutput2.h +++ b/phonon/experimental/videodataoutput2.h @@ -52,9 +52,9 @@ PHONON_HEIR(VideoDataOutput2) protected: - virtual void frameReady(const VideoFrame2 &); + virtual void frameReady(const VideoFrame2 &) override; - virtual void endOfMedia(); + virtual void endOfMedia() override; Q_SIGNALS: /** diff --git a/phonon/experimental/visualization_p.h b/phonon/experimental/visualization_p.h --- a/phonon/experimental/visualization_p.h +++ b/phonon/experimental/visualization_p.h @@ -37,7 +37,7 @@ P_DECLARE_PUBLIC(Visualization) PHONON_PRIVATECLASS public: - virtual QObject *qObject() { return q_func(); } + virtual QObject *qObject() override { return q_func(); } protected: VisualizationDescription description; diff --git a/phonon/iodevicestream_p.h b/phonon/iodevicestream_p.h --- a/phonon/iodevicestream_p.h +++ b/phonon/iodevicestream_p.h @@ -42,9 +42,9 @@ explicit IODeviceStream(QIODevice *ioDevice, QObject *parent = 0); ~IODeviceStream(); - void reset(); - void needData(); - void seekStream(qint64); + void reset() override; + void needData() override; + void seekStream(qint64) override; }; } // namespace Phonon diff --git a/phonon/mediacontroller.cpp b/phonon/mediacontroller.cpp --- a/phonon/mediacontroller.cpp +++ b/phonon/mediacontroller.cpp @@ -41,7 +41,7 @@ public: MediaControllerPrivate(MediaObject *mp) : FrontendInterfacePrivate(mp) {} - virtual void backendObjectChanged(QObject *); + virtual void backendObjectChanged(QObject *) override; MediaController *q; }; diff --git a/phonon/mediaobject_p.h b/phonon/mediaobject_p.h --- a/phonon/mediaobject_p.h +++ b/phonon/mediaobject_p.h @@ -48,7 +48,7 @@ friend class AbstractMediaStreamPrivate; P_DECLARE_PUBLIC(MediaObject) public: - virtual QObject *qObject() { return q_func(); } + virtual QObject *qObject() override { return q_func(); } /** * Sends the metadata for this media file to the Zeitgeist tracker @@ -78,9 +78,9 @@ QList interfaceList; protected: - virtual bool aboutToDeleteBackendObject(); - virtual void createBackendObject(); - virtual void phononObjectDestroyed(MediaNodePrivate *); + virtual bool aboutToDeleteBackendObject() override; + virtual void createBackendObject() override; + virtual void phononObjectDestroyed(MediaNodePrivate *) override; PHONON_EXPORT void setupBackendObject(); void _k_resumePlay(); diff --git a/phonon/objectdescriptionmodel.h b/phonon/objectdescriptionmodel.h --- a/phonon/objectdescriptionmodel.h +++ b/phonon/objectdescriptionmodel.h @@ -196,9 +196,9 @@ /** \internal */ static PHONON_TEMPLATE_CLASS_MEMBER_EXPORT const QMetaObject staticMetaObject; /** \internal */ - PHONON_TEMPLATE_CLASS_MEMBER_EXPORT const QMetaObject *metaObject() const; + PHONON_TEMPLATE_CLASS_MEMBER_EXPORT const QMetaObject *metaObject() const override; /** \internal */ - PHONON_TEMPLATE_CLASS_MEMBER_EXPORT void *qt_metacast(const char *_clname); + PHONON_TEMPLATE_CLASS_MEMBER_EXPORT void *qt_metacast(const char *_clname) override; //int qt_metacall(QMetaObject::Call _c, int _id, void **_a); /** @@ -213,7 +213,7 @@ * * \see QAbstractItemModel::rowCount */ - inline int rowCount(const QModelIndex &parent = QModelIndex()) const { return d->rowCount(parent); } //krazy:exclude=inline + inline int rowCount(const QModelIndex &parent = QModelIndex()) const override { return d->rowCount(parent); } //krazy:exclude=inline /** * Returns data from the item with the given \p index for the specified @@ -226,13 +226,13 @@ * \see QAbstractItemModel::data * \see Qt::ItemDataRole */ - inline QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const { return d->data(index, role); } //krazy:exclude=inline + inline QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override { return d->data(index, role); } //krazy:exclude=inline /** * Reimplemented to show unavailable devices as disabled (but still * selectable). */ - inline Qt::ItemFlags flags(const QModelIndex &index) const { return d->flags(index); } //krazy:exclude=inline + inline Qt::ItemFlags flags(const QModelIndex &index) const override { return d->flags(index); } //krazy:exclude=inline /** * Returns a list of indexes in the same order as they are in the @@ -259,7 +259,7 @@ * Returns the MIME data that dropMimeData() can use to create new * items. */ - inline QMimeData *mimeData(const QModelIndexList &indexes) const { return d->mimeData(type, indexes); } //krazy:exclude=inline + inline QMimeData *mimeData(const QModelIndexList &indexes) const override { return d->mimeData(type, indexes); } //krazy:exclude=inline /** * Moves the item at the given \p index up. In the resulting list @@ -327,15 +327,15 @@ * This model supports drag and drop to copy or move * items. */ - inline Qt::DropActions supportedDropActions() const { return d->supportedDropActions(); } //krazy:exclude=inline + inline Qt::DropActions supportedDropActions() const override { return d->supportedDropActions(); } //krazy:exclude=inline /** * Accept drops from other models of the same ObjectDescriptionType. * * If a valid \p parent is given the dropped items will be inserted * above that item. */ - inline bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) { //krazy:exclude=inline + inline bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override { //krazy:exclude=inline return d->dropMimeData(type, data, action, row, column, parent); } @@ -347,15 +347,15 @@ * * Returns true if the rows were successfully removed; otherwise returns false. */ - inline bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) { //krazy:exclude=inline + inline bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override { //krazy:exclude=inline return d->removeRows(row, count, parent); } /** * Returns a list of supported drag and drop MIME types. Currently * it only supports one type used internally. */ - inline QStringList mimeTypes() const { return d->mimeTypes(type); } //krazy:exclude=inline + inline QStringList mimeTypes() const override { return d->mimeTypes(type); } //krazy:exclude=inline protected: ObjectDescriptionModelData *const d; diff --git a/phonon/phonondefs_p.h b/phonon/phonondefs_p.h --- a/phonon/phonondefs_p.h +++ b/phonon/phonondefs_p.h @@ -32,8 +32,8 @@ #define PHONON_PRIVATECLASS \ protected: \ - virtual bool aboutToDeleteBackendObject(); \ - virtual void createBackendObject(); \ + virtual bool aboutToDeleteBackendObject() override; \ + virtual void createBackendObject() override; \ /** * \internal * After construction of the Iface object this method is called @@ -51,7 +51,7 @@ #define PHONON_PRIVATEABSTRACTCLASS \ protected: \ - virtual bool aboutToDeleteBackendObject(); \ + virtual bool aboutToDeleteBackendObject() override; \ /** * \internal * After construction of the Iface object this method is called diff --git a/phonon/swiftslider_p.h b/phonon/swiftslider_p.h --- a/phonon/swiftslider_p.h +++ b/phonon/swiftslider_p.h @@ -57,8 +57,8 @@ void scrollEnd(); private: - void mousePressEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *event) override; inline int pick(const QPoint &pt) const; int pixelPosToRangeValue(int pos) const; diff --git a/phonon/videoplayer.h b/phonon/videoplayer.h --- a/phonon/videoplayer.h +++ b/phonon/videoplayer.h @@ -191,7 +191,7 @@ void finished(); protected: - bool event(QEvent *); + bool event(QEvent *) override; VideoPlayerPrivate *const d; }; diff --git a/phonon/videowidget.h b/phonon/videowidget.h --- a/phonon/videowidget.h +++ b/phonon/videowidget.h @@ -203,8 +203,8 @@ */ VideoWidget(VideoWidgetPrivate &d, QWidget *parent); - void mouseMoveEvent(QMouseEvent *); - bool event(QEvent *); + void mouseMoveEvent(QMouseEvent *) override; + bool event(QEvent *) override; }; } //namespace Phonon diff --git a/phonon/videowidget_p.h b/phonon/videowidget_p.h --- a/phonon/videowidget_p.h +++ b/phonon/videowidget_p.h @@ -36,10 +36,10 @@ { P_DECLARE_PUBLIC(VideoWidget) public: - virtual QObject *qObject() { return q_func(); } + virtual QObject *qObject() override { return q_func(); } protected: - virtual bool aboutToDeleteBackendObject(); - virtual void createBackendObject(); + virtual bool aboutToDeleteBackendObject() override; + virtual void createBackendObject() override; void setupBackendObject(); VideoWidgetPrivate(VideoWidget *parent)