Q_DECL_OVERRIDE

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 8ed22dda5c1ae1834365fb7d11b090122d65e707..f7f3a231a24ee9373c39251efb7d3d71eca6f549 100644 (file)
--- 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 c9b559439770b516b25c6d5db9f5024c5d6fe113..df04cee69d8cf552dd1194cc5324f5da0e9b0a6f 100644 (file)
--- 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 12933f9ce4ae39191788d2ddf0c8fdb2214184a9..462d3d3629f07901f1f656715b9d9fc419b5b397 100644 (file)
--- 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 e211dfd881319a7495be258485ad1d16f410c94e..254571eb9e7ec47792ce2205536c19d5e3e505b3 100644 (file)
--- 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 0e3f683362b5b151ed5112ab34c7b997ea790b42..1c79a5980e07c42c4cfa6fd65a9e6379dda32b59 100644 (file)
--- 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 9439a17bc5d0c83afa820ad25639a8945e3a9a98..9f0ed55704443149f4dfea33202db0df50aea49a 100644 (file)
--- 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 bebde3adabc66a650674b2bfbb7e33230ce1539c..6adf64972e620fe29a80a6120fa6e4c4088f7f29 100644 (file)
--- 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 d2b2e9e575af23ba51a6b72684de278ead8f26db..6daa9a1ada15620fe3d13415c89ad270fc7bd800 100644 (file)
--- 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 93213ac61683547fba838b0278bfcc38c42a13f1..a84b7facb4233fbeaf2a15ef6091ecb9a01683e6 100644 (file)
--- 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 5d5463a28e960e9e88baf440340e381e81c3944b..dd9b8b8bb9626209e2dbf1c046cdea9bf2f0278a 100644 (file)
--- 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 2fd21edbfdda12e0c5e7b045f3774eb510191731..9f07c9d8da7a1f0c4719fd5495417c9d7f10685e 100644 (file)
--- 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 8e8958b1600fd60a2b7eca0a89a96e29c8166480..b7061d38c59ecd36a74fcfe129be39cce887bf2c 100644 (file)
--- 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 1a4f6928ea991e07fc4bc0f46ecf31616bda677c..535e0f3e4b18a02f74327c04903810b6c2a4f531 100644 (file)
--- 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 3373059d19f05a6239a934da9a983911f51e2a31..55a9a118f142ad1db45eda9024118c64dfb74b09 100644 (file)
--- 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 1e8ed2cca1191c38c1471ddfa91222e9a4423da2..66fe929ddd3c9a39b05e0dc88f22a40b52238990 100644 (file)
--- 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 c8054a691055d53c8970355434a03ccbbb812a0c..cc0754f2a18f70d4288af6ddc1e9a9dd137545e3 100644 (file)
--- 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 c086ee6d332e47055631a2e504e758325b9edc70..07fc789f0ace3e71bb9522d53c0670b0ecde23b9 100644 (file)
--- 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 26158d6bab624e92243d7e01e1a2dca29c133c86..871c93d8d7fedba5d72d5ccf51ed483c1d081c92 100644 (file)
--- 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 f5b0bfd8cf3f0884b42faa488cf1d926a35f66d3..eb07c7f08a87e92d3f5f3eae58b50fca6b8c1e5e 100644 (file)
--- 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 403794fc3e53ecee6172fb64944cc8a1e69130e6..7683f84331b88af0992ea1045abf934d606837ac 100644 (file)
--- 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 721e155299862f91a2c3e9bbd4999d92611401b8..9d1db1a2b4b272874610d3381752ea5eaa8f5e43 100644 (file)
--- 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 84325c87fbc7b4fd49f93d8171ba9679ea452503..8c8c86402ceecb7d20dccd88c140166bd955360f 100755 (executable)
--- 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 08d41b829c233549a489f91b7e69eacdec2ef0e0..2278762e342be97eb2c62f80b0c955be72df7a9e 100644 (file)
--- 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 2cbd28f28b5b60bc9621cd432c25f5f57aa77ade..7c591cc20c78aac23e6aff971d2754aab408f5a6 100644 (file)
--- 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 9a1e6351dc6f25591c0ccce9dd926d6ec7246d0c..7a0e4165ecbed7a4cb4331e858229eafb88d114d 100644 (file)
--- 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 f4103853e15e7b83e284ea4a93f87c4bed30b053..533e9de3b559628cc036c6ea05b6bcdb4be44bf2 100644 (file)
--- 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 09b4ee26f8e1a885837f7f37e83fe299a036e3b3..837a66888150234f8ec3c3f08b9a75b5612b2521 100644 (file)
--- 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 8197df9790be044a8171a558c332ac8dc5c0a5ae..ddc183351e4d330b2b79282d7b7840d956d7da6e 100644 (file)
--- 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 f43ebe9d9b950f6c79fe60b4471ac1cbc8ddd0fd..d3460bf130d1351cb208ccf160b7d1a8c09ce647 100644 (file)
--- 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 53e62379d8795a9d307f53f6725c6bcfa875ff44..f2bba546bf45cf3c86c63850eca7d0cf77ba1f58 100644 (file)
--- 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 1c2d5cc25592e250a8f90ac085a30ba480fe28b4..7daaba602f0ff680349179d258d3af71325c406e 100644 (file)
--- 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 a2a88c1f0fee48162f46a824689066f81dfb0749..e9e6a07678de8532d68c0e4e6e30b1b13d0e784c 100644 (file)
--- 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 229841dc54916633c91061fba7b49124af9a7cd6..38fcfe6af3085abe0464e5fed1caec02922938e2 100644 (file)
--- 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 3604e99864eb286d0f299ae3408f874d3b83701e..81aeedb280ca924b97b6cbcacb44db45230fe8ea 100644 (file)
--- 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 b3ccefb31c8063953fb9384ea5248df68a67c509..75e198e1a525100f7b9eb779a1dea5bf23b6e811 100644 (file)
--- 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 2de4c457c4a1c257cfac2d147c8c2fa564c8a90f..b0fd16ccc77f6b319bc4c7751b193bb9a51c5d8e 100644 (file)
--- 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 297adb823fa6d56fef6943163af6a38c5ba9de0d..ea9688718ae4a12d38312dba3271682e7c1bb22d 100644 (file)
--- 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 71ee2849acc0536bfe8b9db8d00099ebdebcb7d6..6e491696c8b9298311e82455c975cf544be690c0 100644 (file)
--- 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 4d0a652d3e5a31e302865c8dc07c40548823de67..e702fe8ae23c0468a8ef5ca5d1526b5a7377271b 100644 (file)
--- 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 245773aeef763752367abd56af9226d837312106..7073258fffe6593e5a8f2ecbcece94f1fb3fa76b 100644 (file)
--- 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 a43535133b2067d03ecd48423d7c762334875058..3abf8f92697407c23668c43c08efcfbd0a77678a 100644 (file)
--- 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 17bc799bc839d48ce49c4de437649defb8419154..60835437162e832ff28ce2c28fbd294be8413eea 100644 (file)
--- 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 6b844c9a8fd5757b799ac3358eddd412203c8225..50331a75c45a73db0c027df9d7489f72566ec01c 100644 (file)
--- 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 e7634d6614dc4527a05fd9fe13008ad1a23096ee..e8de0753e68d46a4e95c58659a23692a6b5d916e 100644 (file)
--- 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 70ed366fef6837a7e2278c4aaa835ceb64b28221..8a63bb045d134c6e9ebc7e64bb936da020fca043 100644 (file)
--- 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 3181198fecc27ab7b9f5ce9460a1dffd7814df8f..0a0b0ff10df22019a9e1c12a3b40011deaa1b2fe 100644 (file)
--- 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 7d5b981d451d9d9ba6360b8512e3b2464d955737..ff1ed31efda65650c836506c565f4c9dcdd795bd 100644 (file)
--- 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 958d0dc57e34897b7dcb81750dad351a4057ac4f..9f0ced40c8633f99ed41b751465236fd088a07f8 100644 (file)
--- 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 b8c2d5248803257d1a29c0179cf02d71375475c8..f2b91c7e4af1abe49650db3b79424442fbdeb474 100644 (file)
--- 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 5dbb691afcb725e73543775fd1ac7b04438855fd..a883aa947b720db406a878bc7e944a4a34786c36 100644 (file)
--- 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 d8b15cf5b17ca5ac05f8e904dd83a55865579d09..aeb5d6333e2f18b4e8d36429a57b1d68ca5e7770 100644 (file)
--- 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 bf4a71ea4a5801e4877553affd0ea360d03b0b50..5c88aeab79d16156d1b5251127aa3baf5b0d2900 100644 (file)
--- 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 4464031823db05cb33cbddb6730e5e32d78a96a0..61671077efd787973b299ddee42873526d84f65b 100644 (file)
--- 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 7522cf84c5549458773eaa7893e7798b9c43965c..13089b79ff62e836a0ff1a32f3ae8c0413bf327a 100644 (file)
--- 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 7ceb2acf87406462df1022c6a0951e96695c03a7..1a4ccf682fb0dbe361d6f2cbc23a209d7f9c1ddc 100644 (file)
--- 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 48313a81c595375dea1b53d5ba289f65d1e56305..5d571beba9b936c52dd3279e370c39a1bfd50827 100644 (file)
--- 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 b9de6fb194e45dab5e440edad41fc922172f45b5..5f7c181e9d7c0f1e90a5e9daa77e6f7fa2fed647 100644 (file)
--- 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 67302e44dba687889424ea105790578d5951e6c5..7fd72e5c0e74525cbc93d7ad3934856a37cd8fe6 100644 (file)
--- 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 7e5eca3a163a7ee3138305e2a0cad6efdfa2d60c..c054c311a360971d29ea796070dec9f3924ab1d9 100644 (file)
--- 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 7197871fce99d0d9edde4ee5a1066176c4f92516..379b025c8e33e3f9404b857ca6be3cef5d278b4a 100644 (file)
--- 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 5c6c6a20838703c80f3c81c9b9b875312b44c20a..9b744d5b3412c7fdf696a7ee4949643a3897bc37 100644 (file)
--- 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