Q_DECL_OVERRIDE

61 files changed, 227 insertions, 246 deletions

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 8ed22dda5..f7f3a231a 100644
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -89,8 +89,8 @@ public:
     Command open();
 
 protected:
-    virtual void keyPressEvent(QKeyEvent *ev);
-    virtual void keyReleaseEvent(QKeyEvent *ev);
+    virtual void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
+    virtual void keyReleaseEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
 
 private:
     void openTrashContextMenu();
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index c9b559439..df04cee69 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -623,7 +623,7 @@ void DolphinMainWindow::goHome()
 void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goBack().
-    if (buttons == Qt::MidButton) {
+    if (buttons == Qt::MiddleButton) {
         KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
         const int index = urlNavigator->historyIndex() + 1;
         openNewTab(urlNavigator->locationUrl(index));
@@ -633,7 +633,7 @@ void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
 void DolphinMainWindow::goForward(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goForward().
-    if (buttons == Qt::MidButton) {
+    if (buttons == Qt::MiddleButton) {
         KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
         const int index = urlNavigator->historyIndex() - 1;
         openNewTab(urlNavigator->locationUrl(index));
@@ -643,7 +643,7 @@ void DolphinMainWindow::goForward(Qt::MouseButtons buttons)
 void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goUp().
-    if (buttons == Qt::MidButton) {
+    if (buttons == Qt::MiddleButton) {
         openNewTab(KIO::upUrl(activeViewContainer()->url()));
     }
 }
@@ -651,7 +651,7 @@ void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
 void DolphinMainWindow::goHome(Qt::MouseButtons buttons)
 {
     // The default case (left button pressed) is handled in goHome().
-    if (buttons == Qt::MidButton) {
+    if (buttons == Qt::MiddleButton) {
         openNewTab(GeneralSettings::self()->homeUrl());
     }
 }
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 12933f9ce..462d3d362 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -147,16 +147,16 @@ signals:
 
 protected:
     /** @see QWidget::showEvent() */
-    virtual void showEvent(QShowEvent* event);
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
     /** @see QMainWindow::closeEvent() */
-    virtual void closeEvent(QCloseEvent* event);
+    virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;
 
     /** @see KMainWindow::saveProperties() */
-    virtual void saveProperties(KConfigGroup& group);
+    virtual void saveProperties(KConfigGroup& group) Q_DECL_OVERRIDE;
 
     /** @see KMainWindow::readProperties() */
-    virtual void readProperties(const KConfigGroup& group);
+    virtual void readProperties(const KConfigGroup& group) Q_DECL_OVERRIDE;
 
 private slots:
     /**
@@ -494,7 +494,7 @@ private:
     public:
         UndoUiInterface();
         virtual ~UndoUiInterface();
-        virtual void jobError(KIO::Job* job);
+        virtual void jobError(KIO::Job* job) Q_DECL_OVERRIDE;
     };
 
     KNewFileMenu* m_newFileMenu;
diff --git a/src/dolphinnewfilemenu.h b/src/dolphinnewfilemenu.h
index e211dfd88..254571eb9 100644
--- a/src/dolphinnewfilemenu.h
+++ b/src/dolphinnewfilemenu.h
@@ -48,7 +48,7 @@ signals:
 
 protected slots:
     /** @see KNewFileMenu::slotResult() */
-    virtual void slotResult(KJob* job);
+    virtual void slotResult(KJob* job) Q_DECL_OVERRIDE;
 };
 
 #endif
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 0e3f68336..1c79a5980 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -204,16 +204,16 @@ void DolphinPart::createActions()
             this, &DolphinPart::slotGoTriggered);
 
     createGoAction("go_applications", "start-here-kde",
-                   i18nc("@action:inmenu Go", "App&lications"), QString("programs:/"),
+                   i18nc("@action:inmenu Go", "App&lications"), QStringLiteral("programs:/"),
                    goActionGroup);
     createGoAction("go_network_folders", "folder-remote",
-                   i18nc("@action:inmenu Go", "&Network Folders"), QString("remote:/"),
+                   i18nc("@action:inmenu Go", "&Network Folders"), QStringLiteral("remote:/"),
                    goActionGroup);
     createGoAction("go_settings", "preferences-system",
-                   i18nc("@action:inmenu Go", "Sett&ings"), QString("settings:/"),
+                   i18nc("@action:inmenu Go", "Sett&ings"), QStringLiteral("settings:/"),
                    goActionGroup);
     createGoAction("go_trash", "user-trash",
-                   i18nc("@action:inmenu Go", "Trash"), QString("trash:/"),
+                   i18nc("@action:inmenu Go", "Trash"), QStringLiteral("trash:/"),
                    goActionGroup);
     createGoAction("go_autostart", "",
                    i18nc("@action:inmenu Go", "Autostart"), QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/autostart",
diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 9439a17bc..9f0ed5570 100644
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -223,7 +223,7 @@ private Q_SLOTS:
     void setFilesToSelect(const QList<QUrl> &files);
     QList<QUrl> filesToSelect() const { return QList<QUrl>(); } // silence moc
 
-    virtual bool eventFilter(QObject*, QEvent*);
+    virtual bool eventFilter(QObject*, QEvent*) Q_DECL_OVERRIDE;
 
 private:
     void createActions();
diff --git a/src/dolphinpart_ext.h b/src/dolphinpart_ext.h
index bebde3ada..6adf64972 100644
--- a/src/dolphinpart_ext.h
+++ b/src/dolphinpart_ext.h
@@ -32,8 +32,8 @@ class DolphinPartBrowserExtension : public KParts::BrowserExtension
     Q_OBJECT
 public:
     DolphinPartBrowserExtension( DolphinPart* part );
-    virtual void restoreState(QDataStream &stream);
-    virtual void saveState(QDataStream &stream);
+    virtual void restoreState(QDataStream &stream) Q_DECL_OVERRIDE;
+    virtual void saveState(QDataStream &stream) Q_DECL_OVERRIDE;
 
 public Q_SLOTS:
     void cut();
@@ -53,10 +53,10 @@ class DolphinPartFileInfoExtension : public KParts::FileInfoExtension
 public:
     DolphinPartFileInfoExtension(DolphinPart* part);
 
-    virtual QueryModes supportedQueryModes() const;
-    virtual bool hasSelection() const;
+    virtual QueryModes supportedQueryModes() const Q_DECL_OVERRIDE;
+    virtual bool hasSelection() const Q_DECL_OVERRIDE;
 
-    virtual KFileItemList queryFor(QueryMode mode) const;
+    virtual KFileItemList queryFor(QueryMode mode) const Q_DECL_OVERRIDE;
 
 private:
     DolphinPart* m_part;
@@ -68,10 +68,10 @@ class DolphinPartListingFilterExtension : public KParts::ListingFilterExtension
 
 public:
     DolphinPartListingFilterExtension(DolphinPart* part);
-    virtual FilterModes supportedFilterModes() const;
-    virtual bool supportsMultipleFilters(FilterMode mode) const;
-    virtual QVariant filter(FilterMode mode) const;
-    virtual void setFilter(FilterMode mode, const QVariant& filter);
+    virtual FilterModes supportedFilterModes() const Q_DECL_OVERRIDE;
+    virtual bool supportsMultipleFilters(FilterMode mode) const Q_DECL_OVERRIDE;
+    virtual QVariant filter(FilterMode mode) const Q_DECL_OVERRIDE;
+    virtual void setFilter(FilterMode mode, const QVariant& filter) Q_DECL_OVERRIDE;
 
 private:
     DolphinPart* m_part;
@@ -83,7 +83,7 @@ class DolphinPartListingNotificationExtension : public KParts::ListingNotificati
 
 public:
     DolphinPartListingNotificationExtension(DolphinPart* part);
-    virtual NotificationEventTypes supportedNotificationEventTypes() const;
+    virtual NotificationEventTypes supportedNotificationEventTypes() const Q_DECL_OVERRIDE;
 
 public Q_SLOTS:
     void slotNewItems(const KFileItemList&);
diff --git a/src/dolphintabbar.h b/src/dolphintabbar.h
index d2b2e9e57..6daa9a1ad 100644
--- a/src/dolphintabbar.h
+++ b/src/dolphintabbar.h
@@ -35,17 +35,17 @@ signals:
     void tabDetachRequested(int index);
 
 protected:
-    virtual void dragEnterEvent(QDragEnterEvent* event);
-    virtual void dragLeaveEvent(QDragLeaveEvent* event);
-    virtual void dragMoveEvent(QDragMoveEvent* event);
-    virtual void dropEvent(QDropEvent* event);
-    virtual void mousePressEvent(QMouseEvent* event);
-    virtual void mouseDoubleClickEvent(QMouseEvent* event);
+    virtual void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE;
+    virtual void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE;
+    virtual void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE;
+    virtual void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE;
+    virtual void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
+    virtual void mouseDoubleClickEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
 
     /**
      * Opens a context menu for the tab on the \a event position.
      */
-    virtual void contextMenuEvent(QContextMenuEvent* event);
+    virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void slotAutoActivationTimeout();
diff --git a/src/dolphintabwidget.h b/src/dolphintabwidget.h
index 93213ac61..a84b7facb 100644
--- a/src/dolphintabwidget.h
+++ b/src/dolphintabwidget.h
@@ -173,8 +173,8 @@ private slots:
     void currentTabChanged(int index);
 
 protected:
-    virtual void tabInserted(int index);
-    virtual void tabRemoved(int index);
+    virtual void tabInserted(int index) Q_DECL_OVERRIDE;
+    virtual void tabRemoved(int index) Q_DECL_OVERRIDE;
 
 private:
     /**
diff --git a/src/filterbar/filterbar.h b/src/filterbar/filterbar.h
index 5d5463a28..dd9b8b8bb 100644
--- a/src/filterbar/filterbar.h
+++ b/src/filterbar/filterbar.h
@@ -74,8 +74,8 @@ signals:
     void focusViewRequest();
 
 protected:
-    virtual void showEvent(QShowEvent* event);
-    virtual void keyReleaseEvent(QKeyEvent* event);
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
 
 private:
     KLineEdit* m_filterInput;
diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h
index 2fd21edbf..9f07c9d8d 100644
--- a/src/kitemviews/kfileitemlistview.h
+++ b/src/kitemviews/kfileitemlistview.h
@@ -72,28 +72,27 @@ public:
      */
     QStringList enabledPlugins() const;
 
-    /** @reimp */
-    virtual QPixmap createDragPixmap(const KItemSet& indexes) const;
+    virtual QPixmap createDragPixmap(const KItemSet& indexes) const Q_DECL_OVERRIDE;
 
 protected:
-    virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const;
-    virtual void initializeItemListWidget(KItemListWidget* item);
+    virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE;
+    virtual void initializeItemListWidget(KItemListWidget* item) Q_DECL_OVERRIDE;
     virtual void onPreviewsShownChanged(bool shown);
-    virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous);
-    virtual void onModelChanged(KItemModelBase* current, KItemModelBase* previous);
-    virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);
-    virtual void onItemSizeChanged(const QSizeF& current, const QSizeF& previous);
-    virtual void onScrollOffsetChanged(qreal current, qreal previous);
-    virtual void onVisibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous);
-    virtual void onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous);
-    virtual void onSupportsItemExpandingChanged(bool supportsExpanding);
-    virtual void onTransactionBegin();
-    virtual void onTransactionEnd();
-    virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
+    virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous) Q_DECL_OVERRIDE;
+    virtual void onModelChanged(KItemModelBase* current, KItemModelBase* previous) Q_DECL_OVERRIDE;
+    virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) Q_DECL_OVERRIDE;
+    virtual void onItemSizeChanged(const QSizeF& current, const QSizeF& previous) Q_DECL_OVERRIDE;
+    virtual void onScrollOffsetChanged(qreal current, qreal previous) Q_DECL_OVERRIDE;
+    virtual void onVisibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) Q_DECL_OVERRIDE;
+    virtual void onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) Q_DECL_OVERRIDE;
+    virtual void onSupportsItemExpandingChanged(bool supportsExpanding) Q_DECL_OVERRIDE;
+    virtual void onTransactionBegin() Q_DECL_OVERRIDE;
+    virtual void onTransactionEnd() Q_DECL_OVERRIDE;
+    virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE;
 
 protected slots:
