From 70a274ad3afd3b8b22b7558b0d491a122abfbaa0 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 23 May 2018 08:05:31 +0200 Subject: [PATCH] Use override --- autotests/coronatest.h | 6 +++--- .../calendar/calendarplugin.h | 2 +- src/declarativeimports/calendar/daysmodel.h | 6 +++--- .../calendar/eventpluginsmanager.cpp | 8 ++++---- src/declarativeimports/core/colorscope.h | 4 ++-- .../core/corebindingsplugin.h | 4 ++-- src/declarativeimports/core/datamodel.h | 14 +++++++------- src/declarativeimports/core/datasource.h | 4 ++-- src/declarativeimports/core/fadingnode.cpp | 4 ++-- src/declarativeimports/core/framesvgitem.h | 8 ++++---- src/declarativeimports/core/iconitem.h | 12 ++++++------ src/declarativeimports/core/svgitem.h | 6 +++--- src/declarativeimports/core/tooltip.h | 8 ++++---- src/declarativeimports/core/tooltipdialog.h | 10 +++++----- src/declarativeimports/core/units.h | 4 ++-- .../core/windowthumbnail.cpp | 4 ++-- src/declarativeimports/core/windowthumbnail.h | 6 +++--- .../plasmacomponents/plasmacomponentsplugin.h | 4 ++-- .../plasmacomponents/qmenu.h | 4 ++-- .../appbackgroundprovider_p.h | 4 ++-- .../plasmaextracomponentsplugin.h | 4 ++-- .../platformextensionplugin.cpp | 2 +- src/plasma/applet.h | 4 ++-- src/plasma/containment.h | 8 ++++---- src/plasma/datacontainer.h | 4 ++-- src/plasma/dataengine.h | 4 ++-- src/plasma/framesvg.h | 4 ++-- .../containmentactionspackage.cpp | 2 +- .../packagestructure/dataenginepackage.cpp | 2 +- src/plasma/packagestructure/packages_p.h | 6 +++--- .../packagestructure/plasmathemepackage.cpp | 2 +- .../packagestructure/plasmoidpackage.cpp | 4 ++-- src/plasma/private/datacontainer_p.h | 2 +- src/plasma/private/dataenginemanager_p.h | 4 ++-- src/plasma/private/effectwatcher_p.h | 2 +- src/plasma/private/packagestructure_p.h | 8 ++++---- src/plasma/private/service_p.h | 4 ++-- src/plasma/private/storage_p.h | 8 ++++---- src/plasma/private/storagethread_p.h | 4 ++-- src/plasma/private/theme_p.h | 4 ++-- src/plasma/scripting/appletscript.h | 6 +++--- src/plasma/scripting/dataenginescript.h | 6 +++--- src/plasma/servicejob.h | 4 ++-- src/plasma/svg.h | 4 ++-- src/plasmaquick/appletquickitem.h | 8 ++++---- src/plasmaquick/configmodel.h | 8 ++++---- src/plasmaquick/configview.h | 6 +++--- src/plasmaquick/dialog.h | 18 +++++++++--------- src/plasmaquick/packageurlinterceptor.h | 4 ++-- src/plasmaquick/private/packages.h | 6 +++--- src/plasmaquick/shellpluginloader.h | 4 ++-- .../qml/plasmoid/appletinterface.h | 8 ++++---- .../qml/plasmoid/containmentinterface.h | 10 +++++----- .../qml/plasmoid/declarativeappletscript.h | 8 ++++---- tests/testengine/testengine.h | 2 +- 55 files changed, 153 insertions(+), 153 deletions(-) diff --git a/autotests/coronatest.h b/autotests/coronatest.h index 2010b0bbb..d1d91d71f 100644 --- a/autotests/coronatest.h +++ b/autotests/coronatest.h @@ -30,7 +30,7 @@ class SimpleLoader : public Plasma::PluginLoader { protected: virtual Plasma::Applet *internalLoadApplet(const QString &name, uint appletId = 0, - const QVariantList &args = QVariantList()) Q_DECL_OVERRIDE; + const QVariantList &args = QVariantList()) override; }; @@ -42,8 +42,8 @@ public: explicit SimpleCorona(QObject * parent = nullptr); ~SimpleCorona(); - QRect screenGeometry(int) const Q_DECL_OVERRIDE; - int screenForContainment(const Plasma::Containment *) const Q_DECL_OVERRIDE; + QRect screenGeometry(int) const override; + int screenForContainment(const Plasma::Containment *) const override; }; class SimpleApplet : public Plasma::Applet diff --git a/src/declarativeimports/calendar/calendarplugin.h b/src/declarativeimports/calendar/calendarplugin.h index bf96ef80b..14f387530 100644 --- a/src/declarativeimports/calendar/calendarplugin.h +++ b/src/declarativeimports/calendar/calendarplugin.h @@ -30,7 +30,7 @@ class CalendarPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void registerTypes(const char *uri) Q_DECL_OVERRIDE; + void registerTypes(const char *uri) override; }; #endif diff --git a/src/declarativeimports/calendar/daysmodel.h b/src/declarativeimports/calendar/daysmodel.h index 2df896597..8e03c4eae 100644 --- a/src/declarativeimports/calendar/daysmodel.h +++ b/src/declarativeimports/calendar/daysmodel.h @@ -49,14 +49,14 @@ public: explicit DaysModel(QObject *parent = nullptr); virtual ~DaysModel(); void setSourceData(QList *data); - int rowCount(const QModelIndex &parent) const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role) const override; Q_INVOKABLE void setPluginsManager(QObject *manager); Q_INVOKABLE QList eventsForDate(const QDate &date); - QHash roleNames() const Q_DECL_OVERRIDE; + QHash roleNames() const override; Q_SIGNALS: void agendaUpdated(const QDate &updatedDate); diff --git a/src/declarativeimports/calendar/eventpluginsmanager.cpp b/src/declarativeimports/calendar/eventpluginsmanager.cpp index c7301c413..0858bafd5 100644 --- a/src/declarativeimports/calendar/eventpluginsmanager.cpp +++ b/src/declarativeimports/calendar/eventpluginsmanager.cpp @@ -55,18 +55,18 @@ public: QAbstractListModel::endResetModel(); } - virtual QHash roleNames() const Q_DECL_OVERRIDE + virtual QHash roleNames() const override { return m_roles; } - Q_INVOKABLE int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE + Q_INVOKABLE int rowCount(const QModelIndex &parent = QModelIndex()) const override { Q_UNUSED(parent); return m_manager->m_availablePlugins.size(); } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override { if (!index.isValid() && !m_manager) { return QVariant(); @@ -101,7 +101,7 @@ public: } - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override { if (role != Qt::EditRole || !index.isValid()) { return false; diff --git a/src/declarativeimports/core/colorscope.h b/src/declarativeimports/core/colorscope.h index 2596352dc..f0cc4470d 100644 --- a/src/declarativeimports/core/colorscope.h +++ b/src/declarativeimports/core/colorscope.h @@ -88,7 +88,7 @@ class ColorScope : public QQuickItem public: /// @cond INTERNAL_DOCS explicit ColorScope(QQuickItem *parent = nullptr, QObject *parentObject = nullptr); - ~ColorScope() Q_DECL_OVERRIDE; + ~ColorScope() override; void setColorGroup(Plasma::Theme::ColorGroup group); Plasma::Theme::ColorGroup colorGroup() const; @@ -110,7 +110,7 @@ public: /// @endcond ColorScope *findParentScope(); - void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; + void itemChange(ItemChange change, const ItemChangeData &value) override; bool eventFilter(QObject * watched, QEvent * event) override; diff --git a/src/declarativeimports/core/corebindingsplugin.h b/src/declarativeimports/core/corebindingsplugin.h index c6f5887f8..84e142fc7 100644 --- a/src/declarativeimports/core/corebindingsplugin.h +++ b/src/declarativeimports/core/corebindingsplugin.h @@ -34,8 +34,8 @@ class CoreBindingsPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE; - void registerTypes(const char *uri) Q_DECL_OVERRIDE; + void initializeEngine(QQmlEngine *engine, const char *uri) override; + void registerTypes(const char *uri) override; }; #endif diff --git a/src/declarativeimports/core/datamodel.h b/src/declarativeimports/core/datamodel.h index 52bb83e05..f48c4087e 100644 --- a/src/declarativeimports/core/datamodel.h +++ b/src/declarativeimports/core/datamodel.h @@ -139,7 +139,7 @@ Q_SIGNALS: protected: int roleNameToId(const QString &name) const; - bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const Q_DECL_OVERRIDE; + bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; protected Q_SLOTS: void syncRoleNames(); @@ -201,14 +201,14 @@ public: QString sourceFilter() const; //Reimplemented - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role) const override; QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int role = Qt::DisplayRole) const override; QModelIndex index(int row, int column, - const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; int count() const { diff --git a/src/declarativeimports/core/datasource.h b/src/declarativeimports/core/datasource.h index 42b662a54..253d3c927 100644 --- a/src/declarativeimports/core/datasource.h +++ b/src/declarativeimports/core/datasource.h @@ -58,8 +58,8 @@ public: explicit DataSource(QObject *parent = nullptr); - void classBegin() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void classBegin() override; + void componentComplete() override; /** * true if the connection to the Plasma DataEngine is valid diff --git a/src/declarativeimports/core/fadingnode.cpp b/src/declarativeimports/core/fadingnode.cpp index 7e5c381cd..690f3c9e4 100644 --- a/src/declarativeimports/core/fadingnode.cpp +++ b/src/declarativeimports/core/fadingnode.cpp @@ -37,9 +37,9 @@ public: FadingMaterialShader(); using QSGSimpleMaterialShader::updateState; virtual void updateState(const FadingMaterialState* newState, const FadingMaterialState* oldState) override; - QList attributes() const Q_DECL_OVERRIDE; + QList attributes() const override; - void initialize() Q_DECL_OVERRIDE; + void initialize() override; private: QOpenGLFunctions *glFuncs = nullptr; int m_progressId = 0; diff --git a/src/declarativeimports/core/framesvgitem.h b/src/declarativeimports/core/framesvgitem.h index c929b6da3..8bd64d11f 100644 --- a/src/declarativeimports/core/framesvgitem.h +++ b/src/declarativeimports/core/framesvgitem.h @@ -218,20 +218,20 @@ public: Plasma::Svg::Status status() const; void geometryChanged(const QRectF &newGeometry, - const QRectF &oldGeometry) Q_DECL_OVERRIDE; + const QRectF &oldGeometry) override; /** * Only to be used from inside this library, is not intended to be invokable */ Plasma::FrameSvg *frameSvg() const; - QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override; void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData & data) override; protected: - void classBegin() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void classBegin() override; + void componentComplete() override; /// @endcond diff --git a/src/declarativeimports/core/iconitem.h b/src/declarativeimports/core/iconitem.h index bf7ff25dc..5378e2acb 100644 --- a/src/declarativeimports/core/iconitem.h +++ b/src/declarativeimports/core/iconitem.h @@ -126,7 +126,7 @@ class IconItem : public QQuickItem public: explicit IconItem(QQuickItem *parent = nullptr); - ~IconItem() Q_DECL_OVERRIDE; + ~IconItem() override; void setSource(const QVariant &source); QVariant source() const; @@ -163,14 +163,14 @@ public: void setImplicitHeight2(int height); void setImplicitWidth2(int height); - void updatePolish() Q_DECL_OVERRIDE; - QSGNode* updatePaintNode(QSGNode * oldNode, UpdatePaintNodeData * updatePaintNodeData) Q_DECL_OVERRIDE; + void updatePolish() override; + QSGNode* updatePaintNode(QSGNode * oldNode, UpdatePaintNodeData * updatePaintNodeData) override; - void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; + void itemChange(ItemChange change, const ItemChangeData &value) override; void geometryChanged(const QRectF &newGeometry, - const QRectF &oldGeometry) Q_DECL_OVERRIDE; + const QRectF &oldGeometry) override; - void componentComplete() Q_DECL_OVERRIDE; + void componentComplete() override; Q_SIGNALS: void overlaysChanged(); diff --git a/src/declarativeimports/core/svgitem.h b/src/declarativeimports/core/svgitem.h index 2a814096a..4f3654f57 100644 --- a/src/declarativeimports/core/svgitem.h +++ b/src/declarativeimports/core/svgitem.h @@ -82,7 +82,7 @@ public: QSizeF naturalSize() const; - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) override; /// @endcond Q_SIGNALS: @@ -99,8 +99,8 @@ protected Q_SLOTS: private: void scheduleImageUpdate(); - void updatePolish() Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void updatePolish() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; QWeakPointer m_svg; QString m_elementID; diff --git a/src/declarativeimports/core/tooltip.h b/src/declarativeimports/core/tooltip.h index 543b6c5c6..efed9b8bd 100644 --- a/src/declarativeimports/core/tooltip.h +++ b/src/declarativeimports/core/tooltip.h @@ -128,7 +128,7 @@ class ToolTip : public QQuickItem public: /// @cond INTERNAL_DOCS explicit ToolTip(QQuickItem *parent = nullptr); - ~ToolTip() Q_DECL_OVERRIDE; + ~ToolTip() override; QQuickItem *mainItem() const; void setMainItem(QQuickItem *mainItem); @@ -169,9 +169,9 @@ public Q_SLOTS: protected: /// @cond INTERNAL_DOCS - bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE; - void hoverEnterEvent(QHoverEvent *event) Q_DECL_OVERRIDE; - void hoverLeaveEvent(QHoverEvent *event) Q_DECL_OVERRIDE; + bool childMouseEventFilter(QQuickItem *item, QEvent *event) override; + void hoverEnterEvent(QHoverEvent *event) override; + void hoverLeaveEvent(QHoverEvent *event) override; ToolTipDialog *tooltipDialogInstance(); /// @endcond diff --git a/src/declarativeimports/core/tooltipdialog.h b/src/declarativeimports/core/tooltipdialog.h index ce9011f7a..63c88a62d 100644 --- a/src/declarativeimports/core/tooltipdialog.h +++ b/src/declarativeimports/core/tooltipdialog.h @@ -44,7 +44,7 @@ class ToolTipDialog : public PlasmaQuick::Dialog public: explicit ToolTipDialog(QQuickItem *parent = nullptr); - ~ToolTipDialog() Q_DECL_OVERRIDE; + ~ToolTipDialog() override; QQuickItem *loadDefaultItem(); @@ -64,10 +64,10 @@ public: void setOwner(QObject *owner); protected: - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *re) Q_DECL_OVERRIDE; - bool event(QEvent *e) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; + void resizeEvent(QResizeEvent *re) override; + bool event(QEvent *e) override; private Q_SLOTS: void valueChanged(const QVariant &value); diff --git a/src/declarativeimports/core/units.h b/src/declarativeimports/core/units.h index a0a7e9f28..c373d566e 100644 --- a/src/declarativeimports/core/units.h +++ b/src/declarativeimports/core/units.h @@ -33,13 +33,13 @@ class SharedAppFilter : public QObject Q_OBJECT public: explicit SharedAppFilter(QObject *parent = nullptr); - ~SharedAppFilter() Q_DECL_OVERRIDE; + ~SharedAppFilter() override; Q_SIGNALS: void fontChanged(); protected: - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; }; /** diff --git a/src/declarativeimports/core/windowthumbnail.cpp b/src/declarativeimports/core/windowthumbnail.cpp index f9e955479..c6dcf90c8 100644 --- a/src/declarativeimports/core/windowthumbnail.cpp +++ b/src/declarativeimports/core/windowthumbnail.cpp @@ -57,7 +57,7 @@ public: QFunctionPointer, xcb_pixmap_t ); - void run() Q_DECL_OVERRIDE; + void run() override; private: uint m_texture; QFunctionPointer m_releaseTexImage; @@ -90,7 +90,7 @@ public: QFunctionPointer, EGLImageKHR ); - void run() Q_DECL_OVERRIDE; + void run() override; private: uint m_texture; QFunctionPointer m_eglDestroyImageKHR; diff --git a/src/declarativeimports/core/windowthumbnail.h b/src/declarativeimports/core/windowthumbnail.h index bd667af58..d63e0ffd9 100644 --- a/src/declarativeimports/core/windowthumbnail.h +++ b/src/declarativeimports/core/windowthumbnail.h @@ -84,8 +84,8 @@ class WindowThumbnail : public QQuickItem, public QAbstractNativeEventFilter public: WindowThumbnail(QQuickItem *parent = nullptr); virtual ~WindowThumbnail(); - bool nativeEventFilter(const QByteArray &eventType, void *message, long int *result) Q_DECL_OVERRIDE; - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) Q_DECL_OVERRIDE; + bool nativeEventFilter(const QByteArray &eventType, void *message, long int *result) override; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) override; uint32_t winId() const; void setWinId(uint32_t winId); @@ -100,7 +100,7 @@ Q_SIGNALS: void thumbnailAvailableChanged(); protected: - void releaseResources() Q_DECL_OVERRIDE; + void releaseResources() override; private: void iconToTexture(WindowTextureNode *textureNode); diff --git a/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.h b/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.h index 72ad046d0..2c46afa8c 100644 --- a/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.h +++ b/src/declarativeimports/plasmacomponents/plasmacomponentsplugin.h @@ -51,8 +51,8 @@ class PlasmaComponentsPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE; - void registerTypes(const char *uri) Q_DECL_OVERRIDE; + void initializeEngine(QQmlEngine *engine, const char *uri) override; + void registerTypes(const char *uri) override; }; #endif diff --git a/src/declarativeimports/plasmacomponents/qmenu.h b/src/declarativeimports/plasmacomponents/qmenu.h index 8a40b7751..a19768397 100644 --- a/src/declarativeimports/plasmacomponents/qmenu.h +++ b/src/declarativeimports/plasmacomponents/qmenu.h @@ -102,7 +102,7 @@ class QMenuProxy : public QObject public: explicit QMenuProxy(QObject *parent = nullptr); - ~QMenuProxy() Q_DECL_OVERRIDE; + ~QMenuProxy() override; QQmlListProperty content(); int actionCount() const; @@ -166,7 +166,7 @@ public: Q_INVOKABLE void removeMenuItem(QMenuItem *item); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; Q_SIGNALS: void statusChanged(); diff --git a/src/declarativeimports/plasmaextracomponents/appbackgroundprovider_p.h b/src/declarativeimports/plasmaextracomponents/appbackgroundprovider_p.h index fbd1d5655..6d1bed52f 100644 --- a/src/declarativeimports/plasmaextracomponents/appbackgroundprovider_p.h +++ b/src/declarativeimports/plasmaextracomponents/appbackgroundprovider_p.h @@ -37,8 +37,8 @@ class AppBackgroundProvider : public QQuickImageProvider public: AppBackgroundProvider(); - ~AppBackgroundProvider() Q_DECL_OVERRIDE; - QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE; + ~AppBackgroundProvider() override; + QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override; private: Plasma::Theme *m_theme; }; diff --git a/src/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h b/src/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h index c4cdd50d3..e1e2ecadf 100644 --- a/src/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h +++ b/src/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h @@ -31,8 +31,8 @@ class PlasmaExtraComponentsPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE; - void registerTypes(const char *uri) Q_DECL_OVERRIDE; + void initializeEngine(QQmlEngine *engine, const char *uri) override; + void registerTypes(const char *uri) override; }; #endif diff --git a/src/declarativeimports/platformcomponents/platformextensionplugin.cpp b/src/declarativeimports/platformcomponents/platformextensionplugin.cpp index 388480f90..1ee9d00c4 100644 --- a/src/declarativeimports/platformcomponents/platformextensionplugin.cpp +++ b/src/declarativeimports/platformcomponents/platformextensionplugin.cpp @@ -35,7 +35,7 @@ public: { } - void registerTypes(const char *uri) Q_DECL_OVERRIDE { + void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("org.kde.plasma.platformcomponents")); qmlRegisterType (uri, 2, 0, "Application"); diff --git a/src/plasma/applet.h b/src/plasma/applet.h index a03eb792d..a48b68dec 100644 --- a/src/plasma/applet.h +++ b/src/plasma/applet.h @@ -106,7 +106,7 @@ public: */ explicit Applet(const KPluginMetaData &metadata, QObject *parent = nullptr, uint appletId = 0); - ~Applet() Q_DECL_OVERRIDE; + ~Applet() override; //BOOKKEEPING /** @@ -675,7 +675,7 @@ protected: /** * Reimplemented from QObject */ - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; private: /** diff --git a/src/plasma/containment.h b/src/plasma/containment.h index 792910b4d..258ef409e 100644 --- a/src/plasma/containment.h +++ b/src/plasma/containment.h @@ -85,12 +85,12 @@ public: */ Containment(QObject *parent, const QVariantList &args); - ~Containment() Q_DECL_OVERRIDE; + ~Containment() override; /** * Reimplemented from Applet */ - void init() Q_DECL_OVERRIDE; + void init() override; /** * Returns the type of containment @@ -145,13 +145,13 @@ public: * @reimp * @sa Applet::save(KConfigGroup &) */ - void save(KConfigGroup &group) const Q_DECL_OVERRIDE; + void save(KConfigGroup &group) const override; /** * @reimp * @sa Applet::restore(KConfigGroup &) */ - void restore(KConfigGroup &group) Q_DECL_OVERRIDE; + void restore(KConfigGroup &group) override; /** * Sets wallpaper plugin. diff --git a/src/plasma/datacontainer.h b/src/plasma/datacontainer.h index e8a54a8fd..3d680584f 100644 --- a/src/plasma/datacontainer.h +++ b/src/plasma/datacontainer.h @@ -74,7 +74,7 @@ public: * associated with it **/ explicit DataContainer(QObject *parent = nullptr); - ~DataContainer() Q_DECL_OVERRIDE; + ~DataContainer() override; /** * Returns the data for this DataContainer @@ -275,7 +275,7 @@ protected Q_SLOTS: /** * @reimp from QObject */ - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; private: friend class SignalRelay; diff --git a/src/plasma/dataengine.h b/src/plasma/dataengine.h index 932a47202..497779ecb 100644 --- a/src/plasma/dataengine.h +++ b/src/plasma/dataengine.h @@ -77,7 +77,7 @@ public: explicit DataEngine(QObject *parent = nullptr, const QVariantList &args = QVariantList()); - ~DataEngine() Q_DECL_OVERRIDE; + ~DataEngine() override; /** * @return a list of all the data sources available via this DataEngine @@ -392,7 +392,7 @@ protected: /** * Reimplemented from QObject **/ - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; /** * Sets the icon for this data engine diff --git a/src/plasma/framesvg.h b/src/plasma/framesvg.h index 562edd95b..778b6cf33 100644 --- a/src/plasma/framesvg.h +++ b/src/plasma/framesvg.h @@ -104,13 +104,13 @@ public: * @related Plasma::Theme */ explicit FrameSvg(QObject *parent = nullptr); - ~FrameSvg() Q_DECL_OVERRIDE; + ~FrameSvg() override; /** * Loads a new Svg * @param imagePath the new file */ - Q_INVOKABLE void setImagePath(const QString &path) Q_DECL_OVERRIDE; + Q_INVOKABLE void setImagePath(const QString &path) override; /** * Sets what borders should be painted diff --git a/src/plasma/packagestructure/containmentactionspackage.cpp b/src/plasma/packagestructure/containmentactionspackage.cpp index 3258d6958..ebb34261a 100644 --- a/src/plasma/packagestructure/containmentactionspackage.cpp +++ b/src/plasma/packagestructure/containmentactionspackage.cpp @@ -30,7 +30,7 @@ class ContainmentActionsPackage : public Plasma::ChangeableMainScriptPackage public: ContainmentActionsPackage(QObject *parent = nullptr, const QVariantList &args = QVariantList()) : ChangeableMainScriptPackage(parent, args) {} - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE + void initPackage(KPackage::Package *package) override { ChangeableMainScriptPackage::initPackage(package); package->setDefaultPackageRoot(QStringLiteral(PLASMA_RELATIVE_DATA_INSTALL_DIR "/containmentactions/")); diff --git a/src/plasma/packagestructure/dataenginepackage.cpp b/src/plasma/packagestructure/dataenginepackage.cpp index ebde02974..79a42bb9b 100644 --- a/src/plasma/packagestructure/dataenginepackage.cpp +++ b/src/plasma/packagestructure/dataenginepackage.cpp @@ -31,7 +31,7 @@ class DataEnginePackage : public Plasma::ChangeableMainScriptPackage public: DataEnginePackage(QObject *parent = nullptr, const QVariantList &args = QVariantList()) : ChangeableMainScriptPackage(parent, args) {} - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE + void initPackage(KPackage::Package *package) override { ChangeableMainScriptPackage::initPackage(package); package->setDefaultPackageRoot(QStringLiteral(PLASMA_RELATIVE_DATA_INSTALL_DIR "/dataengines/")); diff --git a/src/plasma/packagestructure/packages_p.h b/src/plasma/packagestructure/packages_p.h index 53ed9a44f..ec2e939fb 100644 --- a/src/plasma/packagestructure/packages_p.h +++ b/src/plasma/packagestructure/packages_p.h @@ -34,8 +34,8 @@ class ChangeableMainScriptPackage : public KPackage::PackageStructure public: ChangeableMainScriptPackage(QObject *parent = nullptr, const QVariantList &args = QVariantList()) : KPackage::PackageStructure(parent, args) {} - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE; - void pathChanged(KPackage::Package *package) Q_DECL_OVERRIDE; + void initPackage(KPackage::Package *package) override; + void pathChanged(KPackage::Package *package) override; protected: virtual QString mainScriptConfigKey() const; @@ -46,7 +46,7 @@ class GenericPackage : public ChangeableMainScriptPackage Q_OBJECT public: GenericPackage(QObject *parent = nullptr, const QVariantList &args = QVariantList()) : ChangeableMainScriptPackage(parent, args) {} - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE; + void initPackage(KPackage::Package *package) override; }; } // namespace Plasma diff --git a/src/plasma/packagestructure/plasmathemepackage.cpp b/src/plasma/packagestructure/plasmathemepackage.cpp index 2321150f4..c375d4b45 100644 --- a/src/plasma/packagestructure/plasmathemepackage.cpp +++ b/src/plasma/packagestructure/plasmathemepackage.cpp @@ -30,7 +30,7 @@ class ThemePackage : public KPackage::PackageStructure public: ThemePackage(QObject *parent = nullptr, const QVariantList &args = QVariantList()) : KPackage::PackageStructure(parent, args) {} - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE + void initPackage(KPackage::Package *package) override { // by default the packages have "contents/" as contentsPrefixPaths // but for the themes we don't want that, so unset it. diff --git a/src/plasma/packagestructure/plasmoidpackage.cpp b/src/plasma/packagestructure/plasmoidpackage.cpp index 9adc68dcb..53366c1ab 100644 --- a/src/plasma/packagestructure/plasmoidpackage.cpp +++ b/src/plasma/packagestructure/plasmoidpackage.cpp @@ -31,7 +31,7 @@ class PlasmoidPackage : public Plasma::GenericPackage public: PlasmoidPackage(QObject *parent = nullptr, const QVariantList &args = QVariantList()) : GenericPackage(parent, args) {} - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE + void initPackage(KPackage::Package *package) override { GenericPackage::initPackage(package); package->setDefaultPackageRoot(QStringLiteral(PLASMA_RELATIVE_DATA_INSTALL_DIR "/plasmoids/")); @@ -40,7 +40,7 @@ public: package->addFileDefinition("mainconfigxml", QStringLiteral("config/main.xml"), i18n("Configuration XML file")); } - void pathChanged(KPackage::Package *package) Q_DECL_OVERRIDE + void pathChanged(KPackage::Package *package) override { ChangeableMainScriptPackage::pathChanged(package); diff --git a/src/plasma/private/datacontainer_p.h b/src/plasma/private/datacontainer_p.h index 58b83ca19..13d1c1dfa 100644 --- a/src/plasma/private/datacontainer_p.h +++ b/src/plasma/private/datacontainer_p.h @@ -124,7 +124,7 @@ Q_SIGNALS: void dataUpdated(const QString &, const Plasma::DataEngine::Data &); protected: - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; }; } // Plasma namespace diff --git a/src/plasma/private/dataenginemanager_p.h b/src/plasma/private/dataenginemanager_p.h index 850c526ba..ffe6dee10 100644 --- a/src/plasma/private/dataenginemanager_p.h +++ b/src/plasma/private/dataenginemanager_p.h @@ -74,7 +74,7 @@ protected: /** * Reimplemented from QObject **/ - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; private: /** @@ -82,7 +82,7 @@ private: * preferred access mechanism. */ DataEngineManager(); - ~DataEngineManager() Q_DECL_OVERRIDE; + ~DataEngineManager() override; DataEngineManagerPrivate *const d; diff --git a/src/plasma/private/effectwatcher_p.h b/src/plasma/private/effectwatcher_p.h index 378cf4dea..47b464a45 100644 --- a/src/plasma/private/effectwatcher_p.h +++ b/src/plasma/private/effectwatcher_p.h @@ -39,7 +39,7 @@ public: protected: bool isEffectActive() const; - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override; Q_SIGNALS: void effectChanged(bool on); diff --git a/src/plasma/private/packagestructure_p.h b/src/plasma/private/packagestructure_p.h index 7ee95d32c..6ab99890c 100644 --- a/src/plasma/private/packagestructure_p.h +++ b/src/plasma/private/packagestructure_p.h @@ -38,12 +38,12 @@ public: ~PackageStructureWrapper(); - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE; + void initPackage(KPackage::Package *package) override; - void pathChanged(KPackage::Package *package) Q_DECL_OVERRIDE; + void pathChanged(KPackage::Package *package) override; - KJob *install(KPackage::Package *package, const QString &archivePath, const QString &packageRoot) Q_DECL_OVERRIDE; - KJob *uninstall(KPackage::Package *package, const QString &packageRoot) Q_DECL_OVERRIDE; + KJob *install(KPackage::Package *package, const QString &archivePath, const QString &packageRoot) override; + KJob *uninstall(KPackage::Package *package, const QString &packageRoot) override; private: QPointer m_struct; diff --git a/src/plasma/private/service_p.h b/src/plasma/private/service_p.h index ce1d9e3af..4e9dd3bf0 100644 --- a/src/plasma/private/service_p.h +++ b/src/plasma/private/service_p.h @@ -42,7 +42,7 @@ public: { } - void start() Q_DECL_OVERRIDE + void start() override { setErrorText(i18nc("Error message, tried to start an invalid service", "Invalid (null) service, can not perform any operations.")); emitResult(); @@ -59,7 +59,7 @@ public: setName(QStringLiteral("NullService")); } - ServiceJob *createJob(const QString &operation, QVariantMap &) Q_DECL_OVERRIDE + ServiceJob *createJob(const QString &operation, QVariantMap &) override { return new NullServiceJob(destination(), operation, this); } diff --git a/src/plasma/private/storage_p.h b/src/plasma/private/storage_p.h index f92fd4c41..5c951e183 100644 --- a/src/plasma/private/storage_p.h +++ b/src/plasma/private/storage_p.h @@ -39,10 +39,10 @@ public: const QString &operation, const QVariantMap ¶meters, QObject *parent = nullptr); - ~StorageJob() Q_DECL_OVERRIDE; + ~StorageJob() override; void setData(const QVariantMap &data); QVariantMap data() const; - void start() Q_DECL_OVERRIDE; + void start() override; QString clientName() const; protected Q_SLOTS: @@ -63,10 +63,10 @@ class Storage : public Plasma::Service public: explicit Storage(QObject *parent = nullptr); - ~Storage() Q_DECL_OVERRIDE; + ~Storage() override; protected: - Plasma::ServiceJob *createJob(const QString &operation, QVariantMap ¶meters) Q_DECL_OVERRIDE; + Plasma::ServiceJob *createJob(const QString &operation, QVariantMap ¶meters) override; private: QString m_clientName; diff --git a/src/plasma/private/storagethread_p.h b/src/plasma/private/storagethread_p.h index b6850e3d3..c5ae8d933 100644 --- a/src/plasma/private/storagethread_p.h +++ b/src/plasma/private/storagethread_p.h @@ -34,9 +34,9 @@ class StorageThread : public QThread Q_OBJECT public: explicit StorageThread(QObject *parent = nullptr); - ~StorageThread() Q_DECL_OVERRIDE; + ~StorageThread() override; - void run() Q_DECL_OVERRIDE; + void run() override; static Plasma::StorageThread *self(); diff --git a/src/plasma/private/theme_p.h b/src/plasma/private/theme_p.h index a4e3161ad..68f3cfd22 100644 --- a/src/plasma/private/theme_p.h +++ b/src/plasma/private/theme_p.h @@ -64,7 +64,7 @@ class ThemePrivate : public QObject public: explicit ThemePrivate(QObject *parent = nullptr); - ~ThemePrivate() Q_DECL_OVERRIDE; + ~ThemePrivate() override; KConfigGroup &config(); @@ -119,7 +119,7 @@ public: KColorScheme buttonColorScheme; KColorScheme viewColorScheme; KColorScheme complementaryColorScheme; - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; KConfigGroup cfg; QString defaultWallpaperTheme; QString defaultWallpaperSuffix; diff --git a/src/plasma/scripting/appletscript.h b/src/plasma/scripting/appletscript.h index 1e9c38feb..fe3bbc808 100644 --- a/src/plasma/scripting/appletscript.h +++ b/src/plasma/scripting/appletscript.h @@ -58,7 +58,7 @@ public: * in the init() method. */ explicit AppletScript(QObject *parent = nullptr); - ~AppletScript() Q_DECL_OVERRIDE; + ~AppletScript() override; /** * Sets the applet associated with this AppletScript @@ -147,14 +147,14 @@ protected: /** * @return absolute path to the main script file for this plasmoid */ - QString mainScript() const Q_DECL_OVERRIDE; + QString mainScript() const override; /** * @return the Package associated with this plasmoid which can * be used to request resources, such as images and * interface files. */ - Package package() const Q_DECL_OVERRIDE; + Package package() const override; /** * @return the KPluginInfo associated with this plasmoid diff --git a/src/plasma/scripting/dataenginescript.h b/src/plasma/scripting/dataenginescript.h index b790fa222..aadcc3d3a 100644 --- a/src/plasma/scripting/dataenginescript.h +++ b/src/plasma/scripting/dataenginescript.h @@ -50,7 +50,7 @@ public: * in the init() method. */ explicit DataEngineScript(QObject *parent = nullptr); - ~DataEngineScript() Q_DECL_OVERRIDE; + ~DataEngineScript() override; /** * Sets the Plasma::DataEngine associated with this DataEngineScript @@ -101,14 +101,14 @@ protected: /** * @return absolute path to the main script file for this plasmoid */ - QString mainScript() const Q_DECL_OVERRIDE; + QString mainScript() const override; /** * @return the Package associated with this plasmoid which can * be used to request resources, such as images and * interface files. */ - Package package() const Q_DECL_OVERRIDE; + Package package() const override; /** * @return the KPluginInfo associated with this plasmoid diff --git a/src/plasma/servicejob.h b/src/plasma/servicejob.h index b0624b24d..33908c494 100644 --- a/src/plasma/servicejob.h +++ b/src/plasma/servicejob.h @@ -71,7 +71,7 @@ public: /** * Destructor */ - ~ServiceJob() Q_DECL_OVERRIDE; + ~ServiceJob() override; /** * @return the subject that the job is acting on @@ -105,7 +105,7 @@ public: * Default implementation of start, which simply sets the results to false. * This makes it easy to create a "failure" job. */ - Q_INVOKABLE void start() Q_DECL_OVERRIDE; + Q_INVOKABLE void start() override; protected: /** diff --git a/src/plasma/svg.h b/src/plasma/svg.h index 6c3475d4f..d3ca3ea59 100644 --- a/src/plasma/svg.h +++ b/src/plasma/svg.h @@ -86,7 +86,7 @@ public: * @related Plasma::Theme */ explicit Svg(QObject *parent = nullptr); - ~Svg() Q_DECL_OVERRIDE; + ~Svg() override; /** * Set the device pixel ratio for the Svg. This is the ratio between @@ -501,7 +501,7 @@ Q_SIGNALS: private: SvgPrivate *const d; - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; Q_PRIVATE_SLOT(d, void themeChanged()) Q_PRIVATE_SLOT(d, void colorsChanged()) diff --git a/src/plasmaquick/appletquickitem.h b/src/plasmaquick/appletquickitem.h index 9bb8be969..7c88b500c 100644 --- a/src/plasmaquick/appletquickitem.h +++ b/src/plasmaquick/appletquickitem.h @@ -94,7 +94,7 @@ class PLASMAQUICK_EXPORT AppletQuickItem : public QQuickItem public: AppletQuickItem(Plasma::Applet *applet, QQuickItem *parent = nullptr); - ~AppletQuickItem() Q_DECL_OVERRIDE; + ~AppletQuickItem() override; ////API NOT SUPPOSED TO BE USED BY QML Plasma::Applet *applet() const; @@ -157,9 +157,9 @@ protected: KDeclarative::QmlObject *qmlObject(); //Reimplementation - void childEvent(QChildEvent *event) Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; + void childEvent(QChildEvent *event) override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void itemChange(ItemChange change, const ItemChangeData &value) override; private: AppletQuickItemPrivate *const d; diff --git a/src/plasmaquick/configmodel.h b/src/plasmaquick/configmodel.h index dbf4841ec..fb5b571ad 100644 --- a/src/plasmaquick/configmodel.h +++ b/src/plasmaquick/configmodel.h @@ -74,7 +74,7 @@ public: KCMRole }; explicit ConfigModel(QObject *parent = nullptr); - ~ConfigModel() Q_DECL_OVERRIDE; + ~ConfigModel() override; /** * add a new category in the model @@ -103,9 +103,9 @@ public: { return rowCount(); } - int rowCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &, int) const Q_DECL_OVERRIDE; - QHash roleNames() const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &index = QModelIndex()) const override; + QVariant data(const QModelIndex &, int) const override; + QHash roleNames() const override; /** * @param row the row for which the data will be returned diff --git a/src/plasmaquick/configview.h b/src/plasmaquick/configview.h index 985c5d8bf..52dea11c8 100644 --- a/src/plasmaquick/configview.h +++ b/src/plasmaquick/configview.h @@ -59,7 +59,7 @@ public: * @param parent the QWindow in which this ConfigView is parented to **/ ConfigView(Plasma::Applet *applet, QWindow *parent = nullptr); - ~ConfigView() Q_DECL_OVERRIDE; + ~ConfigView() override; virtual void init(); @@ -77,8 +77,8 @@ Q_SIGNALS: void appletGlobalShortcutChanged(); protected: - void hideEvent(QHideEvent *ev) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *re) Q_DECL_OVERRIDE; + void hideEvent(QHideEvent *ev) override; + void resizeEvent(QResizeEvent *re) override; private: ConfigViewPrivate *const d; diff --git a/src/plasmaquick/dialog.h b/src/plasmaquick/dialog.h index 5482b6d8f..27eb84a98 100644 --- a/src/plasmaquick/dialog.h +++ b/src/plasmaquick/dialog.h @@ -168,7 +168,7 @@ public: Q_ENUM(BackgroundHints) explicit Dialog(QQuickItem *parent = nullptr); - ~Dialog() Q_DECL_OVERRIDE; + ~Dialog() override; //PROPERTIES ACCESSORS QQuickItem *mainItem() const; @@ -229,14 +229,14 @@ protected: virtual void adjustGeometry(const QRect &geom); //Reimplementations - void classBegin() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *re) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *ev) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *ev) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void classBegin() override; + void componentComplete() override; + void resizeEvent(QResizeEvent *re) override; + void focusInEvent(QFocusEvent *ev) override; + void focusOutEvent(QFocusEvent *ev) override; + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; + bool event(QEvent *event) override; private: friend class DialogPrivate; diff --git a/src/plasmaquick/packageurlinterceptor.h b/src/plasmaquick/packageurlinterceptor.h index 5816bb154..b97ef038a 100644 --- a/src/plasmaquick/packageurlinterceptor.h +++ b/src/plasmaquick/packageurlinterceptor.h @@ -49,7 +49,7 @@ class PLASMAQUICK_EXPORT PackageUrlInterceptor: public QQmlAbstractUrlIntercepto { public: PackageUrlInterceptor(QQmlEngine *engine, const KPackage::Package &p); - ~PackageUrlInterceptor() Q_DECL_OVERRIDE; + ~PackageUrlInterceptor() override; void addAllowedPath(const QString &path); void removeAllowedPath(const QString &path); @@ -58,7 +58,7 @@ public: bool forcePlasmaStyle() const; void setForcePlasmaStyle(bool force); - QUrl intercept(const QUrl &path, QQmlAbstractUrlInterceptor::DataType type) Q_DECL_OVERRIDE; + QUrl intercept(const QUrl &path, QQmlAbstractUrlInterceptor::DataType type) override; static inline QByteArray prefixForType(QQmlAbstractUrlInterceptor::DataType type, const QString &fileName) { diff --git a/src/plasmaquick/private/packages.h b/src/plasmaquick/private/packages.h index 144f5009c..bdd02b7b7 100644 --- a/src/plasmaquick/private/packages.h +++ b/src/plasmaquick/private/packages.h @@ -29,21 +29,21 @@ class LookAndFeelPackage : public Plasma::PackageStructure { Q_OBJECT public: - void initPackage(Plasma::Package *package) Q_DECL_OVERRIDE; + void initPackage(Plasma::Package *package) override; }; class QmlWallpaperPackage : public Plasma::PackageStructure { Q_OBJECT public: - void initPackage(Plasma::Package *package) Q_DECL_OVERRIDE; + void initPackage(Plasma::Package *package) override; }; class LayoutTemplatePackage : public Plasma::PackageStructure { Q_OBJECT public: - void initPackage(Plasma::Package *package) Q_DECL_OVERRIDE; + void initPackage(Plasma::Package *package) override; }; #endif // LOOKANDFEELPACKAGE_H diff --git a/src/plasmaquick/shellpluginloader.h b/src/plasmaquick/shellpluginloader.h index e7cfae75d..18a8815f3 100644 --- a/src/plasmaquick/shellpluginloader.h +++ b/src/plasmaquick/shellpluginloader.h @@ -31,12 +31,12 @@ class PLASMAQUICK_DEPRECATED_EXPORT ShellPluginLoader : public Plasma::PluginLoa { public: ShellPluginLoader(); - ~ShellPluginLoader() Q_DECL_OVERRIDE; + ~ShellPluginLoader() override; static void init(); protected: - Plasma::Package internalLoadPackage(const QString &packageFormat, const QString &specialization) Q_DECL_OVERRIDE; + Plasma::Package internalLoadPackage(const QString &packageFormat, const QString &specialization) override; }; #endif diff --git a/src/scriptengines/qml/plasmoid/appletinterface.h b/src/scriptengines/qml/plasmoid/appletinterface.h index 005826966..7423c43cf 100644 --- a/src/scriptengines/qml/plasmoid/appletinterface.h +++ b/src/scriptengines/qml/plasmoid/appletinterface.h @@ -240,7 +240,7 @@ class AppletInterface : public PlasmaQuick::AppletQuickItem public: AppletInterface(DeclarativeAppletScript *script, const QVariantList &args = QVariantList(), QQuickItem *parent = nullptr); - ~AppletInterface() Q_DECL_OVERRIDE; + ~AppletInterface() override; //API not intended for the QML part @@ -441,11 +441,11 @@ Q_SIGNALS: void configurationRequiredReasonChanged(); protected Q_SLOTS: - void init() Q_DECL_OVERRIDE; + void init() override; protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool eventFilter(QObject *watched, QEvent *event) override; private Q_SLOTS: void destroyedChanged(bool destroyed); diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.h b/src/scriptengines/qml/plasmoid/containmentinterface.h index 4f4008dc2..ea2245375 100644 --- a/src/scriptengines/qml/plasmoid/containmentinterface.h +++ b/src/scriptengines/qml/plasmoid/containmentinterface.h @@ -158,11 +158,11 @@ public: } protected: - void init() Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void init() override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; void addAppletActions(QMenu *desktopMenu, Plasma::Applet *applet, QEvent *event); void addContainmentActions(QMenu *desktopMenu, QEvent *event); diff --git a/src/scriptengines/qml/plasmoid/declarativeappletscript.h b/src/scriptengines/qml/plasmoid/declarativeappletscript.h index a7d81398d..66d35dcea 100644 --- a/src/scriptengines/qml/plasmoid/declarativeappletscript.h +++ b/src/scriptengines/qml/plasmoid/declarativeappletscript.h @@ -34,19 +34,19 @@ class DeclarativeAppletScript : public Plasma::AppletScript public: DeclarativeAppletScript(QObject *parent, const QVariantList &args); - ~DeclarativeAppletScript() Q_DECL_OVERRIDE; + ~DeclarativeAppletScript() override; QString filePath(const QString &type, const QString &file) const; - QList contextualActions() Q_DECL_OVERRIDE; + QList contextualActions() override; - void constraintsEvent(Plasma::Types::Constraints constraints) Q_DECL_OVERRIDE; + void constraintsEvent(Plasma::Types::Constraints constraints) override; public Q_SLOTS: void executeAction(const QString &name); protected: - bool init() Q_DECL_OVERRIDE; + bool init() override; Q_SIGNALS: void formFactorChanged(); diff --git a/tests/testengine/testengine.h b/tests/testengine/testengine.h index ade92bcdb..1c5b55751 100644 --- a/tests/testengine/testengine.h +++ b/tests/testengine/testengine.h @@ -41,7 +41,7 @@ public: protected: void init(); - bool sourceRequestEvent(const QString &source) Q_DECL_OVERRIDE; + bool sourceRequestEvent(const QString &source) override; }; #endif // __TESTDATAENGINE_H__