diff --git a/containments/desktop/plugins/folder/foldermodel.h b/containments/desktop/plugins/folder/foldermodel.h --- a/containments/desktop/plugins/folder/foldermodel.h +++ b/containments/desktop/plugins/folder/foldermodel.h @@ -68,7 +68,7 @@ void error(const QString &string); protected: - void handleError(KIO::Job *job) Q_DECL_OVERRIDE; + void handleError(KIO::Job *job) override; }; class FOLDERPLUGIN_TESTS_EXPORT FolderModel : public QSortFilterProxyModel diff --git a/containments/desktop/plugins/folder/folderplugin.h b/containments/desktop/plugins/folder/folderplugin.h --- a/containments/desktop/plugins/folder/folderplugin.h +++ b/containments/desktop/plugins/folder/folderplugin.h @@ -28,7 +28,7 @@ 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 // FOLDERPLUGIN_H diff --git a/containments/desktop/plugins/folder/itemviewadapter.h b/containments/desktop/plugins/folder/itemviewadapter.h --- a/containments/desktop/plugins/folder/itemviewadapter.h +++ b/containments/desktop/plugins/folder/itemviewadapter.h @@ -36,12 +36,12 @@ public: explicit ItemViewAdapter(QObject* parent = nullptr); - QAbstractItemModel *model() const Q_DECL_OVERRIDE; - QSize iconSize() const Q_DECL_OVERRIDE; - QPalette palette() const Q_DECL_OVERRIDE; - QRect visibleArea() const Q_DECL_OVERRIDE; - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void connect(Signal signal, QObject *receiver, const char *slot) Q_DECL_OVERRIDE; + QAbstractItemModel *model() const override; + QSize iconSize() const override; + QPalette palette() const override; + QRect visibleArea() const override; + QRect visualRect(const QModelIndex &index) const override; + void connect(Signal signal, QObject *receiver, const char *slot) override; QObject *adapterView() const; void setAdapterView(QObject *view); diff --git a/containments/desktop/plugins/folder/positioner.h b/containments/desktop/plugins/folder/positioner.h --- a/containments/desktop/plugins/folder/positioner.h +++ b/containments/desktop/plugins/folder/positioner.h @@ -66,10 +66,10 @@ Q_INVOKABLE void move(const QVariantList &moves); - QHash roleNames() const Q_DECL_OVERRIDE; + QHash roleNames() const override; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; - QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &index) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; diff --git a/containments/desktop/plugins/folder/wheelinterceptor.h b/containments/desktop/plugins/folder/wheelinterceptor.h --- a/containments/desktop/plugins/folder/wheelinterceptor.h +++ b/containments/desktop/plugins/folder/wheelinterceptor.h @@ -40,7 +40,7 @@ void destinationChanged() const; protected: - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *event) override; private: QPointer m_destination;