-    virtual void slotItemsRemoved(const KItemRangeList& itemRanges);
-    virtual void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous);
+    virtual void slotItemsRemoved(const KItemRangeList& itemRanges) Q_DECL_OVERRIDE;
+    virtual void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE;
 
 private slots:
     void triggerVisibleIndexRangeUpdate();
diff --git a/src/kitemviews/kfileitemlistwidget.h b/src/kitemviews/kfileitemlistwidget.h
index 8e8958b16..b7061d38c 100644
--- a/src/kitemviews/kfileitemlistwidget.h
+++ b/src/kitemviews/kfileitemlistwidget.h
@@ -31,10 +31,10 @@ public:
     virtual ~KFileItemListWidgetInformant();
 
 protected:
-    virtual QString itemText(int index, const KItemListView* view) const;
-    virtual bool itemIsLink(int index, const KItemListView* view) const;
-    virtual QString roleText(const QByteArray& role, const QHash<QByteArray, QVariant>& values) const;
-    virtual QFont customizedFontForLinks(const QFont& baseFont) const;
+    virtual QString itemText(int index, const KItemListView* view) const Q_DECL_OVERRIDE;
+    virtual bool itemIsLink(int index, const KItemListView* view) const Q_DECL_OVERRIDE;
+    virtual QString roleText(const QByteArray& role, const QHash<QByteArray, QVariant>& values) const Q_DECL_OVERRIDE;
+    virtual QFont customizedFontForLinks(const QFont& baseFont) const Q_DECL_OVERRIDE;
 };
 
 class LIBDOLPHINPRIVATE_EXPORT KFileItemListWidget : public KStandardItemListWidget
