From 464b13f3828e5cdd03438d0881c3a62c7cda6333 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 20 Nov 2017 23:25:06 +0100 Subject: [PATCH] Modernize: Use override where possible Also use override instead of Q_DECL_OVERRIDE --- src/dolphincontextmenu.h | 6 +- src/dolphindockwidget.cpp | 6 +- src/dolphindockwidget.h | 2 +- src/dolphinmainwindow.h | 14 +-- src/dolphinnewfilemenu.h | 4 +- src/dolphinpart.h | 8 +- src/dolphinpart_ext.h | 20 ++-- src/dolphintabbar.h | 16 +-- src/dolphintabwidget.h | 4 +- src/dolphinviewcontainer.h | 2 +- src/filterbar/filterbar.h | 6 +- src/kitemviews/kfileitemlistview.h | 34 +++--- src/kitemviews/kfileitemlistwidget.h | 20 ++-- src/kitemviews/kfileitemmodel.h | 34 +++--- src/kitemviews/kfileitemmodelrolesupdater.h | 2 +- src/kitemviews/kitemlistcontainer.cpp | 2 +- src/kitemviews/kitemlistcontainer.h | 12 +- src/kitemviews/kitemlistcontroller.h | 2 +- src/kitemviews/kitemlistgroupheader.h | 6 +- src/kitemviews/kitemlistheader.h | 2 +- src/kitemviews/kitemlistselectionmanager.h | 2 +- src/kitemviews/kitemlistview.h | 40 +++---- src/kitemviews/kitemlistviewaccessible.h | 112 +++++++++--------- src/kitemviews/kitemlistwidget.h | 8 +- src/kitemviews/kitemmodelbase.h | 2 +- src/kitemviews/kstandarditemlistgroupheader.h | 14 +-- src/kitemviews/kstandarditemlistview.h | 16 +-- src/kitemviews/kstandarditemlistwidget.h | 50 ++++---- src/kitemviews/kstandarditemmodel.h | 18 +-- .../private/kdirectorycontentscounter.h | 2 +- src/kitemviews/private/kfileitemclipboard.h | 2 +- .../private/kfileitemmodeldirlister.h | 4 +- .../private/kitemlistheaderwidget.h | 18 +-- .../private/kitemlistkeyboardsearchmanager.h | 2 +- src/kitemviews/private/kitemlistroleeditor.h | 8 +- src/kitemviews/private/kitemlistrubberband.h | 2 +- .../private/kitemlistselectiontoggle.h | 6 +- .../private/kitemlistsmoothscroller.h | 4 +- .../private/kitemlistviewanimation.h | 2 +- .../private/kitemlistviewlayouter.h | 2 +- src/panels/folders/foldersitemlistwidget.h | 4 +- src/panels/folders/folderspanel.cpp | 4 +- src/panels/folders/folderspanel.h | 8 +- src/panels/folders/treeviewcontextmenu.h | 2 +- .../filemetadataconfigurationdialog.h | 2 +- src/panels/information/informationpanel.h | 10 +- .../information/informationpanelcontent.h | 4 +- src/panels/information/phononwidget.cpp | 2 +- src/panels/information/phononwidget.h | 4 +- src/panels/information/pixmapviewer.h | 6 +- src/panels/panel.h | 4 +- src/panels/places/placesitem.h | 10 +- src/panels/places/placesitemeditdialog.h | 4 +- src/panels/places/placesitemlistgroupheader.h | 6 +- src/panels/places/placesitemlistwidget.h | 6 +- src/panels/places/placesitemmodel.h | 16 +-- src/panels/places/placesitemsignalhandler.h | 2 +- src/panels/places/placespanel.h | 8 +- src/panels/terminal/terminalpanel.h | 6 +- src/search/dolphinfacetswidget.h | 2 +- src/search/dolphinsearchbox.h | 12 +- src/settings/additionalinfodialog.h | 4 +- src/settings/applyviewpropsjob.h | 4 +- src/settings/dolphinsettingsdialog.h | 2 +- src/settings/general/behaviorsettingspage.h | 6 +- .../general/configurepreviewplugindialog.h | 2 +- .../general/confirmationssettingspage.h | 6 +- src/settings/general/generalsettingspage.h | 6 +- src/settings/general/previewssettingspage.h | 8 +- src/settings/general/statusbarsettingspage.h | 6 +- src/settings/kcm/kcmdolphingeneral.h | 6 +- src/settings/kcm/kcmdolphinnavigation.h | 6 +- src/settings/kcm/kcmdolphinservices.h | 6 +- src/settings/kcm/kcmdolphinviewmodes.h | 6 +- .../navigation/navigationsettingspage.h | 6 +- src/settings/serviceitemdelegate.h | 16 +-- src/settings/servicemodel.h | 10 +- src/settings/services/servicessettingspage.h | 8 +- src/settings/settingspagebase.h | 2 +- src/settings/startup/startupsettingspage.h | 6 +- src/settings/trash/trashsettingspage.h | 6 +- src/settings/viewmodes/dolphinfontrequester.h | 2 +- src/settings/viewmodes/viewsettingspage.h | 6 +- src/settings/viewmodes/viewsettingstab.h | 2 +- src/settings/viewpropertiesdialog.h | 4 +- src/settings/viewpropsprogressinfo.h | 6 +- src/statusbar/dolphinstatusbar.h | 6 +- src/statusbar/mountpointobserver.h | 2 +- src/statusbar/mountpointobservercache.h | 2 +- src/statusbar/spaceinfoobserver.h | 2 +- src/statusbar/statusbarspaceinfo.h | 8 +- src/tests/kitemlistcontrollertest.cpp | 2 +- src/tests/kitemlistselectionmanagertest.cpp | 4 +- src/views/dolphinfileitemlistwidget.h | 4 +- src/views/dolphinitemlistview.h | 16 +-- src/views/dolphinnewfilemenuobserver.h | 2 +- src/views/dolphinremoteencoding.h | 2 +- src/views/dolphinview.h | 10 +- src/views/renamedialog.h | 2 +- .../tooltips/dolphinfilemetadatawidget.h | 2 +- src/views/tooltips/tooltipmanager.h | 2 +- .../versioncontrol/kversioncontrolplugin.h | 2 +- .../versioncontrol/updateitemstatesthread.h | 4 +- .../versioncontrol/versioncontrolobserver.h | 2 +- src/views/viewmodecontroller.h | 2 +- 105 files changed, 428 insertions(+), 428 deletions(-) diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index ea68244e1a..558115fb04 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -74,7 +74,7 @@ public: const KFileItem& fileInfo, const QUrl& baseUrl); - virtual ~DolphinContextMenu(); + ~DolphinContextMenu() override; void setCustomActions(const QList& actions); @@ -89,8 +89,8 @@ public: Command open(); protected: - virtual void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *ev) override; + void keyReleaseEvent(QKeyEvent *ev) override; private: void openTrashContextMenu(); diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp index c7beb1689b..726338377d 100644 --- a/src/dolphindockwidget.cpp +++ b/src/dolphindockwidget.cpp @@ -36,15 +36,15 @@ class DolphinDockTitleBar : public QWidget public: explicit DolphinDockTitleBar(QWidget* parent = nullptr) : QWidget(parent) {} - virtual ~DolphinDockTitleBar() {} + ~DolphinDockTitleBar() override {} - QSize minimumSizeHint() const Q_DECL_OVERRIDE + QSize minimumSizeHint() const override { const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin); return QSize(border, border); } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { return minimumSizeHint(); } diff --git a/src/dolphindockwidget.h b/src/dolphindockwidget.h index 8f491295d1..8a15a04022 100644 --- a/src/dolphindockwidget.h +++ b/src/dolphindockwidget.h @@ -32,7 +32,7 @@ class DolphinDockWidget : public QDockWidget public: explicit DolphinDockWidget(const QString& title, QWidget* parent = 0, Qt::WindowFlags flags = 0); explicit DolphinDockWidget(QWidget* parent = 0, Qt::WindowFlags flags = 0); - virtual ~DolphinDockWidget(); + ~DolphinDockWidget() override; /** * @param lock If \a lock is true, the title bar of the dock-widget will get hidden so diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index c05fc34ad4..c7a06c00a9 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -64,7 +64,7 @@ class DolphinMainWindow: public KXmlGuiWindow public: DolphinMainWindow(); - virtual ~DolphinMainWindow(); + ~DolphinMainWindow() override; /** * Returns the currently active view. @@ -152,16 +152,16 @@ signals: protected: /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; /** @see QMainWindow::closeEvent() */ - virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent* event) override; /** @see KMainWindow::saveProperties() */ - virtual void saveProperties(KConfigGroup& group) Q_DECL_OVERRIDE; + void saveProperties(KConfigGroup& group) override; /** @see KMainWindow::readProperties() */ - virtual void readProperties(const KConfigGroup& group) Q_DECL_OVERRIDE; + void readProperties(const KConfigGroup& group) override; private slots: /** @@ -499,8 +499,8 @@ private: { public: UndoUiInterface(); - virtual ~UndoUiInterface(); - virtual void jobError(KIO::Job* job) Q_DECL_OVERRIDE; + ~UndoUiInterface() override; + void jobError(KIO::Job* job) override; }; KNewFileMenu* m_newFileMenu; diff --git a/src/dolphinnewfilemenu.h b/src/dolphinnewfilemenu.h index 9f1cb55991..3505017e13 100644 --- a/src/dolphinnewfilemenu.h +++ b/src/dolphinnewfilemenu.h @@ -41,14 +41,14 @@ class DOLPHIN_EXPORT DolphinNewFileMenu : public KNewFileMenu public: DolphinNewFileMenu(KActionCollection* collection, QObject* parent); - virtual ~DolphinNewFileMenu(); + ~DolphinNewFileMenu() override; signals: void errorMessage(const QString& error); protected slots: /** @see KNewFileMenu::slotResult() */ - virtual void slotResult(KJob* job) Q_DECL_OVERRIDE; + void slotResult(KJob* job) override; }; #endif diff --git a/src/dolphinpart.h b/src/dolphinpart.h index 48aff56029..845d843651 100644 --- a/src/dolphinpart.h +++ b/src/dolphinpart.h @@ -54,7 +54,7 @@ class DolphinPart : public KParts::ReadOnlyPart public: explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args); - ~DolphinPart(); + ~DolphinPart() override; static KAboutData* createAboutData(); @@ -62,7 +62,7 @@ public: * Standard KParts::ReadOnlyPart openUrl method. * Called by Konqueror to view a directory in DolphinPart. */ - virtual bool openUrl(const QUrl& url) Q_DECL_OVERRIDE; + bool openUrl(const QUrl& url) override; /// see the supportsUndo property bool supportsUndo() const { return true; } @@ -98,7 +98,7 @@ protected: /** * We reimplement openUrl so no need to implement openFile. */ - virtual bool openFile() override { return true; } + bool openFile() override { return true; } Q_SIGNALS: /** @@ -223,7 +223,7 @@ private Q_SLOTS: void setFilesToSelect(const QList &files); QList filesToSelect() const { return QList(); } // silence moc - virtual bool eventFilter(QObject*, QEvent*) Q_DECL_OVERRIDE; + bool eventFilter(QObject*, QEvent*) override; private: void createActions(); diff --git a/src/dolphinpart_ext.h b/src/dolphinpart_ext.h index 0b7018dbb2..590fc169cd 100644 --- a/src/dolphinpart_ext.h +++ b/src/dolphinpart_ext.h @@ -33,8 +33,8 @@ class DolphinPartBrowserExtension : public KParts::BrowserExtension Q_OBJECT public: DolphinPartBrowserExtension( DolphinPart* part ); - virtual void restoreState(QDataStream &stream) Q_DECL_OVERRIDE; - virtual void saveState(QDataStream &stream) Q_DECL_OVERRIDE; + void restoreState(QDataStream &stream) override; + void saveState(QDataStream &stream) override; public Q_SLOTS: void cut(); @@ -54,10 +54,10 @@ class DolphinPartFileInfoExtension : public KParts::FileInfoExtension public: DolphinPartFileInfoExtension(DolphinPart* part); - virtual QueryModes supportedQueryModes() const Q_DECL_OVERRIDE; - virtual bool hasSelection() const Q_DECL_OVERRIDE; + QueryModes supportedQueryModes() const override; + bool hasSelection() const override; - virtual KFileItemList queryFor(QueryMode mode) const Q_DECL_OVERRIDE; + KFileItemList queryFor(QueryMode mode) const override; private: DolphinPart* m_part; @@ -69,10 +69,10 @@ class DolphinPartListingFilterExtension : public KParts::ListingFilterExtension public: DolphinPartListingFilterExtension(DolphinPart* part); - 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; + FilterModes supportedFilterModes() const override; + bool supportsMultipleFilters(FilterMode mode) const override; + QVariant filter(FilterMode mode) const override; + void setFilter(FilterMode mode, const QVariant& filter) override; private: DolphinPart* m_part; @@ -84,7 +84,7 @@ class DolphinPartListingNotificationExtension : public KParts::ListingNotificati public: DolphinPartListingNotificationExtension(DolphinPart* part); - virtual NotificationEventTypes supportedNotificationEventTypes() const Q_DECL_OVERRIDE; + NotificationEventTypes supportedNotificationEventTypes() const override; public Q_SLOTS: void slotNewItems(const KFileItemList&); diff --git a/src/dolphintabbar.h b/src/dolphintabbar.h index 0c08031a97..02270d0fce 100644 --- a/src/dolphintabbar.h +++ b/src/dolphintabbar.h @@ -35,18 +35,18 @@ signals: void tabDetachRequested(int index); protected: - 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 mouseReleaseEvent(QMouseEvent* event) Q_DECL_OVERRIDE; - virtual void mouseDoubleClickEvent(QMouseEvent* event) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent* event) override; + void dragLeaveEvent(QDragLeaveEvent* event) override; + void dragMoveEvent(QDragMoveEvent* event) override; + void dropEvent(QDropEvent* event) override; + void mousePressEvent(QMouseEvent* event) override; + void mouseReleaseEvent(QMouseEvent* event) override; + void mouseDoubleClickEvent(QMouseEvent* event) override; /** * Opens a context menu for the tab on the \a event position. */ - virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent* event) override; private slots: void slotAutoActivationTimeout(); diff --git a/src/dolphintabwidget.h b/src/dolphintabwidget.h index 50ebd602ab..ba2fd4867a 100644 --- a/src/dolphintabwidget.h +++ b/src/dolphintabwidget.h @@ -174,8 +174,8 @@ private slots: void currentTabChanged(int index); protected: - virtual void tabInserted(int index) Q_DECL_OVERRIDE; - virtual void tabRemoved(int index) Q_DECL_OVERRIDE; + void tabInserted(int index) override; + void tabRemoved(int index) override; private: /** diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index 41c8f0b04b..877089e4c7 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -70,7 +70,7 @@ public: }; DolphinViewContainer(const QUrl& url, QWidget* parent); - virtual ~DolphinViewContainer(); + ~DolphinViewContainer() override; /** * Returns the current active URL, where all actions are applied. diff --git a/src/filterbar/filterbar.h b/src/filterbar/filterbar.h index a275d1ea4c..da4a0fcc17 100644 --- a/src/filterbar/filterbar.h +++ b/src/filterbar/filterbar.h @@ -38,7 +38,7 @@ class FilterBar : public QWidget public: explicit FilterBar(QWidget* parent = 0); - virtual ~FilterBar(); + ~FilterBar() override; /** Called by view container to hide this **/ void closeFilterBar(); @@ -74,8 +74,8 @@ signals: void focusViewRequest(); protected: - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; + void keyReleaseEvent(QKeyEvent* event) override; private: QLineEdit* m_filterInput; diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h index 84aa17d89b..c1c260e93c 100644 --- a/src/kitemviews/kfileitemlistview.h +++ b/src/kitemviews/kfileitemlistview.h @@ -42,7 +42,7 @@ class DOLPHIN_EXPORT KFileItemListView : public KStandardItemListView public: KFileItemListView(QGraphicsWidget* parent = 0); - virtual ~KFileItemListView(); + ~KFileItemListView() override; void setPreviewsShown(bool show); bool previewsShown() const; @@ -72,27 +72,27 @@ public: */ QStringList enabledPlugins() const; - virtual QPixmap createDragPixmap(const KItemSet& indexes) const Q_DECL_OVERRIDE; + QPixmap createDragPixmap(const KItemSet& indexes) const override; protected: - virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE; - virtual void initializeItemListWidget(KItemListWidget* item) Q_DECL_OVERRIDE; + KItemListWidgetCreatorBase* defaultWidgetCreator() const override; + void initializeItemListWidget(KItemListWidget* item) override; virtual void onPreviewsShownChanged(bool shown); - 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& current, const QList& 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; + void onItemLayoutChanged(ItemLayout current, ItemLayout previous) override; + void onModelChanged(KItemModelBase* current, KItemModelBase* previous) override; + void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) override; + void onItemSizeChanged(const QSizeF& current, const QSizeF& previous) override; + void onScrollOffsetChanged(qreal current, qreal previous) override; + void onVisibleRolesChanged(const QList& current, const QList& previous) override; + void onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) override; + void onSupportsItemExpandingChanged(bool supportsExpanding) override; + void onTransactionBegin() override; + void onTransactionEnd() override; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; protected slots: - virtual void slotItemsRemoved(const KItemRangeList& itemRanges) Q_DECL_OVERRIDE; - virtual void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE; + void slotItemsRemoved(const KItemRangeList& itemRanges) override; + void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) override; private slots: void triggerVisibleIndexRangeUpdate(); diff --git a/src/kitemviews/kfileitemlistwidget.h b/src/kitemviews/kfileitemlistwidget.h index 07ca59b444..fbb0300f81 100644 --- a/src/kitemviews/kfileitemlistwidget.h +++ b/src/kitemviews/kfileitemlistwidget.h @@ -28,13 +28,13 @@ class DOLPHIN_EXPORT KFileItemListWidgetInformant : public KStandardItemListWidg { public: KFileItemListWidgetInformant(); - virtual ~KFileItemListWidgetInformant(); + ~KFileItemListWidgetInformant() override; protected: - 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& values) const Q_DECL_OVERRIDE; - virtual QFont customizedFontForLinks(const QFont& baseFont) const Q_DECL_OVERRIDE; + QString itemText(int index, const KItemListView* view) const override; + bool itemIsLink(int index, const KItemListView* view) const override; + QString roleText(const QByteArray& role, const QHash& values) const override; + QFont customizedFontForLinks(const QFont& baseFont) const override; }; class DOLPHIN_EXPORT KFileItemListWidget : public KStandardItemListWidget @@ -43,19 +43,19 @@ class DOLPHIN_EXPORT KFileItemListWidget : public KStandardItemListWidget public: KFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); - virtual ~KFileItemListWidget(); + ~KFileItemListWidget() override; static KItemListWidgetInformant* createInformant(); protected: - 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; + bool isRoleRightAligned(const QByteArray& role) const override; + bool isHidden() const override; + QFont customizedFont(const QFont& baseFont) const override; /** * @return Selection length without MIME-type extension */ - virtual int selectionLength(const QString& text) const Q_DECL_OVERRIDE; + int selectionLength(const QString& text) const override; }; #endif diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 0ca748d7ab..3cd119dc89 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -51,7 +51,7 @@ class DOLPHIN_EXPORT KFileItemModel : public KItemModelBase public: explicit KFileItemModel(QObject* parent = 0); - virtual ~KFileItemModel(); + ~KFileItemModel() override; /** * Loads the directory specified by \a url. The signals @@ -73,7 +73,7 @@ public: * the root-parent of all items. * @see rootItem() */ - QUrl directory() const Q_DECL_OVERRIDE; + QUrl directory() const override; /** * Cancels the loading of a directory which has been started by either @@ -81,9 +81,9 @@ public: */ void cancelDirectoryLoading(); - virtual int count() const Q_DECL_OVERRIDE; - virtual QHash data(int index) const Q_DECL_OVERRIDE; - virtual bool setData(int index, const QHash& values) Q_DECL_OVERRIDE; + int count() const override; + QHash data(int index) const override; + bool setData(int index, const QHash& values) override; /** * Sets a separate sorting with directories first (true) or a mixed @@ -102,15 +102,15 @@ public: void setShowDirectoriesOnly(bool enabled); bool showDirectoriesOnly() const; - virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE; + QMimeData* createMimeData(const KItemSet& indexes) const override; - virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const Q_DECL_OVERRIDE; + int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const override; - virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE; + bool supportsDropping(int index) const override; - virtual QString roleDescription(const QByteArray& role) const Q_DECL_OVERRIDE; + QString roleDescription(const QByteArray& role) const override; - virtual QList > groups() const Q_DECL_OVERRIDE; + QList > groups() const override; /** * @return The file-item for the index \a index. If the index is in a valid @@ -156,10 +156,10 @@ public: void setRoles(const QSet& roles); QSet roles() 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; + bool setExpanded(int index, bool expanded) override; + bool isExpanded(int index) const override; + bool isExpandable(int index) const override; + int expandedParentsCount(int index) const override; QSet expandedDirectories() const; @@ -258,9 +258,9 @@ signals: void urlIsFileError(const QUrl& url); protected: - 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; + void onGroupedSortingChanged(bool current) override; + void onSortRoleChanged(const QByteArray& current, const QByteArray& previous) override; + void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) override; private slots: /** diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h index cd86fce1ee..15d46d79e6 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -95,7 +95,7 @@ class DOLPHIN_EXPORT KFileItemModelRolesUpdater : public QObject public: explicit KFileItemModelRolesUpdater(KFileItemModel* model, QObject* parent = 0); - virtual ~KFileItemModelRolesUpdater(); + ~KFileItemModelRolesUpdater() override; void setIconSize(const QSize& size); QSize iconSize() const; diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index b4ea62fac3..8bab6cfad2 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -48,7 +48,7 @@ class KItemListContainerViewport : public QGraphicsView public: KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent); protected: - void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent* event) override; }; KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent) : diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h index 9fc3d4957e..dc7b19e202 100644 --- a/src/kitemviews/kitemlistcontainer.h +++ b/src/kitemviews/kitemlistcontainer.h @@ -51,18 +51,18 @@ public: * @param parent Optional parent widget. */ explicit KItemListContainer(KItemListController* controller, QWidget* parent = 0); - virtual ~KItemListContainer(); + ~KItemListContainer() override; KItemListController* controller() const; void setEnabledFrame(bool enable); bool enabledFrame() const; protected: - 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; + void keyPressEvent(QKeyEvent* event) override; + void showEvent(QShowEvent* event) override; + void resizeEvent(QResizeEvent* event) override; + void scrollContentsBy(int dx, int dy) override; + void wheelEvent(QWheelEvent* event) override; private slots: void slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h index f293774434..ff0171a026 100644 --- a/src/kitemviews/kitemlistcontroller.h +++ b/src/kitemviews/kitemlistcontroller.h @@ -89,7 +89,7 @@ public: * @param parent Optional parent object. */ KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent = 0); - virtual ~KItemListController(); + ~KItemListController() override; void setModel(KItemModelBase* model); KItemModelBase* model() const; diff --git a/src/kitemviews/kitemlistgroupheader.h b/src/kitemviews/kitemlistgroupheader.h index 4612bc4da8..f720076df1 100644 --- a/src/kitemviews/kitemlistgroupheader.h +++ b/src/kitemviews/kitemlistgroupheader.h @@ -43,7 +43,7 @@ class DOLPHIN_EXPORT KItemListGroupHeader : public QGraphicsWidget public: KItemListGroupHeader(QGraphicsWidget* parent = 0); - virtual ~KItemListGroupHeader(); + ~KItemListGroupHeader() override; void setRole(const QByteArray& role); QByteArray role() const; @@ -65,7 +65,7 @@ public: void setItemIndex(int index); int itemIndex() const; - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; protected: virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) = 0; @@ -101,7 +101,7 @@ protected: */ virtual void itemIndexChanged(int current, int previous); - virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; virtual QPalette::ColorRole normalTextColorRole() const; virtual QPalette::ColorRole normalBaseColorRole() const; diff --git a/src/kitemviews/kitemlistheader.h b/src/kitemviews/kitemlistheader.h index 76c4205590..4d9d9a5b08 100644 --- a/src/kitemviews/kitemlistheader.h +++ b/src/kitemviews/kitemlistheader.h @@ -38,7 +38,7 @@ class DOLPHIN_EXPORT KItemListHeader : public QObject Q_OBJECT public: - virtual ~KItemListHeader(); + ~KItemListHeader() override; /** * If set to true, KItemListView will automatically adjust the diff --git a/src/kitemviews/kitemlistselectionmanager.h b/src/kitemviews/kitemlistselectionmanager.h index 16761428bb..d8faac4cd4 100644 --- a/src/kitemviews/kitemlistselectionmanager.h +++ b/src/kitemviews/kitemlistselectionmanager.h @@ -52,7 +52,7 @@ public: }; KItemListSelectionManager(QObject* parent = 0); - virtual ~KItemListSelectionManager(); + ~KItemListSelectionManager() override; void setCurrentItem(int current); int currentItem() const; diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h index e64ac7e31a..3415d52ec1 100644 --- a/src/kitemviews/kitemlistview.h +++ b/src/kitemviews/kitemlistview.h @@ -68,7 +68,7 @@ class DOLPHIN_EXPORT KItemListView : public QGraphicsWidget public: KItemListView(QGraphicsWidget* parent = 0); - virtual ~KItemListView(); + ~KItemListView() override; /** * Offset of the scrollbar that represents the scroll-orientation @@ -165,7 +165,7 @@ public: const KItemListStyleOption& styleOption() const; - virtual void setGeometry(const QRectF& rect) Q_DECL_OVERRIDE; + void setGeometry(const QRectF& rect) override; /** * @return The page step which should be used by the vertical scroll bar. @@ -285,7 +285,7 @@ public: */ void editRole(int index, const QByteArray& role); - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; signals: void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); @@ -325,7 +325,7 @@ signals: void roleEditingFinished(int index, const QByteArray& role, const QVariant& value); protected: - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; void setItemSize(const QSizeF& size); void setStyleOption(const KItemListStyleOption& option); @@ -382,13 +382,13 @@ protected: virtual void onTransactionBegin(); virtual void onTransactionEnd(); - 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; + bool event(QEvent* event) override; + void mousePressEvent(QGraphicsSceneMouseEvent* event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override; + void dragEnterEvent(QGraphicsSceneDragDropEvent* event) override; + void dragMoveEvent(QGraphicsSceneDragDropEvent* event) override; + void dragLeaveEvent(QGraphicsSceneDragDropEvent* event) override; + void dropEvent(QGraphicsSceneDragDropEvent* event) override; QList visibleItemListWidgets() const; @@ -803,7 +803,7 @@ private: class DOLPHIN_EXPORT KItemListWidgetCreatorBase : public KItemListCreatorBase { public: - virtual ~KItemListWidgetCreatorBase(); + ~KItemListWidgetCreatorBase() override; virtual KItemListWidget* create(KItemListView* view) = 0; @@ -824,15 +824,15 @@ class KItemListWidgetCreator : public KItemListWidgetCreatorBase { public: KItemListWidgetCreator(); - virtual ~KItemListWidgetCreator(); + ~KItemListWidgetCreator() override; - virtual KItemListWidget* create(KItemListView* view) Q_DECL_OVERRIDE; + KItemListWidget* create(KItemListView* view) override; - virtual void calculateItemSizeHints(QVector& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const Q_DECL_OVERRIDE; + void calculateItemSizeHints(QVector& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const override; - virtual qreal preferredRoleColumnWidth(const QByteArray& role, + qreal preferredRoleColumnWidth(const QByteArray& role, int index, - const KItemListView* view) const Q_DECL_OVERRIDE; + const KItemListView* view) const override; private: KItemListWidgetInformant* m_informant; }; @@ -885,7 +885,7 @@ qreal KItemListWidgetCreator::preferredRoleColumnWidth(const QByteArray& role class DOLPHIN_EXPORT KItemListGroupHeaderCreatorBase : public KItemListCreatorBase { public: - virtual ~KItemListGroupHeaderCreatorBase(); + ~KItemListGroupHeaderCreatorBase() override; virtual KItemListGroupHeader* create(KItemListView* view) = 0; virtual void recycle(KItemListGroupHeader* header); }; @@ -894,8 +894,8 @@ template class KItemListGroupHeaderCreator : public KItemListGroupHeaderCreatorBase { public: - virtual ~KItemListGroupHeaderCreator(); - virtual KItemListGroupHeader* create(KItemListView* view) Q_DECL_OVERRIDE; + ~KItemListGroupHeaderCreator() override; + KItemListGroupHeader* create(KItemListView* view) override; }; template diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h index afef2d5fe9..674d98ee63 100644 --- a/src/kitemviews/kitemlistviewaccessible.h +++ b/src/kitemviews/kitemlistviewaccessible.h @@ -36,44 +36,44 @@ class DOLPHIN_EXPORT KItemListViewAccessible: public QAccessibleObject, public Q { public: explicit KItemListViewAccessible(KItemListView* view); - ~KItemListViewAccessible(); + ~KItemListViewAccessible() override; - void* interface_cast(QAccessible::InterfaceType type) Q_DECL_OVERRIDE; + void* interface_cast(QAccessible::InterfaceType type) override; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; + QAccessible::Role role() const override; + QAccessible::State state() const override; + QString text(QAccessible::Text t) const override; + QRect rect() const override; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE; - QAccessibleInterface* childAt(int x, int y) const Q_DECL_OVERRIDE; - QAccessibleInterface* parent() const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface*) const override; + QAccessibleInterface* childAt(int x, int y) const override; + QAccessibleInterface* parent() const override; // Table interface - virtual QAccessibleInterface* cellAt(int row, int column) const Q_DECL_OVERRIDE; - virtual QAccessibleInterface* caption() const Q_DECL_OVERRIDE; - virtual QAccessibleInterface* summary() const Q_DECL_OVERRIDE; - virtual QString columnDescription(int column) const Q_DECL_OVERRIDE; - virtual QString rowDescription(int row) const Q_DECL_OVERRIDE; - virtual int columnCount() const Q_DECL_OVERRIDE; - virtual int rowCount() const Q_DECL_OVERRIDE; + QAccessibleInterface* cellAt(int row, int column) const override; + QAccessibleInterface* caption() const override; + QAccessibleInterface* summary() const override; + QString columnDescription(int column) const override; + QString rowDescription(int row) const override; + int columnCount() const override; + int rowCount() const override; // Selection - virtual int selectedCellCount() const Q_DECL_OVERRIDE; - virtual int selectedColumnCount() const Q_DECL_OVERRIDE; - virtual int selectedRowCount() const Q_DECL_OVERRIDE; - virtual QList selectedCells() const Q_DECL_OVERRIDE; - virtual QList selectedColumns() const Q_DECL_OVERRIDE; - virtual QList selectedRows() const Q_DECL_OVERRIDE; - virtual bool isColumnSelected(int column) const Q_DECL_OVERRIDE; - virtual bool isRowSelected(int row) const Q_DECL_OVERRIDE; - virtual bool selectRow(int row) Q_DECL_OVERRIDE; - virtual bool selectColumn(int column) Q_DECL_OVERRIDE; - virtual bool unselectRow(int row) Q_DECL_OVERRIDE; - virtual bool unselectColumn(int column) Q_DECL_OVERRIDE; - virtual void modelChange(QAccessibleTableModelChangeEvent*) Q_DECL_OVERRIDE; + int selectedCellCount() const override; + int selectedColumnCount() const override; + int selectedRowCount() const override; + QList selectedCells() const override; + QList selectedColumns() const override; + QList selectedRows() const override; + bool isColumnSelected(int column) const override; + bool isRowSelected(int row) const override; + bool selectRow(int row) override; + bool selectColumn(int column) override; + bool unselectRow(int row) override; + bool unselectColumn(int column) override; + void modelChange(QAccessibleTableModelChangeEvent*) override; KItemListView* view() const; @@ -94,32 +94,32 @@ class DOLPHIN_EXPORT KItemListAccessibleCell: public QAccessibleInterface, publi public: KItemListAccessibleCell(KItemListView* view, int m_index); - void* interface_cast(QAccessible::InterfaceType type) Q_DECL_OVERRIDE; - QObject* object() const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString& text) Q_DECL_OVERRIDE; + void* interface_cast(QAccessible::InterfaceType type) override; + QObject* object() const override; + bool isValid() const override; + QAccessible::Role role() const override; + QAccessible::State state() const override; + QRect rect() const override; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString& text) override; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface* childAt(int x, int y) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const override; + int childCount() const override; + QAccessibleInterface* childAt(int x, int y) const override; + int indexOfChild(const QAccessibleInterface*) const override; - QAccessibleInterface* parent() const Q_DECL_OVERRIDE; + QAccessibleInterface* parent() const override; bool isExpandable() const; // Cell Interface - virtual int columnExtent() const Q_DECL_OVERRIDE; - virtual QList columnHeaderCells() const Q_DECL_OVERRIDE; - virtual int columnIndex() const Q_DECL_OVERRIDE; - virtual int rowExtent() const Q_DECL_OVERRIDE; - virtual QList rowHeaderCells() const Q_DECL_OVERRIDE; - virtual int rowIndex() const Q_DECL_OVERRIDE; - virtual bool isSelected() const Q_DECL_OVERRIDE; - virtual QAccessibleInterface* table() const Q_DECL_OVERRIDE; + int columnExtent() const override; + QList columnHeaderCells() const override; + int columnIndex() const override; + int rowExtent() const override; + QList rowHeaderCells() const override; + int rowIndex() const override; + bool isSelected() const override; + QAccessibleInterface* table() const override; inline int index() const; @@ -132,11 +132,11 @@ class DOLPHIN_EXPORT KItemListContainerAccessible : public QAccessibleWidget { public: explicit KItemListContainerAccessible(KItemListContainer* container); - virtual ~KItemListContainerAccessible(); + ~KItemListContainerAccessible() override; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface* child) const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface* child) const override; private: const KItemListContainer* container() const; diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h index d1ea7c9da4..1480c1acb8 100644 --- a/src/kitemviews/kitemlistwidget.h +++ b/src/kitemviews/kitemlistwidget.h @@ -69,7 +69,7 @@ class DOLPHIN_EXPORT KItemListWidget : public QGraphicsWidget public: KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); - virtual ~KItemListWidget(); + ~KItemListWidget() override; void setIndex(int index); int index() const; @@ -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) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; void setVisibleRoles(const QList& roles); QList visibleRoles() const; @@ -142,7 +142,7 @@ public: * or KItemListWidget::expansionToggleRect(). * @reimp */ - virtual bool contains(const QPointF& point) const override; + bool contains(const QPointF& point) const override; /** * @return Rectangle for the area that shows the icon. @@ -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) Q_DECL_OVERRIDE; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; /** * @return The current opacity of the hover-animation. When implementing a custom painting-code for a hover-state diff --git a/src/kitemviews/kitemmodelbase.h b/src/kitemviews/kitemmodelbase.h index a7773ee3b3..d604f423f4 100644 --- a/src/kitemviews/kitemmodelbase.h +++ b/src/kitemviews/kitemmodelbase.h @@ -57,7 +57,7 @@ class DOLPHIN_EXPORT KItemModelBase : public QObject public: KItemModelBase(QObject* parent = 0); explicit KItemModelBase(const QByteArray& sortRole, QObject* parent = 0); - virtual ~KItemModelBase(); + ~KItemModelBase() override; /** @return The number of items. */ virtual int count() const = 0; diff --git a/src/kitemviews/kstandarditemlistgroupheader.h b/src/kitemviews/kstandarditemlistgroupheader.h index f0eacfd49a..1d9989cdf6 100644 --- a/src/kitemviews/kstandarditemlistgroupheader.h +++ b/src/kitemviews/kstandarditemlistgroupheader.h @@ -33,16 +33,16 @@ class DOLPHIN_EXPORT KStandardItemListGroupHeader : public KItemListGroupHeader public: KStandardItemListGroupHeader(QGraphicsWidget* parent = 0); - virtual ~KStandardItemListGroupHeader(); + ~KStandardItemListGroupHeader() override; - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; protected: - 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 ¤t, 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; + void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) override; + void paintSeparator(QPainter* painter, const QColor& color) override; + void roleChanged(const QByteArray ¤t, const QByteArray &previous) override; + void dataChanged(const QVariant& current, const QVariant& previous) override; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; private: void updateCache(); diff --git a/src/kitemviews/kstandarditemlistview.h b/src/kitemviews/kstandarditemlistview.h index 2e4c7a0a0a..d22a51b34b 100644 --- a/src/kitemviews/kstandarditemlistview.h +++ b/src/kitemviews/kstandarditemlistview.h @@ -53,21 +53,21 @@ public: }; KStandardItemListView(QGraphicsWidget* parent = 0); - virtual ~KStandardItemListView(); + ~KStandardItemListView() override; void setItemLayout(ItemLayout layout); ItemLayout itemLayout() const; protected: - 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& changedRoles) const Q_DECL_OVERRIDE; + KItemListWidgetCreatorBase* defaultWidgetCreator() const override; + KItemListGroupHeaderCreatorBase* defaultGroupHeaderCreator() const override; + void initializeItemListWidget(KItemListWidget* item) override; + bool itemSizeHintUpdateRequired(const QSet& changedRoles) const override; virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const; virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous); - 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; + void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) override; + void onSupportsItemExpandingChanged(bool supportsExpanding) override; + void polishEvent() 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 cb73647952..bd4b529231 100644 --- a/src/kitemviews/kstandarditemlistwidget.h +++ b/src/kitemviews/kstandarditemlistwidget.h @@ -36,13 +36,13 @@ class DOLPHIN_EXPORT KStandardItemListWidgetInformant : public KItemListWidgetIn { public: KStandardItemListWidgetInformant(); - virtual ~KStandardItemListWidgetInformant(); + ~KStandardItemListWidgetInformant() override; - virtual void calculateItemSizeHints(QVector& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const Q_DECL_OVERRIDE; + void calculateItemSizeHints(QVector& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const override; - virtual qreal preferredRoleColumnWidth(const QByteArray& role, + qreal preferredRoleColumnWidth(const QByteArray& role, int index, - const KItemListView* view) const Q_DECL_OVERRIDE; + const KItemListView* view) const override; protected: /** * @return The value of the "text" role. The default implementation returns @@ -96,7 +96,7 @@ public: }; KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); - virtual ~KStandardItemListWidget(); + ~KStandardItemListWidget() override; void setLayout(Layout layout); Layout layout() const; @@ -104,15 +104,15 @@ public: void setSupportsItemExpanding(bool supportsItemExpanding); bool supportsItemExpanding() const; - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; - 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; + QRectF iconRect() const override; + QRectF textRect() const override; + QRectF textFocusRect() const override; + QRectF selectionRect() const override; + QRectF expansionToggleRect() const override; + QRectF selectionToggleRect() const override; + QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; static KItemListWidgetInformant* createInformant(); @@ -172,18 +172,18 @@ protected: */ virtual int selectionLength(const QString& text) const; - virtual void dataChanged(const QHash& current, const QSet& roles = QSet()) Q_DECL_OVERRIDE; - virtual void visibleRolesChanged(const QList& current, const QList& 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; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void dataChanged(const QHash& current, const QSet& roles = QSet()) override; + void visibleRolesChanged(const QList& current, const QList& previous) override; + void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) override; + void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) override; + void hoveredChanged(bool hovered) override; + void selectedChanged(bool selected) override; + void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) override; + void editedRoleChanged(const QByteArray& current, const QByteArray& previous) override; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; + void showEvent(QShowEvent* event) override; + void hideEvent(QHideEvent* event) override; + bool event(QEvent *event) override; public slots: void finishRoleEditing(); diff --git a/src/kitemviews/kstandarditemmodel.h b/src/kitemviews/kstandarditemmodel.h index 58c5a5d88d..6e63daa81a 100644 --- a/src/kitemviews/kstandarditemmodel.h +++ b/src/kitemviews/kstandarditemmodel.h @@ -41,7 +41,7 @@ class DOLPHIN_EXPORT KStandardItemModel : public KItemModelBase public: explicit KStandardItemModel(QObject* parent = 0); - virtual ~KStandardItemModel(); + ~KStandardItemModel() override; /** * Inserts the item \a item at the index \a index. If the index @@ -69,14 +69,14 @@ public: */ void appendItem(KStandardItem* item); - virtual int count() const Q_DECL_OVERRIDE; - virtual QHash data(int index) const Q_DECL_OVERRIDE; - virtual bool setData(int index, const QHash& 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 > groups() const Q_DECL_OVERRIDE; + int count() const override; + QHash data(int index) const override; + bool setData(int index, const QHash& values) override; + QMimeData* createMimeData(const KItemSet& indexes) const override; + int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const override; + bool supportsDropping(int index) const override; + QString roleDescription(const QByteArray& role) const override; + QList > groups() const override; virtual void clear(); protected: diff --git a/src/kitemviews/private/kdirectorycontentscounter.h b/src/kitemviews/private/kdirectorycontentscounter.h index 988208e027..13726fae7a 100644 --- a/src/kitemviews/private/kdirectorycontentscounter.h +++ b/src/kitemviews/private/kdirectorycontentscounter.h @@ -36,7 +36,7 @@ class KDirectoryContentsCounter : public QObject public: explicit KDirectoryContentsCounter(KFileItemModel* model, QObject* parent = 0); - ~KDirectoryContentsCounter(); + ~KDirectoryContentsCounter() override; /** * Requests the number of items inside the directory \a path. The actual diff --git a/src/kitemviews/private/kfileitemclipboard.h b/src/kitemviews/private/kfileitemclipboard.h index 3ee50d6610..5b5ab1eec6 100644 --- a/src/kitemviews/private/kfileitemclipboard.h +++ b/src/kitemviews/private/kfileitemclipboard.h @@ -46,7 +46,7 @@ signals: void cutItemsChanged(); protected: - virtual ~KFileItemClipboard(); + ~KFileItemClipboard() override; private slots: void updateCutItems(); diff --git a/src/kitemviews/private/kfileitemmodeldirlister.h b/src/kitemviews/private/kfileitemmodeldirlister.h index 5aa2b63031..ca5f76de6a 100644 --- a/src/kitemviews/private/kfileitemmodeldirlister.h +++ b/src/kitemviews/private/kfileitemmodeldirlister.h @@ -35,7 +35,7 @@ class DOLPHIN_EXPORT KFileItemModelDirLister : public KDirLister public: KFileItemModelDirLister(QObject* parent = 0); - virtual ~KFileItemModelDirLister(); + ~KFileItemModelDirLister() override; signals: /** Is emitted whenever an error has occurred. */ @@ -48,7 +48,7 @@ signals: void urlIsFileError(const QUrl& url); protected: - void handleError(KIO::Job* job) Q_DECL_OVERRIDE; + void handleError(KIO::Job* job) override; }; #endif diff --git a/src/kitemviews/private/kitemlistheaderwidget.h b/src/kitemviews/private/kitemlistheaderwidget.h index 2342b4907f..8248fb7bb0 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.h +++ b/src/kitemviews/private/kitemlistheaderwidget.h @@ -39,7 +39,7 @@ class DOLPHIN_EXPORT KItemListHeaderWidget : public QGraphicsWidget public: KItemListHeaderWidget(QGraphicsWidget* parent = 0); - virtual ~KItemListHeaderWidget(); + ~KItemListHeaderWidget() override; void setModel(KItemModelBase* model); KItemModelBase* model() const; @@ -64,7 +64,7 @@ public: qreal minimumColumnWidth() const; - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; signals: /** @@ -104,13 +104,13 @@ signals: void sortRoleChanged(const QByteArray& current, const QByteArray& previous); protected: - void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; - void hoverEnterEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; - void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; - void hoverMoveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; + void mousePressEvent(QGraphicsSceneMouseEvent* event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent* event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent* event) override; private slots: void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous); diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h index 2a14ca4704..be1d96c74d 100644 --- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h +++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h @@ -42,7 +42,7 @@ class DOLPHIN_EXPORT KItemListKeyboardSearchManager : public QObject public: KItemListKeyboardSearchManager(QObject* parent = 0); - virtual ~KItemListKeyboardSearchManager(); + ~KItemListKeyboardSearchManager() override; /** * Add \a keys to the text buffer used for searching. diff --git a/src/kitemviews/private/kitemlistroleeditor.h b/src/kitemviews/private/kitemlistroleeditor.h index f889ea4f4f..7285d62f77 100644 --- a/src/kitemviews/private/kitemlistroleeditor.h +++ b/src/kitemviews/private/kitemlistroleeditor.h @@ -39,20 +39,20 @@ class DOLPHIN_EXPORT KItemListRoleEditor : public KTextEdit public: explicit KItemListRoleEditor(QWidget* parent); - virtual ~KItemListRoleEditor(); + ~KItemListRoleEditor() override; void setRole(const QByteArray& role); QByteArray role() const; - bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE; + bool eventFilter(QObject* watched, QEvent* event) override; signals: void roleEditingFinished(const QByteArray& role, const QVariant& value); void roleEditingCanceled(const QByteArray& role, const QVariant& value); protected: - bool event(QEvent* event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; + bool event(QEvent* event) override; + void keyPressEvent(QKeyEvent* event) override; private slots: /** diff --git a/src/kitemviews/private/kitemlistrubberband.h b/src/kitemviews/private/kitemlistrubberband.h index b47c30c1fa..fa7401c9ee 100644 --- a/src/kitemviews/private/kitemlistrubberband.h +++ b/src/kitemviews/private/kitemlistrubberband.h @@ -33,7 +33,7 @@ class DOLPHIN_EXPORT KItemListRubberBand : public QObject public: explicit KItemListRubberBand(QObject* parent = 0); - virtual ~KItemListRubberBand(); + ~KItemListRubberBand() override; void setStartPosition(const QPointF& pos); QPointF startPosition() const; diff --git a/src/kitemviews/private/kitemlistselectiontoggle.h b/src/kitemviews/private/kitemlistselectiontoggle.h index e3f5bb63c8..7c283fb54d 100644 --- a/src/kitemviews/private/kitemlistselectiontoggle.h +++ b/src/kitemviews/private/kitemlistselectiontoggle.h @@ -35,17 +35,17 @@ class DOLPHIN_EXPORT KItemListSelectionToggle : public QGraphicsWidget public: KItemListSelectionToggle(QGraphicsItem* parent); - virtual ~KItemListSelectionToggle(); + ~KItemListSelectionToggle() override; void setChecked(bool checked); bool isChecked() const; void setHovered(bool hovered); - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; protected: - void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; private: void updatePixmap(); diff --git a/src/kitemviews/private/kitemlistsmoothscroller.h b/src/kitemviews/private/kitemlistsmoothscroller.h index 7d01a6b62c..6dccde9a20 100644 --- a/src/kitemviews/private/kitemlistsmoothscroller.h +++ b/src/kitemviews/private/kitemlistsmoothscroller.h @@ -40,7 +40,7 @@ class DOLPHIN_EXPORT KItemListSmoothScroller : public QObject public: explicit KItemListSmoothScroller(QScrollBar* scrollBar, QObject* parent = 0); - virtual ~KItemListSmoothScroller(); + ~KItemListSmoothScroller() override; void setScrollBar(QScrollBar* scrollBar); QScrollBar* scrollBar() const; @@ -83,7 +83,7 @@ public: void handleWheelEvent(QWheelEvent* event); protected: - bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; + bool eventFilter(QObject* obj, QEvent* event) override; private slots: void slotAnimationStateChanged(QAbstractAnimation::State newState, diff --git a/src/kitemviews/private/kitemlistviewanimation.h b/src/kitemviews/private/kitemlistviewanimation.h index 06c81c9b87..ddcb5e964e 100644 --- a/src/kitemviews/private/kitemlistviewanimation.h +++ b/src/kitemviews/private/kitemlistviewanimation.h @@ -49,7 +49,7 @@ public: }; KItemListViewAnimation(QObject* parent = 0); - virtual ~KItemListViewAnimation(); + ~KItemListViewAnimation() override; void setScrollOrientation(Qt::Orientation orientation); Qt::Orientation scrollOrientation() const; diff --git a/src/kitemviews/private/kitemlistviewlayouter.h b/src/kitemviews/private/kitemlistviewlayouter.h index 3f1cf68d45..84bbfff585 100644 --- a/src/kitemviews/private/kitemlistviewlayouter.h +++ b/src/kitemviews/private/kitemlistviewlayouter.h @@ -51,7 +51,7 @@ class DOLPHIN_EXPORT KItemListViewLayouter : public QObject public: KItemListViewLayouter(KItemListSizeHintResolver* sizeHintResolver, QObject* parent = 0); - virtual ~KItemListViewLayouter(); + ~KItemListViewLayouter() override; void setScrollOrientation(Qt::Orientation orientation); Qt::Orientation scrollOrientation() const; diff --git a/src/panels/folders/foldersitemlistwidget.h b/src/panels/folders/foldersitemlistwidget.h index 2278762e34..5a4595c4a9 100644 --- a/src/panels/folders/foldersitemlistwidget.h +++ b/src/panels/folders/foldersitemlistwidget.h @@ -31,10 +31,10 @@ class FoldersItemListWidget : public KFileItemListWidget public: FoldersItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); - virtual ~FoldersItemListWidget(); + ~FoldersItemListWidget() override; protected: - virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE; + QPalette::ColorRole normalTextColorRole() const override; }; #endif diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index eef27ce472..6659c7c91b 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -91,7 +91,7 @@ void FoldersPanel::setLimitFoldersPanelToHome(bool enable) bool FoldersPanel::limitFoldersPanelToHome() const { - return FoldersPanelSettings::limitFoldersPanelToHome(); + return limitFoldersPanelToHome(); } void FoldersPanel::setAutoScrolling(bool enable) @@ -325,7 +325,7 @@ void FoldersPanel::loadTree(const QUrl& url) QUrl baseUrl; if (url.isLocalFile()) { const bool isInHomeFolder = Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url); - if (FoldersPanelSettings::limitFoldersPanelToHome() && isInHomeFolder) { + if (limitFoldersPanelToHome() && isInHomeFolder) { baseUrl = Dolphin::homeUrl(); } else { // Use the root directory as base for local URLs (#150941) diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h index ab6c41b345..75a6036814 100644 --- a/src/panels/folders/folderspanel.h +++ b/src/panels/folders/folderspanel.h @@ -40,7 +40,7 @@ class FoldersPanel : public Panel public: explicit FoldersPanel(QWidget* parent = nullptr); - virtual ~FoldersPanel(); + ~FoldersPanel() override; void setShowHiddenFiles(bool show); void setLimitFoldersPanelToHome(bool enable); @@ -59,13 +59,13 @@ signals: protected: /** @see Panel::urlChanged() */ - virtual bool urlChanged() Q_DECL_OVERRIDE; + bool urlChanged() override; /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; /** @see QWidget::keyPressEvent() */ - virtual void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent* event) override; private slots: void slotItemActivated(int index); diff --git a/src/panels/folders/treeviewcontextmenu.h b/src/panels/folders/treeviewcontextmenu.h index 93ddd7aef9..3e61c49412 100644 --- a/src/panels/folders/treeviewcontextmenu.h +++ b/src/panels/folders/treeviewcontextmenu.h @@ -45,7 +45,7 @@ public: TreeViewContextMenu(FoldersPanel* parent, const KFileItem& fileInfo); - virtual ~TreeViewContextMenu(); + ~TreeViewContextMenu() override; /** Opens the context menu modal. */ void open(); diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h index 13562ef5ce..f471d545fa 100644 --- a/src/panels/information/filemetadataconfigurationdialog.h +++ b/src/panels/information/filemetadataconfigurationdialog.h @@ -44,7 +44,7 @@ class FileMetaDataConfigurationDialog : public QDialog public: explicit FileMetaDataConfigurationDialog(QWidget* parent = 0); - virtual ~FileMetaDataConfigurationDialog(); + ~FileMetaDataConfigurationDialog() override; /** * Sets the items, for which the visibility of the meta data should diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h index a698e544fb..89a1bc3d24 100644 --- a/src/panels/information/informationpanel.h +++ b/src/panels/information/informationpanel.h @@ -37,7 +37,7 @@ class InformationPanel : public Panel public: explicit InformationPanel(QWidget* parent = nullptr); - virtual ~InformationPanel(); + ~InformationPanel() override; signals: void urlActivated(const QUrl& url); @@ -59,16 +59,16 @@ public slots: protected: /** @see Panel::urlChanged() */ - virtual bool urlChanged() Q_DECL_OVERRIDE; + bool urlChanged() override; /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; /** @see QWidget::resizeEvent() */ - virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent* event) override; /** @see QWidget::contextMenuEvent() */ - virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent* event) override; private slots: /** diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h index 533e9de3b5..925e89a2b4 100644 --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -58,7 +58,7 @@ class InformationPanelContent : public QWidget public: explicit InformationPanelContent(QWidget* parent = 0); - virtual ~InformationPanelContent(); + ~InformationPanelContent() override; /** * Shows the meta information for the item \p item. @@ -85,7 +85,7 @@ signals: protected: /** @see QObject::eventFilter() */ - virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; + bool eventFilter(QObject* obj, QEvent* event) override; private slots: /** diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 3a3268cb3d..a71a77897f 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -52,7 +52,7 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget updateGeometry(); } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint(); } diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h index 837a668881..9402391447 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) Q_DECL_OVERRIDE; - virtual void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; private slots: void stateChanged(Phonon::State); diff --git a/src/panels/information/pixmapviewer.h b/src/panels/information/pixmapviewer.h index ddc183351e..f6b456ee62 100644 --- a/src/panels/information/pixmapviewer.h +++ b/src/panels/information/pixmapviewer.h @@ -62,7 +62,7 @@ public: explicit PixmapViewer(QWidget* parent, Transition transition = DefaultTransition); - virtual ~PixmapViewer(); + ~PixmapViewer() override; void setPixmap(const QPixmap& pixmap); QPixmap pixmap() const; @@ -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 Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - virtual void paintEvent(QPaintEvent* event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent* event) override; private Q_SLOTS: void checkPendingPixmaps(); diff --git a/src/panels/panel.h b/src/panels/panel.h index d3460bf130..f706c3b827 100644 --- a/src/panels/panel.h +++ b/src/panels/panel.h @@ -36,7 +36,7 @@ class Panel : public QWidget public: explicit Panel(QWidget* parent = 0); - virtual ~Panel(); + ~Panel() override; /** Returns the current set URL of the active Dolphin view. */ QUrl url() const; @@ -49,7 +49,7 @@ public: void setCustomContextMenuActions(const QList& actions); QList customContextMenuActions() const; - virtual QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; public slots: /** diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h index d1b5b5d96e..7d1ab610a9 100644 --- a/src/panels/places/placesitem.h +++ b/src/panels/places/placesitem.h @@ -49,7 +49,7 @@ public: }; explicit PlacesItem(const KBookmark& bookmark, PlacesItem* parent = 0); - virtual ~PlacesItem(); + ~PlacesItem() override; void setUrl(const QUrl& url); QUrl url() const; @@ -82,12 +82,12 @@ public: PlacesItemSignalHandler* signalHandler() const; protected: - virtual void onDataValueChanged(const QByteArray& role, + void onDataValueChanged(const QByteArray& role, const QVariant& current, - const QVariant& previous) Q_DECL_OVERRIDE; + const QVariant& previous) override; - virtual void onDataChanged(const QHash& current, - const QHash& previous) Q_DECL_OVERRIDE; + void onDataChanged(const QHash& current, + const QHash& previous) override; private: PlacesItem(const PlacesItem& item); diff --git a/src/panels/places/placesitemeditdialog.h b/src/panels/places/placesitemeditdialog.h index f2d69781a5..5f61eede26 100644 --- a/src/panels/places/placesitemeditdialog.h +++ b/src/panels/places/placesitemeditdialog.h @@ -39,7 +39,7 @@ class PlacesItemEditDialog: public QDialog public: explicit PlacesItemEditDialog(QWidget* parent = 0); - virtual ~PlacesItemEditDialog(); + ~PlacesItemEditDialog() override; void setIcon(const QString& icon); QString icon() const; @@ -54,7 +54,7 @@ public: bool allowGlobal() const; protected: - virtual bool event(QEvent* event) Q_DECL_OVERRIDE; + bool event(QEvent* event) override; private slots: void slotUrlChanged(const QString& text); diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h index ec845e0ae8..f3cdaa6a6b 100644 --- a/src/panels/places/placesitemlistgroupheader.h +++ b/src/panels/places/placesitemlistgroupheader.h @@ -28,12 +28,12 @@ class PlacesItemListGroupHeader : public KStandardItemListGroupHeader public: PlacesItemListGroupHeader(QGraphicsWidget* parent = 0); - virtual ~PlacesItemListGroupHeader(); + ~PlacesItemListGroupHeader() override; protected: - virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE; + void paintSeparator(QPainter* painter, const QColor& color) override; - virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE; + QPalette::ColorRole normalTextColorRole() const override; }; #endif diff --git a/src/panels/places/placesitemlistwidget.h b/src/panels/places/placesitemlistwidget.h index e9e6a07678..3be5dde7cf 100644 --- a/src/panels/places/placesitemlistwidget.h +++ b/src/panels/places/placesitemlistwidget.h @@ -32,11 +32,11 @@ class PlacesItemListWidget : public KStandardItemListWidget public: PlacesItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); - virtual ~PlacesItemListWidget(); + ~PlacesItemListWidget() override; protected: - virtual bool isHidden() const Q_DECL_OVERRIDE; - virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE; + bool isHidden() const override; + QPalette::ColorRole normalTextColorRole() const override; }; #endif diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h index 7dd49bf5a7..9c91f7b082 100644 --- a/src/panels/places/placesitemmodel.h +++ b/src/panels/places/placesitemmodel.h @@ -51,7 +51,7 @@ class PlacesItemModel: public KStandardItemModel public: explicit PlacesItemModel(QObject* parent = 0); - virtual ~PlacesItemModel(); + ~PlacesItemModel() override; /** * @return A new instance of a places item with the given @@ -107,9 +107,9 @@ public: bool storageSetupNeeded(int index) const; void requestStorageSetup(int index); - virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE; + QMimeData* createMimeData(const KItemSet& indexes) const override; - virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE; + bool supportsDropping(int index) const override; void dropMimeDataBefore(int index, const QMimeData* mimeData); @@ -121,7 +121,7 @@ public: */ static QUrl convertedUrl(const QUrl& url); - virtual void clear() Q_DECL_OVERRIDE; + void clear() override; void proceedWithTearDown(); @@ -132,7 +132,7 @@ public: */ void saveBookmarks(); - bool isDir(int index) const Q_DECL_OVERRIDE; + bool isDir(int index) const override; signals: void errorMessage(const QString& message); void storageSetupDone(int index, bool success); @@ -140,9 +140,9 @@ signals: void storageTearDownExternallyRequested(const QString& mountPath); protected: - 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& changedRoles) Q_DECL_OVERRIDE; + void onItemInserted(int index) override; + void onItemRemoved(int index, KStandardItem* removedItem) override; + void onItemChanged(int index, const QSet& changedRoles) override; private slots: void slotDeviceAdded(const QString& udi); diff --git a/src/panels/places/placesitemsignalhandler.h b/src/panels/places/placesitemsignalhandler.h index 6110f717d6..49c8e43c96 100644 --- a/src/panels/places/placesitemsignalhandler.h +++ b/src/panels/places/placesitemsignalhandler.h @@ -48,7 +48,7 @@ class PlacesItemSignalHandler: public QObject public: explicit PlacesItemSignalHandler(PlacesItem* item, QObject* parent = nullptr); - virtual ~PlacesItemSignalHandler(); + ~PlacesItemSignalHandler() override; public slots: /** diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h index 4e525a0372..f5c90b1f9d 100644 --- a/src/panels/places/placespanel.h +++ b/src/panels/places/placespanel.h @@ -40,7 +40,7 @@ class PlacesPanel : public Panel public: explicit PlacesPanel(QWidget* parent); - virtual ~PlacesPanel(); + ~PlacesPanel() override; void proceedWithTearDown(); signals: @@ -51,11 +51,11 @@ signals: void storageTearDownExternallyRequested(const QString& mountPath); protected: - virtual bool urlChanged() Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + bool urlChanged() override; + void showEvent(QShowEvent* event) override; public slots: - virtual void readSettings() Q_DECL_OVERRIDE; + void readSettings() override; private slots: void slotItemActivated(int index); diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h index db5658e53c..4c0b93a17a 100644 --- a/src/panels/terminal/terminalpanel.h +++ b/src/panels/terminal/terminalpanel.h @@ -46,7 +46,7 @@ class TerminalPanel : public Panel public: explicit TerminalPanel(QWidget* parent = nullptr); - virtual ~TerminalPanel(); + ~TerminalPanel() override; /** * @brief This function is used to set the terminal panels's cwd to @@ -68,9 +68,9 @@ signals: void changeUrl(const QUrl& url); protected: - virtual bool urlChanged() Q_DECL_OVERRIDE; + bool urlChanged() override; - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; private slots: void slotMostLocalUrlResult(KJob* job); diff --git a/src/search/dolphinfacetswidget.h b/src/search/dolphinfacetswidget.h index 996829ee30..1e8ab6cea7 100644 --- a/src/search/dolphinfacetswidget.h +++ b/src/search/dolphinfacetswidget.h @@ -48,7 +48,7 @@ class DolphinFacetsWidget : public QWidget public: explicit DolphinFacetsWidget(QWidget* parent = nullptr); - virtual ~DolphinFacetsWidget(); + ~DolphinFacetsWidget() override; QString ratingTerm() const; QString facetType() const; diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h index f1ea490918..781c592e16 100644 --- a/src/search/dolphinsearchbox.h +++ b/src/search/dolphinsearchbox.h @@ -47,7 +47,7 @@ class DolphinSearchBox : public QWidget { public: explicit DolphinSearchBox(QWidget* parent = 0); - virtual ~DolphinSearchBox(); + ~DolphinSearchBox() override; /** * Sets the text that should be used as input for @@ -99,11 +99,11 @@ public: bool isActive() const; protected: - virtual bool event(QEvent* event) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; - virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; + bool event(QEvent* event) override; + void showEvent(QShowEvent* event) override; + void hideEvent(QHideEvent* event) override; + void keyReleaseEvent(QKeyEvent* event) override; + bool eventFilter(QObject* obj, QEvent* event) override; signals: /** diff --git a/src/settings/additionalinfodialog.h b/src/settings/additionalinfodialog.h index fd72a7ce19..2a4cd7dbaa 100644 --- a/src/settings/additionalinfodialog.h +++ b/src/settings/additionalinfodialog.h @@ -34,11 +34,11 @@ class AdditionalInfoDialog : public QDialog public: AdditionalInfoDialog(QWidget* parent, const QList& visibleRoles); - virtual ~AdditionalInfoDialog(); + ~AdditionalInfoDialog() override; QList visibleRoles() const; public slots: - void accept() Q_DECL_OVERRIDE; + void accept() override; private: QList m_visibleRoles; diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h index ea9688718a..aeb4a60c6d 100644 --- a/src/settings/applyviewpropsjob.h +++ b/src/settings/applyviewpropsjob.h @@ -60,11 +60,11 @@ public: * sub directories. */ ApplyViewPropsJob(const QUrl& dir, const ViewProperties& viewProps); - virtual ~ApplyViewPropsJob(); + ~ApplyViewPropsJob() override; int progress() const; private slots: - virtual void slotResult(KJob* job) Q_DECL_OVERRIDE; + void slotResult(KJob* job) override; void slotEntries(KIO::Job*, const KIO::UDSEntryList&); private: diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h index 194af28fc5..ca35b0aad3 100644 --- a/src/settings/dolphinsettingsdialog.h +++ b/src/settings/dolphinsettingsdialog.h @@ -37,7 +37,7 @@ class DolphinSettingsDialog : public KPageDialog public: explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = 0); - virtual ~DolphinSettingsDialog(); + ~DolphinSettingsDialog() override; signals: void settingsChanged(); diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h index 96eaf3d644..16a3e95c2e 100644 --- a/src/settings/general/behaviorsettingspage.h +++ b/src/settings/general/behaviorsettingspage.h @@ -37,13 +37,13 @@ class BehaviorSettingsPage : public SettingsPageBase public: BehaviorSettingsPage(const QUrl &url, QWidget* parent); - virtual ~BehaviorSettingsPage(); + ~BehaviorSettingsPage() override; /** @see SettingsPageBase::applySettings() */ - virtual void applySettings() Q_DECL_OVERRIDE; + void applySettings() override; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults() Q_DECL_OVERRIDE; + void restoreDefaults() override; private: void loadSettings(); diff --git a/src/settings/general/configurepreviewplugindialog.h b/src/settings/general/configurepreviewplugindialog.h index 620caeb510..e54fb464a7 100644 --- a/src/settings/general/configurepreviewplugindialog.h +++ b/src/settings/general/configurepreviewplugindialog.h @@ -40,7 +40,7 @@ public: ConfigurePreviewPluginDialog(const QString& pluginName, const QString& desktopEntryName, QWidget* parent); - virtual ~ConfigurePreviewPluginDialog() = default; + ~ConfigurePreviewPluginDialog() override = default; }; #endif diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h index e702fe8ae2..f8e5e3540c 100644 --- a/src/settings/general/confirmationssettingspage.h +++ b/src/settings/general/confirmationssettingspage.h @@ -32,13 +32,13 @@ class ConfirmationsSettingsPage : public SettingsPageBase public: ConfirmationsSettingsPage(QWidget* parent); - virtual ~ConfirmationsSettingsPage(); + ~ConfirmationsSettingsPage() override; /** @see SettingsPageBase::applySettings() */ - virtual void applySettings() Q_DECL_OVERRIDE; + void applySettings() override; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults() Q_DECL_OVERRIDE; + void restoreDefaults() override; private: void loadSettings(); diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h index 7073258fff..a68fc933b1 100644 --- a/src/settings/general/generalsettingspage.h +++ b/src/settings/general/generalsettingspage.h @@ -41,13 +41,13 @@ class GeneralSettingsPage : public SettingsPageBase public: GeneralSettingsPage(const QUrl& url, QWidget* parent); - virtual ~GeneralSettingsPage(); + ~GeneralSettingsPage() override; /** @see SettingsPageBase::applySettings() */ - virtual void applySettings() Q_DECL_OVERRIDE; + void applySettings() override; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults() Q_DECL_OVERRIDE; + void restoreDefaults() override; private: QList m_pages; diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h index 6e896f05ec..0bac4da650 100644 --- a/src/settings/general/previewssettingspage.h +++ b/src/settings/general/previewssettingspage.h @@ -35,20 +35,20 @@ class PreviewsSettingsPage : public SettingsPageBase public: PreviewsSettingsPage(QWidget* parent); - virtual ~PreviewsSettingsPage(); + ~PreviewsSettingsPage() override; /** * Applies the general settings for the view modes * The settings are persisted automatically when * closing Dolphin. */ - virtual void applySettings() Q_DECL_OVERRIDE; + void applySettings() override; /** Restores the settings to default values. */ - virtual void restoreDefaults() Q_DECL_OVERRIDE; + void restoreDefaults() override; protected: - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; private slots: void configureService(const QModelIndex& index); diff --git a/src/settings/general/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h index 6083543716..d85f0aaa15 100644 --- a/src/settings/general/statusbarsettingspage.h +++ b/src/settings/general/statusbarsettingspage.h @@ -32,13 +32,13 @@ class StatusBarSettingsPage : public SettingsPageBase public: StatusBarSettingsPage(QWidget* parent); - virtual ~StatusBarSettingsPage(); + ~StatusBarSettingsPage() override; /** @see SettingsPageBase::applySettings() */ - virtual void applySettings() Q_DECL_OVERRIDE; + void applySettings() override; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults() Q_DECL_OVERRIDE; + void restoreDefaults() override; private: void loadSettings(); diff --git a/src/settings/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h index 50331a75c4..66e42009f8 100644 --- a/src/settings/kcm/kcmdolphingeneral.h +++ b/src/settings/kcm/kcmdolphingeneral.h @@ -34,10 +34,10 @@ class DolphinGeneralConfigModule : public KCModule public: DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args); - virtual ~DolphinGeneralConfigModule(); + ~DolphinGeneralConfigModule() override; - virtual void save() Q_DECL_OVERRIDE; - virtual void defaults() Q_DECL_OVERRIDE; + void save() override; + void defaults() override; private: QList m_pages; diff --git a/src/settings/kcm/kcmdolphinnavigation.h b/src/settings/kcm/kcmdolphinnavigation.h index e8de0753e6..2bcc7ababe 100644 --- a/src/settings/kcm/kcmdolphinnavigation.h +++ b/src/settings/kcm/kcmdolphinnavigation.h @@ -33,10 +33,10 @@ class DolphinNavigationConfigModule : public KCModule public: DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args); - virtual ~DolphinNavigationConfigModule(); + ~DolphinNavigationConfigModule() override; - virtual void save() Q_DECL_OVERRIDE; - virtual void defaults() Q_DECL_OVERRIDE; + void save() override; + void defaults() override; private: NavigationSettingsPage* m_navigation; diff --git a/src/settings/kcm/kcmdolphinservices.h b/src/settings/kcm/kcmdolphinservices.h index 8a63bb045d..6c6af6728a 100644 --- a/src/settings/kcm/kcmdolphinservices.h +++ b/src/settings/kcm/kcmdolphinservices.h @@ -33,10 +33,10 @@ class DolphinServicesConfigModule : public KCModule public: DolphinServicesConfigModule(QWidget* parent, const QVariantList& args); - virtual ~DolphinServicesConfigModule(); + ~DolphinServicesConfigModule() override; - virtual void save() Q_DECL_OVERRIDE; - virtual void defaults() Q_DECL_OVERRIDE; + void save() override; + void defaults() override; private: ServicesSettingsPage* m_services; diff --git a/src/settings/kcm/kcmdolphinviewmodes.h b/src/settings/kcm/kcmdolphinviewmodes.h index 0a0b0ff10d..c3775adff9 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.h +++ b/src/settings/kcm/kcmdolphinviewmodes.h @@ -33,10 +33,10 @@ class DolphinViewModesConfigModule : public KCModule public: DolphinViewModesConfigModule(QWidget* parent, const QVariantList& args); - virtual ~DolphinViewModesConfigModule(); + ~DolphinViewModesConfigModule() override; - virtual void save() Q_DECL_OVERRIDE; - virtual void defaults() Q_DECL_OVERRIDE; + void save() override; + void defaults() override; private: void reparseConfiguration(); diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h index 5410a4efaa..d58a8e8110 100644 --- a/src/settings/navigation/navigationsettingspage.h +++ b/src/settings/navigation/navigationsettingspage.h @@ -32,13 +32,13 @@ class NavigationSettingsPage : public SettingsPageBase public: NavigationSettingsPage(QWidget* parent); - virtual ~NavigationSettingsPage(); + ~NavigationSettingsPage() override; /** @see SettingsPageBase::applySettings() */ - virtual void applySettings() Q_DECL_OVERRIDE; + void applySettings() override; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults() Q_DECL_OVERRIDE; + void restoreDefaults() override; private: void loadSettings(); diff --git a/src/settings/serviceitemdelegate.h b/src/settings/serviceitemdelegate.h index 9f0ced40c8..27fb15c203 100644 --- a/src/settings/serviceitemdelegate.h +++ b/src/settings/serviceitemdelegate.h @@ -34,19 +34,19 @@ class ServiceItemDelegate : public KWidgetItemDelegate public: explicit ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent = 0); - virtual ~ServiceItemDelegate(); + ~ServiceItemDelegate() override; - virtual QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + QSize sizeHint(const QStyleOptionViewItem &option, + const QModelIndex &index) const override; - virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, - const QModelIndex& index) const Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionViewItem& option, + const QModelIndex& index) const override; - virtual QList createItemWidgets(const QModelIndex&) const Q_DECL_OVERRIDE; + QList createItemWidgets(const QModelIndex&) const override; - virtual void updateItemWidgets(const QList widgets, + void updateItemWidgets(const QList widgets, const QStyleOptionViewItem& option, - const QPersistentModelIndex& index) const Q_DECL_OVERRIDE; + const QPersistentModelIndex& index) const override; signals: void requestServiceConfiguration(const QModelIndex& index); diff --git a/src/settings/servicemodel.h b/src/settings/servicemodel.h index f2b91c7e4a..47fe54d6a5 100644 --- a/src/settings/servicemodel.h +++ b/src/settings/servicemodel.h @@ -45,12 +45,12 @@ public: }; explicit ServiceModel(QObject* parent = 0); - virtual ~ServiceModel(); + ~ServiceModel() override; - 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; + bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) override; + bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; private: struct ServiceItem diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h index a883aa947b..c1239c9f5f 100644 --- a/src/settings/services/servicessettingspage.h +++ b/src/settings/services/servicessettingspage.h @@ -36,16 +36,16 @@ class ServicesSettingsPage : public SettingsPageBase public: ServicesSettingsPage(QWidget* parent); - virtual ~ServicesSettingsPage(); + ~ServicesSettingsPage() override; /** @see SettingsPageBase::applySettings() */ - virtual void applySettings() Q_DECL_OVERRIDE; + void applySettings() override; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults() Q_DECL_OVERRIDE; + void restoreDefaults() override; protected: - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; private slots: /** diff --git a/src/settings/settingspagebase.h b/src/settings/settingspagebase.h index 05973d4529..5e50a8df0c 100644 --- a/src/settings/settingspagebase.h +++ b/src/settings/settingspagebase.h @@ -32,7 +32,7 @@ class SettingsPageBase : public QWidget public: explicit SettingsPageBase(QWidget* parent = 0); - virtual ~SettingsPageBase(); + ~SettingsPageBase() override; /** * Must be implemented by a derived class to diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h index 7a69cd3d61..da278e3715 100644 --- a/src/settings/startup/startupsettingspage.h +++ b/src/settings/startup/startupsettingspage.h @@ -37,13 +37,13 @@ class StartupSettingsPage : public SettingsPageBase public: StartupSettingsPage(const QUrl& url, QWidget* parent); - virtual ~StartupSettingsPage(); + ~StartupSettingsPage() override; /** @see SettingsPageBase::applySettings() */ - virtual void applySettings() Q_DECL_OVERRIDE; + void applySettings() override; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults() Q_DECL_OVERRIDE; + void restoreDefaults() override; private slots: void slotSettingsChanged(); diff --git a/src/settings/trash/trashsettingspage.h b/src/settings/trash/trashsettingspage.h index 5c88aeab79..57631b7602 100644 --- a/src/settings/trash/trashsettingspage.h +++ b/src/settings/trash/trashsettingspage.h @@ -31,13 +31,13 @@ class TrashSettingsPage : public SettingsPageBase public: TrashSettingsPage(QWidget* parent); - virtual ~TrashSettingsPage(); + ~TrashSettingsPage() override; /** @see SettingsPageBase::applySettings() */ - virtual void applySettings() Q_DECL_OVERRIDE; + void applySettings() override; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults() Q_DECL_OVERRIDE; + void restoreDefaults() override; private: void loadSettings(); diff --git a/src/settings/viewmodes/dolphinfontrequester.h b/src/settings/viewmodes/dolphinfontrequester.h index 6ef6e3e72a..3f355e3141 100644 --- a/src/settings/viewmodes/dolphinfontrequester.h +++ b/src/settings/viewmodes/dolphinfontrequester.h @@ -41,7 +41,7 @@ public: }; DolphinFontRequester(QWidget* parent); - virtual ~DolphinFontRequester(); + ~DolphinFontRequester() override; void setMode(Mode mode); Mode mode() const; diff --git a/src/settings/viewmodes/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h index 61671077ef..4f57e5c191 100644 --- a/src/settings/viewmodes/viewsettingspage.h +++ b/src/settings/viewmodes/viewsettingspage.h @@ -37,13 +37,13 @@ class ViewSettingsPage : public SettingsPageBase public: ViewSettingsPage(QWidget* parent); - virtual ~ViewSettingsPage(); + ~ViewSettingsPage() override; /** @see SettingsPageBase::applySettings() */ - virtual void applySettings() Q_DECL_OVERRIDE; + void applySettings() override; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults() Q_DECL_OVERRIDE; + void restoreDefaults() override; private: QList m_tabs; diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h index 6bea95b903..4f4071c1a4 100644 --- a/src/settings/viewmodes/viewsettingstab.h +++ b/src/settings/viewmodes/viewsettingstab.h @@ -44,7 +44,7 @@ public: }; explicit ViewSettingsTab(Mode mode, QWidget* parent = 0); - virtual ~ViewSettingsTab(); + ~ViewSettingsTab() override; void applySettings(); void restoreDefaultSettings(); diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h index 5490be85bf..35c18718e1 100644 --- a/src/settings/viewpropertiesdialog.h +++ b/src/settings/viewpropertiesdialog.h @@ -45,10 +45,10 @@ class DOLPHIN_EXPORT ViewPropertiesDialog : public QDialog public: explicit ViewPropertiesDialog(DolphinView* dolphinView); - virtual ~ViewPropertiesDialog(); + ~ViewPropertiesDialog() override; public slots: - void accept() Q_DECL_OVERRIDE; + void accept() override; private slots: void slotApply(); diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h index cd7aa50cea..e69de29762 100644 --- a/src/settings/viewpropsprogressinfo.h +++ b/src/settings/viewpropsprogressinfo.h @@ -53,13 +53,13 @@ public: const QUrl& dir, const ViewProperties& viewProps); - virtual ~ViewPropsProgressInfo(); + ~ViewPropsProgressInfo() override; protected: - virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent* event) override; public slots: - void reject() Q_DECL_OVERRIDE; + void reject() override; private slots: void updateProgress(); diff --git a/src/statusbar/dolphinstatusbar.h b/src/statusbar/dolphinstatusbar.h index 1a4ccf682f..582e56907f 100644 --- a/src/statusbar/dolphinstatusbar.h +++ b/src/statusbar/dolphinstatusbar.h @@ -43,7 +43,7 @@ class DolphinStatusBar : public QWidget public: DolphinStatusBar(QWidget* parent); - virtual ~DolphinStatusBar(); + ~DolphinStatusBar() override; QString text() const; @@ -101,8 +101,8 @@ signals: void zoomLevelChanged(int zoomLevel); protected: - virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent* event) override; + bool eventFilter(QObject* obj, QEvent* event) override; private slots: void showZoomSliderToolTip(int zoomLevel); diff --git a/src/statusbar/mountpointobserver.h b/src/statusbar/mountpointobserver.h index c3d2aa6775..939e848667 100644 --- a/src/statusbar/mountpointobserver.h +++ b/src/statusbar/mountpointobserver.h @@ -54,7 +54,7 @@ class MountPointObserver : public QObject Q_OBJECT explicit MountPointObserver(const QUrl& url, QObject* parent = 0); - virtual ~MountPointObserver() {} + ~MountPointObserver() override {} public: /** diff --git a/src/statusbar/mountpointobservercache.h b/src/statusbar/mountpointobservercache.h index 8a1496d893..74cef0674b 100644 --- a/src/statusbar/mountpointobservercache.h +++ b/src/statusbar/mountpointobservercache.h @@ -31,7 +31,7 @@ class MountPointObserverCache : public QObject Q_OBJECT MountPointObserverCache(); - virtual ~MountPointObserverCache(); + ~MountPointObserverCache() override; public: static MountPointObserverCache* instance(); diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h index e1311abde5..3f203b47ff 100644 --- a/src/statusbar/spaceinfoobserver.h +++ b/src/statusbar/spaceinfoobserver.h @@ -33,7 +33,7 @@ class SpaceInfoObserver : public QObject public: explicit SpaceInfoObserver(const QUrl& url, QObject* parent = 0); - virtual ~SpaceInfoObserver(); + ~SpaceInfoObserver() override; quint64 size() const; quint64 available() const; diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h index 326c419ab3..e89966a597 100644 --- a/src/statusbar/statusbarspaceinfo.h +++ b/src/statusbar/statusbarspaceinfo.h @@ -41,15 +41,15 @@ class StatusBarSpaceInfo : public KCapacityBar public: explicit StatusBarSpaceInfo(QWidget* parent = 0); - virtual ~StatusBarSpaceInfo(); + ~StatusBarSpaceInfo() override; void setUrl(const QUrl& url); QUrl url() const; protected: - void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; + void hideEvent(QHideEvent* event) override; + void mousePressEvent(QMouseEvent* event) override; private slots: void slotValuesChanged(); diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp index 92d05c4d45..10bdb8b242 100644 --- a/src/tests/kitemlistcontrollertest.cpp +++ b/src/tests/kitemlistcontrollertest.cpp @@ -58,7 +58,7 @@ public: int styleHint(StyleHint hint, const QStyleOption* option = nullptr, const QWidget* widget = nullptr, - QStyleHintReturn* returnData = nullptr) const Q_DECL_OVERRIDE + QStyleHintReturn* returnData = nullptr) const override { switch (hint) { case QStyle::SH_ItemView_ActivateItemOnSingleClick: diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp index 48e8dce04d..245f23d64e 100644 --- a/src/tests/kitemlistselectionmanagertest.cpp +++ b/src/tests/kitemlistselectionmanagertest.cpp @@ -30,8 +30,8 @@ class DummyModel : public KItemModelBase public: DummyModel(); void setCount(int count); - int count() const Q_DECL_OVERRIDE; - QHash data(int index) const Q_DECL_OVERRIDE; + int count() const override; + QHash data(int index) const override; private: int m_count; diff --git a/src/views/dolphinfileitemlistwidget.h b/src/views/dolphinfileitemlistwidget.h index af73ac9377..a04bc68282 100644 --- a/src/views/dolphinfileitemlistwidget.h +++ b/src/views/dolphinfileitemlistwidget.h @@ -37,10 +37,10 @@ class DOLPHIN_EXPORT DolphinFileItemListWidget : public KFileItemListWidget public: DolphinFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); - virtual ~DolphinFileItemListWidget(); + ~DolphinFileItemListWidget() override; protected: - virtual void refreshCache() Q_DECL_OVERRIDE; + void refreshCache() override; private: static QPixmap overlayForState(KVersionControlPlugin::ItemVersion version, int size); diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h index 7eec6f17af..7b3f1f8d0a 100644 --- a/src/views/dolphinitemlistview.h +++ b/src/views/dolphinitemlistview.h @@ -40,7 +40,7 @@ class DOLPHIN_EXPORT DolphinItemListView : public KFileItemListView public: explicit DolphinItemListView(QGraphicsWidget* parent = 0); - virtual ~DolphinItemListView(); + ~DolphinItemListView() override; void setZoomLevel(int level); int zoomLevel() const; @@ -49,14 +49,14 @@ public: void writeSettings(); protected: - 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& current, - const QList& previous) Q_DECL_OVERRIDE; + KItemListWidgetCreatorBase* defaultWidgetCreator() const override; + bool itemLayoutSupportsItemExpanding(ItemLayout layout) const override; + void onItemLayoutChanged(ItemLayout current, ItemLayout previous) override; + void onPreviewsShownChanged(bool shown) override; + void onVisibleRolesChanged(const QList& current, + const QList& previous) override; - virtual void updateFont() Q_DECL_OVERRIDE; + void updateFont() override; private: void updateGridSize(); diff --git a/src/views/dolphinnewfilemenuobserver.h b/src/views/dolphinnewfilemenuobserver.h index df4621f171..2386bce1ee 100644 --- a/src/views/dolphinnewfilemenuobserver.h +++ b/src/views/dolphinnewfilemenuobserver.h @@ -48,7 +48,7 @@ signals: private: DolphinNewFileMenuObserver(); - virtual ~DolphinNewFileMenuObserver(); + ~DolphinNewFileMenuObserver() override; friend class DolphinNewFileMenuObserverSingleton; }; diff --git a/src/views/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h index 28ff52cb3f..ca1cea2c7f 100644 --- a/src/views/dolphinremoteencoding.h +++ b/src/views/dolphinremoteencoding.h @@ -40,7 +40,7 @@ class DOLPHIN_EXPORT DolphinRemoteEncoding: public QObject Q_OBJECT public: DolphinRemoteEncoding(QObject* parent, DolphinViewActionHandler* actionHandler); - ~DolphinRemoteEncoding(); + ~DolphinRemoteEncoding() override; public Q_SLOTS: void slotAboutToOpenUrl(); diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index 2df1cf9e4c..61f6af1e2f 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -93,7 +93,7 @@ public: */ DolphinView(const QUrl& url, QWidget* parent); - virtual ~DolphinView(); + ~DolphinView() override; /** * Returns the current active URL, where all actions are applied. @@ -370,7 +370,7 @@ public slots: void stopLoading(); /** Activates the view if the item list container gets focus. */ - virtual bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE; + bool eventFilter(QObject* watched, QEvent* event) override; signals: /** @@ -552,10 +552,10 @@ signals: protected: /** Changes the zoom level if Control is pressed during a wheel event. */ - virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent* event) override; - virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; - virtual bool event(QEvent* event) Q_DECL_OVERRIDE; + void hideEvent(QHideEvent* event) override; + bool event(QEvent* event) override; private slots: /** diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h index 7ead0ca9f8..8a92ea1b98 100644 --- a/src/views/renamedialog.h +++ b/src/views/renamedialog.h @@ -39,7 +39,7 @@ class DOLPHIN_EXPORT RenameDialog : public QDialog public: explicit RenameDialog(QWidget* parent, const KFileItemList& items); - virtual ~RenameDialog(); + ~RenameDialog() override; signals: void renamingFinished(const QList& urls); diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h index c5c228766b..0b9add581e 100644 --- a/src/views/tooltips/dolphinfilemetadatawidget.h +++ b/src/views/tooltips/dolphinfilemetadatawidget.h @@ -46,7 +46,7 @@ class DolphinFileMetaDataWidget : public QWidget public: DolphinFileMetaDataWidget(QWidget* parent = 0); - virtual ~DolphinFileMetaDataWidget(); + ~DolphinFileMetaDataWidget() override; void setPreview(const QPixmap& pixmap); QPixmap preview() const; diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h index 9f1f104f1a..746d6cb67d 100644 --- a/src/views/tooltips/tooltipmanager.h +++ b/src/views/tooltips/tooltipmanager.h @@ -43,7 +43,7 @@ class ToolTipManager : public QObject public: explicit ToolTipManager(QWidget* parent); - virtual ~ToolTipManager(); + ~ToolTipManager() override; /** * Triggers the showing of the tooltip for the item \p item diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h index 1696f975c7..b9b1f0b5b5 100644 --- a/src/views/versioncontrol/kversioncontrolplugin.h +++ b/src/views/versioncontrol/kversioncontrolplugin.h @@ -145,7 +145,7 @@ public: }; KVersionControlPlugin(QObject* parent = 0); - virtual ~KVersionControlPlugin(); + ~KVersionControlPlugin() override; /** * Returns the name of the file which stores diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h index 3dc03fc75b..d33a64cc7f 100644 --- a/src/views/versioncontrol/updateitemstatesthread.h +++ b/src/views/versioncontrol/updateitemstatesthread.h @@ -46,12 +46,12 @@ public: */ UpdateItemStatesThread(KVersionControlPlugin* plugin, const QMap >& itemStates); - virtual ~UpdateItemStatesThread(); + ~UpdateItemStatesThread() override; QMap > itemStates() const; protected: - virtual void run() Q_DECL_OVERRIDE; + void run() override; private: QMutex* m_globalPluginMutex; // Protects the m_plugin globally diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h index c817c21879..0b702f5f1e 100644 --- a/src/views/versioncontrol/versioncontrolobserver.h +++ b/src/views/versioncontrol/versioncontrolobserver.h @@ -51,7 +51,7 @@ class DOLPHIN_EXPORT VersionControlObserver : public QObject public: explicit VersionControlObserver(QObject* parent = 0); - virtual ~VersionControlObserver(); + ~VersionControlObserver() override; void setModel(KFileItemModel* model); KFileItemModel* model() const; diff --git a/src/views/viewmodecontroller.h b/src/views/viewmodecontroller.h index 4b1ff2083e..015fdec857 100644 --- a/src/views/viewmodecontroller.h +++ b/src/views/viewmodecontroller.h @@ -39,7 +39,7 @@ class DOLPHIN_EXPORT ViewModeController : public QObject public: explicit ViewModeController(QObject* parent = 0); - virtual ~ViewModeController(); + ~ViewModeController() override; /** * @return URL that is shown by the view mode implementation.