@@ -48,14 +48,14 @@ public:
     static KItemListWidgetInformant* createInformant();
 
 protected:
-    virtual bool isRoleRightAligned(const QByteArray& role) const;
-    virtual bool isHidden() const;
-    virtual QFont customizedFont(const QFont& baseFont) const;
+    virtual bool isRoleRightAligned(const QByteArray& role) const Q_DECL_OVERRIDE;
+    virtual bool isHidden() const Q_DECL_OVERRIDE;
+    virtual QFont customizedFont(const QFont& baseFont) const Q_DECL_OVERRIDE;
 
     /**
      * @return Selection length without MIME-type extension
      */
-    virtual int selectionLength(const QString& text) const;
+    virtual int selectionLength(const QString& text) const Q_DECL_OVERRIDE;
 };
 
 #endif
diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index 1a4f6928e..535e0f3e4 100644
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -78,9 +78,9 @@ public:
      */
     void cancelDirectoryLoading();
 
-    virtual int count() const;
-    virtual QHash<QByteArray, QVariant> data(int index) const;
-    virtual bool setData(int index, const QHash<QByteArray, QVariant>& values);
+    virtual int count() const Q_DECL_OVERRIDE;
+    virtual QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE;
+    virtual bool setData(int index, const QHash<QByteArray, QVariant>& values) Q_DECL_OVERRIDE;
 
     /**
      * Sets a separate sorting with directories first (true) or a mixed
@@ -99,20 +99,15 @@ public:
     void setShowDirectoriesOnly(bool enabled);
     bool showDirectoriesOnly() const;
 
-    /** @reimp */
-    virtual QMimeData* createMimeData(const KItemSet& indexes) const;
+    virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE;
 
-    /** @reimp */
-    virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const;
+    virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const Q_DECL_OVERRIDE;
 
-    /** @reimp */
-    virtual bool supportsDropping(int index) const;
+    virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE;
 
-    /** @reimp */
-    virtual QString roleDescription(const QByteArray& role) const;
+    virtual QString roleDescription(const QByteArray& role) const Q_DECL_OVERRIDE;
 
-    /** @reimp */
-    virtual QList<QPair<int, QVariant> > groups() const;
+    virtual QList<QPair<int, QVariant> > groups() const Q_DECL_OVERRIDE;
 
     /**
      * @return The file-item for the index \a index. If the index is in a valid
@@ -158,10 +153,10 @@ public:
     void setRoles(const QSet<QByteArray>& roles);
     QSet<QByteArray> roles() const;
 
-    virtual bool setExpanded(int index, bool expanded);
-    virtual bool isExpanded(int index) const;
-    virtual bool isExpandable(int index) const;
-    virtual int expandedParentsCount(int index) const;
+    virtual bool setExpanded(int index, bool expanded) Q_DECL_OVERRIDE;
+    virtual bool isExpanded(int index) const Q_DECL_OVERRIDE;
+    virtual bool isExpandable(int index) const Q_DECL_OVERRIDE;
+    virtual int expandedParentsCount(int index) const Q_DECL_OVERRIDE;
 
     QSet<QUrl> expandedDirectories() const;
 
@@ -260,9 +255,9 @@ signals:
     void urlIsFileError(const QUrl& url);
 
 protected:
-    virtual void onGroupedSortingChanged(bool current);
-    virtual void onSortRoleChanged(const QByteArray& current, const QByteArray& previous);
-    virtual void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous);
+    virtual void onGroupedSortingChanged(bool current) Q_DECL_OVERRIDE;
+    virtual void onSortRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE;
+    virtual void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) Q_DECL_OVERRIDE;
 
 private slots:
     /**
diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h
index 3373059d1..55a9a118f 100644
--- a/src/kitemviews/kitemlistcontainer.h
+++ b/src/kitemviews/kitemlistcontainer.h
@@ -58,11 +58,11 @@ public:
     bool enabledFrame() const;
 
 protected:
-    virtual void keyPressEvent(QKeyEvent* event);
-    virtual void showEvent(QShowEvent* event);
-    virtual void resizeEvent(QResizeEvent* event);
-    virtual void scrollContentsBy(int dx, int dy);
-    virtual void wheelEvent(QWheelEvent* event);
+    virtual void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
+    virtual void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE;
+    virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);
diff --git a/src/kitemviews/kitemlistgroupheader.h b/src/kitemviews/kitemlistgroupheader.h
index 1e8ed2cca..66fe929dd 100644
--- a/src/kitemviews/kitemlistgroupheader.h
+++ b/src/kitemviews/kitemlistgroupheader.h
@@ -65,7 +65,7 @@ public:
     void setItemIndex(int index);
     int itemIndex() const;
 
-    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE;
 
 protected:
     virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) = 0;
@@ -101,8 +101,7 @@ protected:
      */
     virtual void itemIndexChanged(int current, int previous);
 
-    /** @reimp */
-    virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
+    virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE;
 
     virtual QPalette::ColorRole normalTextColorRole() const;
     virtual QPalette::ColorRole normalBaseColorRole() const;
diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index c8054a691..cc0754f2a 100644
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -160,8 +160,7 @@ public:
 
     const KItemListStyleOption& styleOption() const;
 
-    /** @reimp */
-    virtual void setGeometry(const QRectF& rect);
+    virtual void setGeometry(const QRectF& rect) Q_DECL_OVERRIDE;
 
     /**
      * @return The page step which should be used by the vertical scroll bar.
@@ -279,10 +278,7 @@ public:
      */
     void editRole(int index, const QByteArray& role);
 
-    /**
-     * @reimp
-     */
-    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE;
 
 signals:
     void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);
@@ -322,7 +318,7 @@ signals:
     void roleEditingFinished(int index, const QByteArray& role, const QVariant& value);
 
 protected:
-    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE;
     void setItemSize(const QSizeF& size);
     void setStyleOption(const KItemListStyleOption& option);
 
@@ -379,13 +375,13 @@ protected:
     virtual void onTransactionBegin();
     virtual void onTransactionEnd();
 
-    virtual bool event(QEvent* event);
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent* event);
-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
-    virtual void dragEnterEvent(QGraphicsSceneDragDropEvent* event);
-    virtual void dragMoveEvent(QGraphicsSceneDragDropEvent* event);
-    virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent* event);
-    virtual void dropEvent(QGraphicsSceneDragDropEvent* event);
+    virtual bool event(QEvent* event) Q_DECL_OVERRIDE;
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
+    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE;
+    virtual void dragEnterEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE;
+    virtual void dragMoveEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE;
+    virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE;
+    virtual void dropEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE;
 
     QList<KItemListWidget*> visibleItemListWidgets() const;
 
diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h
index c086ee6d3..07fc789f0 100644
--- a/src/kitemviews/kitemlistwidget.h
+++ b/src/kitemviews/kitemlistwidget.h
@@ -82,7 +82,7 @@ public:
      * to show the data of the custom model provided by KItemListWidget::data().
      * @reimp
      */
-    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE;
 
     void setVisibleRoles(const QList<QByteArray>& roles);
     QList<QByteArray> visibleRoles() const;
@@ -203,7 +203,7 @@ protected:
     virtual void alternateBackgroundChanged(bool enabled);
     virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous);
     virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous);
-    virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
+    virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE;
 
     /**
      * @return The current opacity of the hover-animation. When implementing a custom painting-code for a hover-state
diff --git a/src/kitemviews/kstandarditemlistgroupheader.h b/src/kitemviews/kstandarditemlistgroupheader.h
index 26158d6ba..871c93d8d 100644
--- a/src/kitemviews/kstandarditemlistgroupheader.h
+++ b/src/kitemviews/kstandarditemlistgroupheader.h
@@ -35,14 +35,14 @@ public:
     KStandardItemListGroupHeader(QGraphicsWidget* parent = 0);
     virtual ~KStandardItemListGroupHeader();
 
-    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE;
 
 protected:
-    virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color);
-    virtual void paintSeparator(QPainter* painter, const QColor& color);
-    virtual void roleChanged(const QByteArray &current, const QByteArray &previous);
-    virtual void dataChanged(const QVariant& current, const QVariant& previous);
-    virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
+    virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) Q_DECL_OVERRIDE;
+    virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE;
+    virtual void roleChanged(const QByteArray &current, const QByteArray &previous) Q_DECL_OVERRIDE;
+    virtual void dataChanged(const QVariant& current, const QVariant& previous) Q_DECL_OVERRIDE;
+    virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE;
 
 private:
     void updateCache();
diff --git a/src/kitemviews/kstandarditemlistview.h b/src/kitemviews/kstandarditemlistview.h
index f5b0bfd8c..eb07c7f08 100644
--- a/src/kitemviews/kstandarditemlistview.h
+++ b/src/kitemviews/kstandarditemlistview.h
@@ -59,15 +59,15 @@ public:
     ItemLayout itemLayout() const;
 
 protected:
-    virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const;
-    virtual KItemListGroupHeaderCreatorBase* defaultGroupHeaderCreator() const;
-    virtual void initializeItemListWidget(KItemListWidget* item);
-    virtual bool itemSizeHintUpdateRequired(const QSet<QByteArray>& changedRoles) const;
+    virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE;
+    virtual KItemListGroupHeaderCreatorBase* defaultGroupHeaderCreator() const Q_DECL_OVERRIDE;
+    virtual void initializeItemListWidget(KItemListWidget* item) Q_DECL_OVERRIDE;
+    virtual bool itemSizeHintUpdateRequired(const QSet<QByteArray>& changedRoles) const Q_DECL_OVERRIDE;
     virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const;
     virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous);
-    virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);
-    virtual void onSupportsItemExpandingChanged(bool supportsExpanding);
-    virtual void polishEvent();
+    virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) Q_DECL_OVERRIDE;
+    virtual void onSupportsItemExpandingChanged(bool supportsExpanding) Q_DECL_OVERRIDE;
+    virtual void polishEvent() Q_DECL_OVERRIDE;
 
 private:
     void applyDefaultStyleOption(int iconSize, int padding, int horizontalMargin, int verticalMargin);
diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h
index 403794fc3..7683f8433 100644
--- a/src/kitemviews/kstandarditemlistwidget.h
+++ b/src/kitemviews/kstandarditemlistwidget.h
@@ -38,11 +38,11 @@ public:
     KStandardItemListWidgetInformant();
     virtual ~KStandardItemListWidgetInformant();
 
-    virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const;
+    virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const Q_DECL_OVERRIDE;
 
     virtual qreal preferredRoleColumnWidth(const QByteArray& role,
                                            int index,
-                                           const KItemListView* view) const;
+                                           const KItemListView* view) const Q_DECL_OVERRIDE;
 protected:
     /**
      * @return The value of the "text" role. The default implementation returns
@@ -106,13 +106,13 @@ public:
 
     virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
 
-    virtual QRectF iconRect() const;
-    virtual QRectF textRect() const;
-    virtual QRectF textFocusRect() const;
-    virtual QRectF selectionRect() const;
-    virtual QRectF expansionToggleRect() const;
-    virtual QRectF selectionToggleRect() const;
-    virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    virtual QRectF iconRect() const Q_DECL_OVERRIDE;
+    virtual QRectF textRect() const Q_DECL_OVERRIDE;
+    virtual QRectF textFocusRect() const Q_DECL_OVERRIDE;
+    virtual QRectF selectionRect() const Q_DECL_OVERRIDE;
+    virtual QRectF expansionToggleRect() const Q_DECL_OVERRIDE;
+    virtual QRectF selectionToggleRect() const Q_DECL_OVERRIDE;
+    virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE;
 
     static KItemListWidgetInformant* createInformant();
 
@@ -172,17 +172,17 @@ protected:
      */
     virtual int selectionLength(const QString& text) const;
 
-    virtual void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>());
-    virtual void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous);
-    virtual void columnWidthChanged(const QByteArray& role, qreal current, qreal previous);
-    virtual void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous);
-    virtual void hoveredChanged(bool hovered);
-    virtual void selectedChanged(bool selected);
-    virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous);
-    virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous);
-    virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
-    virtual void showEvent(QShowEvent* event);
-    virtual void hideEvent(QHideEvent* event);
+    virtual void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>()) Q_DECL_OVERRIDE;
+    virtual void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) Q_DECL_OVERRIDE;
+    virtual void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) Q_DECL_OVERRIDE;
+    virtual void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) Q_DECL_OVERRIDE;
+    virtual void hoveredChanged(bool hovered) Q_DECL_OVERRIDE;
+    virtual void selectedChanged(bool selected) Q_DECL_OVERRIDE;
+    virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) Q_DECL_OVERRIDE;
+    virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE;
+    virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE;
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void slotCutItemsChanged();
@@ -274,5 +274,3 @@ private:
 };
 
 #endif
-
-
diff --git a/src/kitemviews/kstandarditemmodel.h b/src/kitemviews/kstandarditemmodel.h
index 721e15529..9d1db1a2b 100644
--- a/src/kitemviews/kstandarditemmodel.h
+++ b/src/kitemviews/kstandarditemmodel.h
@@ -69,14 +69,14 @@ public:
      */
     void appendItem(KStandardItem* item);
 
-    virtual int count() const;
-    virtual QHash<QByteArray, QVariant> data(int index) const;
-    virtual bool setData(int index, const QHash<QByteArray, QVariant>& values);
-    virtual QMimeData* createMimeData(const KItemSet& indexes) const;
-    virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const;
-    virtual bool supportsDropping(int index) const;
-    virtual QString roleDescription(const QByteArray& role) const;
-    virtual QList<QPair<int, QVariant> > groups() const;
+    virtual int count() const Q_DECL_OVERRIDE;
+    virtual QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE;
+    virtual bool setData(int index, const QHash<QByteArray, QVariant>& values) Q_DECL_OVERRIDE;
+    virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE;
+    virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const Q_DECL_OVERRIDE;
+    virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE;
+    virtual QString roleDescription(const QByteArray& role) const Q_DECL_OVERRIDE;
+    virtual QList<QPair<int, QVariant> > groups() const Q_DECL_OVERRIDE;
 
     virtual void clear();
 protected:
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 84325c87f..8c8c86402 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -88,7 +88,7 @@ Name[wa]=Dolphin
 Name[x-test]=xxDolphinxx
 Name[zh_CN]=Dolphin
 Name[zh_TW]=Dolphin
-Exec=dolphin %i -caption %c %u
+Exec=dolphin %u
 Icon=system-file-manager
 Type=Application
 X-DocPath=dolphin/index.html
diff --git a/src/panels/folders/foldersitemlistwidget.h b/src/panels/folders/foldersitemlistwidget.h
index 08d41b829..2278762e3 100644
--- a/src/panels/folders/foldersitemlistwidget.h
+++ b/src/panels/folders/foldersitemlistwidget.h
@@ -34,7 +34,7 @@ public:
     virtual ~FoldersItemListWidget();
 
 protected:
-    virtual QPalette::ColorRole normalTextColorRole() const;
+    virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE;
 };
 
 #endif
diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h
index 2cbd28f28..7c591cc20 100644
--- a/src/panels/folders/folderspanel.h
+++ b/src/panels/folders/folderspanel.h
@@ -57,13 +57,13 @@ signals:
 
 protected:
     /** @see Panel::urlChanged() */
-    virtual bool urlChanged();
+    virtual bool urlChanged() Q_DECL_OVERRIDE;
 
     /** @see QWidget::showEvent() */
-    virtual void showEvent(QShowEvent* event);
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
     /** @see QWidget::keyPressEvent() */
-    virtual void keyPressEvent(QKeyEvent* event);
+    virtual void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void slotItemActivated(int index);
diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h
index 9a1e6351d..7a0e4165e 100644
--- a/src/panels/information/informationpanel.h
+++ b/src/panels/information/informationpanel.h
@@ -59,16 +59,16 @@ public slots:
 
 protected:
     /** @see Panel::urlChanged() */
-    virtual bool urlChanged();
+    virtual bool urlChanged() Q_DECL_OVERRIDE;
 
     /** @see QWidget::showEvent() */
-    virtual void showEvent(QShowEvent* event);
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
     /** @see QWidget::resizeEvent() */
-    virtual void resizeEvent(QResizeEvent* event);
+    virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
 
     /** @see QWidget::contextMenuEvent() */
-    virtual void contextMenuEvent(QContextMenuEvent* event);
+    virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     /**
diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index f4103853e..533e9de3b 100644
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -85,7 +85,7 @@ signals:
 
 protected:
     /** @see QObject::eventFilter() */
-    virtual bool eventFilter(QObject* obj, QEvent* event);
+    virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     /**
diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h
index 09b4ee26f..837a66888 100644
--- a/src/panels/information/phononwidget.h
+++ b/src/panels/information/phononwidget.h
@@ -63,8 +63,8 @@ class PhononWidget : public QWidget
         void hasVideoChanged(bool hasVideo);
 
     protected:
-        virtual void showEvent(QShowEvent *event);
-        virtual void hideEvent(QHideEvent *event);
+        virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
+        virtual void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE;
 
     private slots:
         void stateChanged(Phonon::State);
diff --git a/src/panels/information/pixmapviewer.h b/src/panels/information/pixmapviewer.h
index 8197df979..ddc183351 100644
--- a/src/panels/information/pixmapviewer.h
+++ b/src/panels/information/pixmapviewer.h
@@ -71,10 +71,10 @@ public:
      * of the parent widget. Per default no size hint is given.
      */
     void setSizeHint(const QSize& size);
-    virtual QSize sizeHint() const;
+    virtual QSize sizeHint() const Q_DECL_OVERRIDE;
 
 protected:
-    virtual void paintEvent(QPaintEvent* event);
+    virtual void paintEvent(QPaintEvent* event) Q_DECL_OVERRIDE;
 
 private Q_SLOTS:
     void checkPendingPixmaps();
diff --git a/src/panels/panel.h b/src/panels/panel.h
index f43ebe9d9..d3460bf13 100644
--- a/src/panels/panel.h
+++ b/src/panels/panel.h
@@ -49,8 +49,7 @@ public:
     void setCustomContextMenuActions(const QList<QAction*>& actions);
     QList<QAction*> customContextMenuActions() const;
 
-    /** @see QWidget::sizeHint() */
-    virtual QSize sizeHint() const;
+    virtual QSize sizeHint() const Q_DECL_OVERRIDE;
 
 public slots:
     /**
diff --git a/src/panels/places/placesitemeditdialog.h b/src/panels/places/placesitemeditdialog.h
index 53e62379d..f2bba546b 100644
--- a/src/panels/places/placesitemeditdialog.h
+++ b/src/panels/places/placesitemeditdialog.h
@@ -54,7 +54,7 @@ public:
     bool allowGlobal() const;
 
 protected:
-    virtual bool event(QEvent* event);
+    virtual bool event(QEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void slotUrlChanged(const QString& text);
diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h
index 1c2d5cc25..7daaba602 100644
--- a/src/panels/places/placesitemlistgroupheader.h
+++ b/src/panels/places/placesitemlistgroupheader.h
@@ -31,7 +31,7 @@ public:
     virtual ~PlacesItemListGroupHeader();
 
 protected:
-    virtual void paintSeparator(QPainter* painter, const QColor& color);
+    virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE;
 
     virtual QPalette::ColorRole normalTextColorRole() const;
 };
diff --git a/src/panels/places/placesitemlistwidget.h b/src/panels/places/placesitemlistwidget.h
index a2a88c1f0..e9e6a0767 100644
--- a/src/panels/places/placesitemlistwidget.h
+++ b/src/panels/places/placesitemlistwidget.h
@@ -35,8 +35,8 @@ public:
     virtual ~PlacesItemListWidget();
 
 protected:
-    virtual bool isHidden() const;
-    virtual QPalette::ColorRole normalTextColorRole() const;
+    virtual bool isHidden() const Q_DECL_OVERRIDE;
+    virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE;
 };
 
 #endif
diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h
index 229841dc5..38fcfe6af 100644
--- a/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@ -107,11 +107,9 @@ public:
     bool storageSetupNeeded(int index) const;
     void requestStorageSetup(int index);
 
-    /** @reimp */
-    virtual QMimeData* createMimeData(const KItemSet& indexes) const;
+    virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE;
 
-    /** @reimp */
-    virtual bool supportsDropping(int index) const;
+    virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE;
 
     void dropMimeDataBefore(int index, const QMimeData* mimeData);
 
@@ -123,15 +121,15 @@ public:
      */
     static QUrl convertedUrl(const QUrl& url);
 
-    virtual void clear();
+    virtual void clear() Q_DECL_OVERRIDE;
 signals:
     void errorMessage(const QString& message);
     void storageSetupDone(int index, bool success);
 
 protected:
-    virtual void onItemInserted(int index);
-    virtual void onItemRemoved(int index, KStandardItem* removedItem);
-    virtual void onItemChanged(int index, const QSet<QByteArray>& changedRoles);
+    virtual void onItemInserted(int index) Q_DECL_OVERRIDE;
+    virtual void onItemRemoved(int index, KStandardItem* removedItem) Q_DECL_OVERRIDE;
+    virtual void onItemChanged(int index, const QSet<QByteArray>& changedRoles) Q_DECL_OVERRIDE;
 
 private slots:
     void slotDeviceAdded(const QString& udi);
diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index 3604e9986..81aeedb28 100644
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -48,8 +48,8 @@ signals:
     void errorMessage(const QString& error);
 
 protected:
-    virtual bool urlChanged();
-    virtual void showEvent(QShowEvent* event);
+    virtual bool urlChanged() Q_DECL_OVERRIDE;
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
 public slots:
     virtual void readSettings();
diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h
index b3ccefb31..75e198e1a 100644
--- a/src/panels/terminal/terminalpanel.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -61,11 +61,9 @@ signals:
     void changeUrl(const QUrl& url);
 
 protected:
-    /** @see Panel::urlChanged() */
-    virtual bool urlChanged();
+    virtual bool urlChanged() Q_DECL_OVERRIDE;
 
-    /** @see QWidget::showEvent() */
-    virtual void showEvent(QShowEvent* event);
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void slotMostLocalUrlResult(KJob* job);
diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index 2de4c457c..b0fd16ccc 100644
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -105,10 +105,10 @@ public:
     bool isActive() const;
 
 protected:
-    virtual bool event(QEvent* event);
-    virtual void showEvent(QShowEvent* event);
-    virtual void keyReleaseEvent(QKeyEvent* event);
-    virtual bool eventFilter(QObject* obj, QEvent* event);
+    virtual bool event(QEvent* event) Q_DECL_OVERRIDE;
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
+    virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE;
 
 signals:
     /**
diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index 297adb823..ea9688718 100644
--- a/src/settings/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
@@ -64,7 +64,7 @@ public:
     int progress() const;
 
 private slots:
-    virtual void slotResult(KJob* job);
+    virtual void slotResult(KJob* job) Q_DECL_OVERRIDE;
     void slotEntries(KIO::Job*, const KIO::UDSEntryList&);
 
 private:
diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index 71ee2849a..6e491696c 100644
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -39,10 +39,10 @@ public:
     virtual ~BehaviorSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 private:
     void loadSettings();
diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h
index 4d0a652d3..e702fe8ae 100644
--- a/src/settings/general/confirmationssettingspage.h
+++ b/src/settings/general/confirmationssettingspage.h
@@ -35,10 +35,10 @@ public:
     virtual ~ConfirmationsSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 private:
     void loadSettings();
diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h
index 245773aee..7073258ff 100644
--- a/src/settings/general/generalsettingspage.h
+++ b/src/settings/general/generalsettingspage.h
@@ -44,10 +44,10 @@ public:
     virtual ~GeneralSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 private:
     QList<SettingsPageBase*> m_pages;
diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h
index a43535133..3abf8f926 100644
--- a/src/settings/general/previewssettingspage.h
+++ b/src/settings/general/previewssettingspage.h
@@ -42,13 +42,13 @@ public:
      * The settings are persisted automatically when
      * closing Dolphin.
      */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** Restores the settings to default values. */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 protected:
-    virtual void showEvent(QShowEvent* event);
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void configureService(const QModelIndex& index);
diff --git a/src/settings/general/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h
index 17bc799bc..608354371 100644
--- a/src/settings/general/statusbarsettingspage.h
+++ b/src/settings/general/statusbarsettingspage.h
@@ -35,10 +35,10 @@ public:
     virtual ~StatusBarSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 private:
     void loadSettings();
diff --git a/src/settings/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h
index 6b844c9a8..50331a75c 100644
--- a/src/settings/kcm/kcmdolphingeneral.h
+++ b/src/settings/kcm/kcmdolphingeneral.h
@@ -36,8 +36,8 @@ public:
     DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args);
     virtual ~DolphinGeneralConfigModule();
 
-    virtual void save();
-    virtual void defaults();
+    virtual void save() Q_DECL_OVERRIDE;
+    virtual void defaults() Q_DECL_OVERRIDE;
 
 private:
     QList<SettingsPageBase*> m_pages;
diff --git a/src/settings/kcm/kcmdolphinnavigation.h b/src/settings/kcm/kcmdolphinnavigation.h
index e7634d661..e8de0753e 100644
--- a/src/settings/kcm/kcmdolphinnavigation.h
+++ b/src/settings/kcm/kcmdolphinnavigation.h
@@ -35,8 +35,8 @@ public:
     DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args);
     virtual ~DolphinNavigationConfigModule();
 
-    virtual void save();
-    virtual void defaults();
+    virtual void save() Q_DECL_OVERRIDE;
+    virtual void defaults() Q_DECL_OVERRIDE;
 
 private:
     NavigationSettingsPage* m_navigation;
diff --git a/src/settings/kcm/kcmdolphinservices.h b/src/settings/kcm/kcmdolphinservices.h
index 70ed366fe..8a63bb045 100644
--- a/src/settings/kcm/kcmdolphinservices.h
+++ b/src/settings/kcm/kcmdolphinservices.h
@@ -35,8 +35,8 @@ public:
     DolphinServicesConfigModule(QWidget* parent, const QVariantList& args);
     virtual ~DolphinServicesConfigModule();
 
-    virtual void save();
-    virtual void defaults();
+    virtual void save() Q_DECL_OVERRIDE;
+    virtual void defaults() Q_DECL_OVERRIDE;
 
 private:
     ServicesSettingsPage* m_services;
diff --git a/src/settings/kcm/kcmdolphinviewmodes.h b/src/settings/kcm/kcmdolphinviewmodes.h
index 3181198fe..0a0b0ff10 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.h
+++ b/src/settings/kcm/kcmdolphinviewmodes.h
@@ -35,8 +35,8 @@ public:
     DolphinViewModesConfigModule(QWidget* parent, const QVariantList& args);
     virtual ~DolphinViewModesConfigModule();
 
-    virtual void save();
-    virtual void defaults();
+    virtual void save() Q_DECL_OVERRIDE;
+    virtual void defaults() Q_DECL_OVERRIDE;
 
 private:
     void reparseConfiguration();
diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h
index 7d5b981d4..ff1ed31ef 100644
--- a/src/settings/navigation/navigationsettingspage.h
+++ b/src/settings/navigation/navigationsettingspage.h
@@ -36,10 +36,10 @@ public:
     virtual ~NavigationSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 private:
     void loadSettings();
diff --git a/src/settings/serviceitemdelegate.h b/src/settings/serviceitemdelegate.h
index 958d0dc57..9f0ced40c 100644
--- a/src/settings/serviceitemdelegate.h
+++ b/src/settings/serviceitemdelegate.h
@@ -37,16 +37,16 @@ public:
     virtual ~ServiceItemDelegate();
 
     virtual QSize sizeHint(const QStyleOptionViewItem &option,
-                           const QModelIndex &index) const;
+                           const QModelIndex &index) const Q_DECL_OVERRIDE;
 
     virtual void paint(QPainter* painter, const QStyleOptionViewItem& option,
-                       const QModelIndex& index) const;
+                       const QModelIndex& index) const Q_DECL_OVERRIDE;
 
     virtual QList<QWidget*> createItemWidgets(const QModelIndex&) const Q_DECL_OVERRIDE;
 
     virtual void updateItemWidgets(const QList<QWidget*> widgets,
                                    const QStyleOptionViewItem& option,
-                                   const QPersistentModelIndex& index) const;
+                                   const QPersistentModelIndex& index) const Q_DECL_OVERRIDE;
 
 signals:
     void requestServiceConfiguration(const QModelIndex& index);
diff --git a/src/settings/servicemodel.h b/src/settings/servicemodel.h
index b8c2d5248..f2b91c7e4 100644
--- a/src/settings/servicemodel.h
+++ b/src/settings/servicemodel.h
@@ -47,10 +47,10 @@ public:
     explicit ServiceModel(QObject* parent = 0);
     virtual ~ServiceModel();
 
-    virtual bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex());
-    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
-    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
+    virtual bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) Q_DECL_OVERRIDE;
+    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
 
  private:
     struct ServiceItem
diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h
index 5dbb691af..a883aa947 100644
--- a/src/settings/services/servicessettingspage.h
+++ b/src/settings/services/servicessettingspage.h
@@ -39,13 +39,13 @@ public:
     virtual ~ServicesSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 protected:
-    virtual void showEvent(QShowEvent* event);
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     /**
diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h
index d8b15cf5b..aeb5d6333 100644
--- a/src/settings/startup/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
@@ -40,10 +40,10 @@ public:
     virtual ~StartupSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 private slots:
     void slotSettingsChanged();
diff --git a/src/settings/trash/trashsettingspage.h b/src/settings/trash/trashsettingspage.h
index bf4a71ea4..5c88aeab7 100644
--- a/src/settings/trash/trashsettingspage.h
+++ b/src/settings/trash/trashsettingspage.h
@@ -34,10 +34,10 @@ public:
     virtual ~TrashSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 private:
     void loadSettings();
diff --git a/src/settings/viewmodes/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h
index 446403182..61671077e 100644
--- a/src/settings/viewmodes/viewsettingspage.h
+++ b/src/settings/viewmodes/viewsettingspage.h
@@ -40,10 +40,10 @@ public:
     virtual ~ViewSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 private:
     QList<ViewSettingsTab*> m_tabs;
diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index 7522cf84c..13089b79f 100644
--- a/src/settings/viewpropsprogressinfo.h
+++ b/src/settings/viewpropsprogressinfo.h
@@ -56,7 +56,7 @@ public:
     virtual ~ViewPropsProgressInfo();
 
 protected:
-    virtual void closeEvent(QCloseEvent* event);
+    virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void updateProgress();
diff --git a/src/statusbar/dolphinstatusbar.h b/src/statusbar/dolphinstatusbar.h
index 7ceb2acf8..1a4ccf682 100644
--- a/src/statusbar/dolphinstatusbar.h
+++ b/src/statusbar/dolphinstatusbar.h
@@ -101,8 +101,8 @@ signals:
     void zoomLevelChanged(int zoomLevel);
 
 protected:
-    virtual void contextMenuEvent(QContextMenuEvent* event);
-    virtual bool eventFilter(QObject* obj, QEvent* event);
+    virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE;
+    virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void showZoomSliderToolTip(int zoomLevel);
diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 48313a81c..5d571beba 100644
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -46,8 +46,8 @@ public:
     QUrl url() const;
 
 protected:
-    void showEvent(QShowEvent* event);
-    void hideEvent(QHideEvent* event);
+    void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     void slotValuesChanged();
diff --git a/src/views/dolphinfileitemlistwidget.h b/src/views/dolphinfileitemlistwidget.h
index b9de6fb19..5f7c181e9 100644
--- a/src/views/dolphinfileitemlistwidget.h
+++ b/src/views/dolphinfileitemlistwidget.h
@@ -40,7 +40,7 @@ public:
     virtual ~DolphinFileItemListWidget();
 
 protected:
-    virtual void refreshCache();
+    virtual void refreshCache() Q_DECL_OVERRIDE;
 
 private:
     static QPixmap overlayForState(KVersionControlPlugin2::ItemVersion version, int size);
diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h
index 67302e44d..7fd72e5c0 100644
--- a/src/views/dolphinitemlistview.h
+++ b/src/views/dolphinitemlistview.h
@@ -49,14 +49,14 @@ public:
     void writeSettings();
 
 protected:
-    virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const;
-    virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const;
-    virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous);
-    virtual void onPreviewsShownChanged(bool shown);
+    virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE;
+    virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const Q_DECL_OVERRIDE;
+    virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous) Q_DECL_OVERRIDE;
+    virtual void onPreviewsShownChanged(bool shown) Q_DECL_OVERRIDE;
     virtual void onVisibleRolesChanged(const QList<QByteArray>& current,
-                                       const QList<QByteArray>& previous);
+                                       const QList<QByteArray>& previous) Q_DECL_OVERRIDE;
 
-    virtual void updateFont();
+    virtual void updateFont() Q_DECL_OVERRIDE;
 
 private:
     void updateGridSize();
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 7e5eca3a1..c054c311a 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -365,7 +365,7 @@ public slots:
     void stopLoading();
 
     /** Activates the view if the item list container gets focus. */
-    virtual bool eventFilter(QObject* watched, QEvent* event);
+    virtual bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE;
 
 signals:
     /**
@@ -543,11 +543,10 @@ signals:
 
 protected:
     /** Changes the zoom level if Control is pressed during a wheel event. */
-    virtual void wheelEvent(QWheelEvent* event);
+    virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
 
-    /** @reimp */
-    virtual void hideEvent(QHideEvent* event);
-    virtual bool event(QEvent* event);
+    virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
+    virtual bool event(QEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     /**
diff --git a/src/views/tooltips/filemetadatatooltip.h b/src/views/tooltips/filemetadatatooltip.h
index 7197871fc..379b025c8 100644
--- a/src/views/tooltips/filemetadatatooltip.h
+++ b/src/views/tooltips/filemetadatatooltip.h
@@ -70,8 +70,8 @@ signals:
     void metaDataRequestFinished(const KFileItemList& items);
 
 protected:
-    virtual void paintEvent(QPaintEvent* event);
-    virtual void showEvent(QShowEvent *);
+    virtual void paintEvent(QPaintEvent* event) Q_DECL_OVERRIDE;
+    virtual void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
 
 private:
     QLabel* m_preview;
diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h
index 5c6c6a208..9b744d5b3 100644
--- a/src/views/versioncontrol/updateitemstatesthread.h
+++ b/src/views/versioncontrol/updateitemstatesthread.h
@@ -53,7 +53,7 @@ public:
     QMap<QString, QVector<VersionControlObserver::ItemState> > itemStates() const;
 
 protected:
-    virtual void run();
+    virtual void run() Q_DECL_OVERRIDE;
 
 private:
     QMutex* m_globalPluginMutex; // Protects the m_plugin globally