kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-17 15:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modernize: Use override where possible

Browse source 
Also use override instead of Q_DECL_OVERRIDE
This commit is contained in:
Kevin Funk 2017-11-20 23:25:06 +01:00
parent 5bee1889e1
commit 464b13f382
105 changed files with 428 additions and 428 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dolphincontextmenu.h
View file

@ -74,7 +74,7 @@ public:
const KFileItem& fileInfo, const KFileItem& fileInfo,
const QUrl& baseUrl); const QUrl& baseUrl);
virtual ~DolphinContextMenu(); ~DolphinContextMenu() override;
void setCustomActions(const QList<QAction*>& actions); void setCustomActions(const QList<QAction*>& actions);
@ -89,8 +89,8 @@ public:
Command open(); Command open();
protected: protected:
virtual void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent *ev) override;
virtual void keyReleaseEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent *ev) override;
private: private:
void openTrashContextMenu(); void openTrashContextMenu();

6
src/dolphindockwidget.cpp
View file

@ -36,15 +36,15 @@ class DolphinDockTitleBar : public QWidget
public: public:
explicit DolphinDockTitleBar(QWidget* parent = nullptr) : QWidget(parent) {} 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); const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin);
return QSize(border, border); return QSize(border, border);
} }
QSize sizeHint() const Q_DECL_OVERRIDE QSize sizeHint() const override
{ {
return minimumSizeHint(); return minimumSizeHint();
} }

2
src/dolphindockwidget.h
View file

@ -32,7 +32,7 @@ class DolphinDockWidget : public QDockWidget
public: public:
explicit DolphinDockWidget(const QString& title, QWidget* parent = 0, Qt::WindowFlags flags = 0); explicit DolphinDockWidget(const QString& title, QWidget* parent = 0, Qt::WindowFlags flags = 0);
explicit DolphinDockWidget(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 * @param lock If \a lock is true, the title bar of the dock-widget will get hidden so

14
src/dolphinmainwindow.h
View file

@ -64,7 +64,7 @@ class DolphinMainWindow: public KXmlGuiWindow
public: public:
DolphinMainWindow(); DolphinMainWindow();
virtual ~DolphinMainWindow(); ~DolphinMainWindow() override;
/** /**
* Returns the currently active view. * Returns the currently active view.
@ -152,16 +152,16 @@ signals:
protected: protected:
/** @see QWidget::showEvent() */ /** @see QWidget::showEvent() */
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
/** @see QMainWindow::closeEvent() */ /** @see QMainWindow::closeEvent() */
virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE; void closeEvent(QCloseEvent* event) override;
/** @see KMainWindow::saveProperties() */ /** @see KMainWindow::saveProperties() */
virtual void saveProperties(KConfigGroup& group) Q_DECL_OVERRIDE; void saveProperties(KConfigGroup& group) override;
/** @see KMainWindow::readProperties() */ /** @see KMainWindow::readProperties() */
virtual void readProperties(const KConfigGroup& group) Q_DECL_OVERRIDE; void readProperties(const KConfigGroup& group) override;
private slots: private slots:
/** /**
@ -499,8 +499,8 @@ private:
{ {
public: public:
UndoUiInterface(); UndoUiInterface();
virtual ~UndoUiInterface(); ~UndoUiInterface() override;
virtual void jobError(KIO::Job* job) Q_DECL_OVERRIDE; void jobError(KIO::Job* job) override;
}; };
KNewFileMenu* m_newFileMenu; KNewFileMenu* m_newFileMenu;

4
src/dolphinnewfilemenu.h
View file

@ -41,14 +41,14 @@ class DOLPHIN_EXPORT DolphinNewFileMenu : public KNewFileMenu
public: public:
DolphinNewFileMenu(KActionCollection* collection, QObject* parent); DolphinNewFileMenu(KActionCollection* collection, QObject* parent);
virtual ~DolphinNewFileMenu(); ~DolphinNewFileMenu() override;
signals: signals:
void errorMessage(const QString& error); void errorMessage(const QString& error);
protected slots: protected slots:
/** @see KNewFileMenu::slotResult() */ /** @see KNewFileMenu::slotResult() */
virtual void slotResult(KJob* job) Q_DECL_OVERRIDE; void slotResult(KJob* job) override;
}; };
#endif #endif

8
src/dolphinpart.h
View file

@ -54,7 +54,7 @@ class DolphinPart : public KParts::ReadOnlyPart
public: public:
explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args); explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args);
~DolphinPart(); ~DolphinPart() override;
static KAboutData* createAboutData(); static KAboutData* createAboutData();
@ -62,7 +62,7 @@ public:
* Standard KParts::ReadOnlyPart openUrl method. * Standard KParts::ReadOnlyPart openUrl method.
* Called by Konqueror to view a directory in DolphinPart. * 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 /// see the supportsUndo property
bool supportsUndo() const { return true; } bool supportsUndo() const { return true; }
@ -98,7 +98,7 @@ protected:
/** /**
* We reimplement openUrl so no need to implement openFile. * We reimplement openUrl so no need to implement openFile.
*/ */
virtual bool openFile() override { return true; } bool openFile() override { return true; }
Q_SIGNALS: Q_SIGNALS:
/** /**
@ -223,7 +223,7 @@ private Q_SLOTS:
void setFilesToSelect(const QList<QUrl> &files); void setFilesToSelect(const QList<QUrl> &files);
QList<QUrl> filesToSelect() const { return QList<QUrl>(); } // silence moc QList<QUrl> filesToSelect() const { return QList<QUrl>(); } // silence moc
virtual bool eventFilter(QObject*, QEvent*) Q_DECL_OVERRIDE; bool eventFilter(QObject*, QEvent*) override;
private: private:
void createActions(); void createActions();

20
src/dolphinpart_ext.h
View file

@ -33,8 +33,8 @@ class DolphinPartBrowserExtension : public KParts::BrowserExtension
Q_OBJECT Q_OBJECT
public: public:
DolphinPartBrowserExtension( DolphinPart* part ); DolphinPartBrowserExtension( DolphinPart* part );
virtual void restoreState(QDataStream &stream) Q_DECL_OVERRIDE; void restoreState(QDataStream &stream) override;
virtual void saveState(QDataStream &stream) Q_DECL_OVERRIDE; void saveState(QDataStream &stream) override;
public Q_SLOTS: public Q_SLOTS:
void cut(); void cut();
@ -54,10 +54,10 @@ class DolphinPartFileInfoExtension : public KParts::FileInfoExtension
public: public:
DolphinPartFileInfoExtension(DolphinPart* part); DolphinPartFileInfoExtension(DolphinPart* part);
virtual QueryModes supportedQueryModes() const Q_DECL_OVERRIDE; QueryModes supportedQueryModes() const override;
virtual bool hasSelection() const Q_DECL_OVERRIDE; bool hasSelection() const override;
virtual KFileItemList queryFor(QueryMode mode) const Q_DECL_OVERRIDE; KFileItemList queryFor(QueryMode mode) const override;
private: private:
DolphinPart* m_part; DolphinPart* m_part;
@ -69,10 +69,10 @@ class DolphinPartListingFilterExtension : public KParts::ListingFilterExtension
public: public:
DolphinPartListingFilterExtension(DolphinPart* part); DolphinPartListingFilterExtension(DolphinPart* part);
virtual FilterModes supportedFilterModes() const Q_DECL_OVERRIDE; FilterModes supportedFilterModes() const override;
virtual bool supportsMultipleFilters(FilterMode mode) const Q_DECL_OVERRIDE; bool supportsMultipleFilters(FilterMode mode) const override;
virtual QVariant filter(FilterMode mode) const Q_DECL_OVERRIDE; QVariant filter(FilterMode mode) const override;
virtual void setFilter(FilterMode mode, const QVariant& filter) Q_DECL_OVERRIDE; void setFilter(FilterMode mode, const QVariant& filter) override;
private: private:
DolphinPart* m_part; DolphinPart* m_part;
@ -84,7 +84,7 @@ class DolphinPartListingNotificationExtension : public KParts::ListingNotificati
public: public:
DolphinPartListingNotificationExtension(DolphinPart* part); DolphinPartListingNotificationExtension(DolphinPart* part);
virtual NotificationEventTypes supportedNotificationEventTypes() const Q_DECL_OVERRIDE; NotificationEventTypes supportedNotificationEventTypes() const override;
public Q_SLOTS: public Q_SLOTS:
void slotNewItems(const KFileItemList&); void slotNewItems(const KFileItemList&);

16
src/dolphintabbar.h
View file

@ -35,18 +35,18 @@ signals:
void tabDetachRequested(int index); void tabDetachRequested(int index);
protected: protected:
virtual void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE; void dragEnterEvent(QDragEnterEvent* event) override;
virtual void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE; void dragLeaveEvent(QDragLeaveEvent* event) override;
virtual void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE; void dragMoveEvent(QDragMoveEvent* event) override;
virtual void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE; void dropEvent(QDropEvent* event) override;
virtual void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE; void mousePressEvent(QMouseEvent* event) override;
virtual void mouseReleaseEvent(QMouseEvent* event) Q_DECL_OVERRIDE; void mouseReleaseEvent(QMouseEvent* event) override;
virtual void mouseDoubleClickEvent(QMouseEvent* event) Q_DECL_OVERRIDE; void mouseDoubleClickEvent(QMouseEvent* event) override;
/** /**
* Opens a context menu for the tab on the \a event position. * 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: private slots:
void slotAutoActivationTimeout(); void slotAutoActivationTimeout();

4
src/dolphintabwidget.h
View file

@ -174,8 +174,8 @@ private slots:
void currentTabChanged(int index); void currentTabChanged(int index);
protected: protected:
virtual void tabInserted(int index) Q_DECL_OVERRIDE; void tabInserted(int index) override;
virtual void tabRemoved(int index) Q_DECL_OVERRIDE; void tabRemoved(int index) override;
private: private:
/** /**

2
src/dolphinviewcontainer.h
View file

@ -70,7 +70,7 @@ public:
}; };
DolphinViewContainer(const QUrl& url, QWidget* parent); DolphinViewContainer(const QUrl& url, QWidget* parent);
virtual ~DolphinViewContainer(); ~DolphinViewContainer() override;
/** /**
* Returns the current active URL, where all actions are applied. * Returns the current active URL, where all actions are applied.

6
src/filterbar/filterbar.h
View file

@ -38,7 +38,7 @@ class FilterBar : public QWidget
public: public:
explicit FilterBar(QWidget* parent = 0); explicit FilterBar(QWidget* parent = 0);
virtual ~FilterBar(); ~FilterBar() override;
/** Called by view container to hide this **/ /** Called by view container to hide this **/
void closeFilterBar(); void closeFilterBar();
@ -74,8 +74,8 @@ signals:
void focusViewRequest(); void focusViewRequest();
protected: protected:
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent* event) override;
private: private:
QLineEdit* m_filterInput; QLineEdit* m_filterInput;

34
src/kitemviews/kfileitemlistview.h
View file

@ -42,7 +42,7 @@ class DOLPHIN_EXPORT KFileItemListView : public KStandardItemListView
public: public:
KFileItemListView(QGraphicsWidget* parent = 0); KFileItemListView(QGraphicsWidget* parent = 0);
virtual ~KFileItemListView(); ~KFileItemListView() override;
void setPreviewsShown(bool show); void setPreviewsShown(bool show);
bool previewsShown() const; bool previewsShown() const;
@ -72,27 +72,27 @@ public:
*/ */
QStringList enabledPlugins() const; QStringList enabledPlugins() const;
virtual QPixmap createDragPixmap(const KItemSet& indexes) const Q_DECL_OVERRIDE; QPixmap createDragPixmap(const KItemSet& indexes) const override;
protected: protected:
virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE; KItemListWidgetCreatorBase* defaultWidgetCreator() const override;
virtual void initializeItemListWidget(KItemListWidget* item) Q_DECL_OVERRIDE; void initializeItemListWidget(KItemListWidget* item) override;
virtual void onPreviewsShownChanged(bool shown); virtual void onPreviewsShownChanged(bool shown);
virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous) Q_DECL_OVERRIDE; void onItemLayoutChanged(ItemLayout current, ItemLayout previous) override;
virtual void onModelChanged(KItemModelBase* current, KItemModelBase* previous) Q_DECL_OVERRIDE; void onModelChanged(KItemModelBase* current, KItemModelBase* previous) override;
virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) Q_DECL_OVERRIDE; void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) override;
virtual void onItemSizeChanged(const QSizeF& current, const QSizeF& previous) Q_DECL_OVERRIDE; void onItemSizeChanged(const QSizeF& current, const QSizeF& previous) override;
virtual void onScrollOffsetChanged(qreal current, qreal previous) Q_DECL_OVERRIDE; void onScrollOffsetChanged(qreal current, qreal previous) override;
virtual void onVisibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) Q_DECL_OVERRIDE; void onVisibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) override;
virtual void onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) Q_DECL_OVERRIDE; void onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) override;
virtual void onSupportsItemExpandingChanged(bool supportsExpanding) Q_DECL_OVERRIDE; void onSupportsItemExpandingChanged(bool supportsExpanding) override;
virtual void onTransactionBegin() Q_DECL_OVERRIDE; void onTransactionBegin() override;
virtual void onTransactionEnd() Q_DECL_OVERRIDE; void onTransactionEnd() override;
virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; void resizeEvent(QGraphicsSceneResizeEvent* event) override;
protected slots: protected slots:
virtual void slotItemsRemoved(const KItemRangeList& itemRanges) Q_DECL_OVERRIDE; void slotItemsRemoved(const KItemRangeList& itemRanges) override;
virtual void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE; void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) override;
private slots: private slots:
void triggerVisibleIndexRangeUpdate(); void triggerVisibleIndexRangeUpdate();

20
src/kitemviews/kfileitemlistwidget.h
View file

@ -28,13 +28,13 @@ class DOLPHIN_EXPORT KFileItemListWidgetInformant : public KStandardItemListWidg
{ {
public: public:
KFileItemListWidgetInformant(); KFileItemListWidgetInformant();
virtual ~KFileItemListWidgetInformant(); ~KFileItemListWidgetInformant() override;
protected: protected:
virtual QString itemText(int index, const KItemListView* view) const Q_DECL_OVERRIDE; QString itemText(int index, const KItemListView* view) const override;
virtual bool itemIsLink(int index, const KItemListView* view) const Q_DECL_OVERRIDE; bool itemIsLink(int index, const KItemListView* view) const override;
virtual QString roleText(const QByteArray& role, const QHash<QByteArray, QVariant>& values) const Q_DECL_OVERRIDE; QString roleText(const QByteArray& role, const QHash<QByteArray, QVariant>& values) const override;
virtual QFont customizedFontForLinks(const QFont& baseFont) const Q_DECL_OVERRIDE; QFont customizedFontForLinks(const QFont& baseFont) const override;
}; };
class DOLPHIN_EXPORT KFileItemListWidget : public KStandardItemListWidget class DOLPHIN_EXPORT KFileItemListWidget : public KStandardItemListWidget
@ -43,19 +43,19 @@ class DOLPHIN_EXPORT KFileItemListWidget : public KStandardItemListWidget
public: public:
KFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); KFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
virtual ~KFileItemListWidget(); ~KFileItemListWidget() override;
static KItemListWidgetInformant* createInformant(); static KItemListWidgetInformant* createInformant();
protected: protected:
virtual bool isRoleRightAligned(const QByteArray& role) const Q_DECL_OVERRIDE; bool isRoleRightAligned(const QByteArray& role) const override;
virtual bool isHidden() const Q_DECL_OVERRIDE; bool isHidden() const override;
virtual QFont customizedFont(const QFont& baseFont) const Q_DECL_OVERRIDE; QFont customizedFont(const QFont& baseFont) const override;
/** /**
* @return Selection length without MIME-type extension * @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 #endif

34
src/kitemviews/kfileitemmodel.h
View file

@ -51,7 +51,7 @@ class DOLPHIN_EXPORT KFileItemModel : public KItemModelBase
public: public:
explicit KFileItemModel(QObject* parent = 0); explicit KFileItemModel(QObject* parent = 0);
virtual ~KFileItemModel(); ~KFileItemModel() override;
/** /**
* Loads the directory specified by \a url. The signals * Loads the directory specified by \a url. The signals
@ -73,7 +73,7 @@ public:
* the root-parent of all items. * the root-parent of all items.
* @see rootItem() * @see rootItem()
*/ */
QUrl directory() const Q_DECL_OVERRIDE; QUrl directory() const override;
/** /**
* Cancels the loading of a directory which has been started by either * Cancels the loading of a directory which has been started by either
@ -81,9 +81,9 @@ public:
*/ */
void cancelDirectoryLoading(); void cancelDirectoryLoading();
virtual int count() const Q_DECL_OVERRIDE; int count() const override;
virtual QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE; QHash<QByteArray, QVariant> data(int index) const override;
virtual bool setData(int index, const QHash<QByteArray, QVariant>& values) Q_DECL_OVERRIDE; bool setData(int index, const QHash<QByteArray, QVariant>& values) override;
/** /**
* Sets a separate sorting with directories first (true) or a mixed * Sets a separate sorting with directories first (true) or a mixed
@ -102,15 +102,15 @@ public:
void setShowDirectoriesOnly(bool enabled); void setShowDirectoriesOnly(bool enabled);
bool showDirectoriesOnly() const; 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<QPair<int, QVariant> > groups() const Q_DECL_OVERRIDE; QList<QPair<int, QVariant> > groups() const override;
/** /**
* @return The file-item for the index \a index. If the index is in a valid * @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<QByteArray>& roles); void setRoles(const QSet<QByteArray>& roles);
QSet<QByteArray> roles() const; QSet<QByteArray> roles() const;
virtual bool setExpanded(int index, bool expanded) Q_DECL_OVERRIDE; bool setExpanded(int index, bool expanded) override;
virtual bool isExpanded(int index) const Q_DECL_OVERRIDE; bool isExpanded(int index) const override;
virtual bool isExpandable(int index) const Q_DECL_OVERRIDE; bool isExpandable(int index) const override;
virtual int expandedParentsCount(int index) const Q_DECL_OVERRIDE; int expandedParentsCount(int index) const override;
QSet<QUrl> expandedDirectories() const; QSet<QUrl> expandedDirectories() const;
@ -258,9 +258,9 @@ signals:
void urlIsFileError(const QUrl& url); void urlIsFileError(const QUrl& url);
protected: protected:
virtual void onGroupedSortingChanged(bool current) Q_DECL_OVERRIDE; void onGroupedSortingChanged(bool current) override;
virtual void onSortRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE; void onSortRoleChanged(const QByteArray& current, const QByteArray& previous) override;
virtual void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) Q_DECL_OVERRIDE; void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) override;
private slots: private slots:
/** /**

2
src/kitemviews/kfileitemmodelrolesupdater.h
View file

@ -95,7 +95,7 @@ class DOLPHIN_EXPORT KFileItemModelRolesUpdater : public QObject
public: public:
explicit KFileItemModelRolesUpdater(KFileItemModel* model, QObject* parent = 0); explicit KFileItemModelRolesUpdater(KFileItemModel* model, QObject* parent = 0);
virtual ~KFileItemModelRolesUpdater(); ~KFileItemModelRolesUpdater() override;
void setIconSize(const QSize& size); void setIconSize(const QSize& size);
QSize iconSize() const; QSize iconSize() const;

2
src/kitemviews/kitemlistcontainer.cpp
View file

@ -48,7 +48,7 @@ class KItemListContainerViewport : public QGraphicsView
public: public:
KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent); KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent);
protected: protected:
void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE; void wheelEvent(QWheelEvent* event) override;
}; };
KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent) : KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent) :

12
src/kitemviews/kitemlistcontainer.h
View file

@ -51,18 +51,18 @@ public:
* @param parent Optional parent widget. * @param parent Optional parent widget.
*/ */
explicit KItemListContainer(KItemListController* controller, QWidget* parent = 0); explicit KItemListContainer(KItemListController* controller, QWidget* parent = 0);
virtual ~KItemListContainer(); ~KItemListContainer() override;
KItemListController* controller() const; KItemListController* controller() const;
void setEnabledFrame(bool enable); void setEnabledFrame(bool enable);
bool enabledFrame() const; bool enabledFrame() const;
protected: protected:
virtual void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent* event) override;
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE; void resizeEvent(QResizeEvent* event) override;
virtual void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; void scrollContentsBy(int dx, int dy) override;
virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE; void wheelEvent(QWheelEvent* event) override;
private slots: private slots:
void slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); void slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);

2
src/kitemviews/kitemlistcontroller.h
View file

@ -89,7 +89,7 @@ public:
* @param parent Optional parent object. * @param parent Optional parent object.
*/ */
KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent = 0); KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent = 0);
virtual ~KItemListController(); ~KItemListController() override;
void setModel(KItemModelBase* model); void setModel(KItemModelBase* model);
KItemModelBase* model() const; KItemModelBase* model() const;

6
src/kitemviews/kitemlistgroupheader.h
View file

@ -43,7 +43,7 @@ class DOLPHIN_EXPORT KItemListGroupHeader : public QGraphicsWidget
public: public:
KItemListGroupHeader(QGraphicsWidget* parent = 0); KItemListGroupHeader(QGraphicsWidget* parent = 0);
virtual ~KItemListGroupHeader(); ~KItemListGroupHeader() override;
void setRole(const QByteArray& role); void setRole(const QByteArray& role);
QByteArray role() const; QByteArray role() const;
@ -65,7 +65,7 @@ public:
void setItemIndex(int index); void setItemIndex(int index);
int itemIndex() const; 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: protected:
virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) = 0; 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 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 normalTextColorRole() const;
virtual QPalette::ColorRole normalBaseColorRole() const; virtual QPalette::ColorRole normalBaseColorRole() const;

2
src/kitemviews/kitemlistheader.h
View file

@ -38,7 +38,7 @@ class DOLPHIN_EXPORT KItemListHeader : public QObject
Q_OBJECT Q_OBJECT
public: public:
virtual ~KItemListHeader(); ~KItemListHeader() override;
/** /**
* If set to true, KItemListView will automatically adjust the * If set to true, KItemListView will automatically adjust the

2
src/kitemviews/kitemlistselectionmanager.h
View file

@ -52,7 +52,7 @@ public:
}; };
KItemListSelectionManager(QObject* parent = 0); KItemListSelectionManager(QObject* parent = 0);
virtual ~KItemListSelectionManager(); ~KItemListSelectionManager() override;
void setCurrentItem(int current); void setCurrentItem(int current);
int currentItem() const; int currentItem() const;

40
src/kitemviews/kitemlistview.h
View file

@ -68,7 +68,7 @@ class DOLPHIN_EXPORT KItemListView : public QGraphicsWidget
public: public:
KItemListView(QGraphicsWidget* parent = 0); KItemListView(QGraphicsWidget* parent = 0);
virtual ~KItemListView(); ~KItemListView() override;
/** /**
* Offset of the scrollbar that represents the scroll-orientation * Offset of the scrollbar that represents the scroll-orientation
@ -165,7 +165,7 @@ public:
const KItemListStyleOption& styleOption() const; 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. * @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); 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: signals:
void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);
@ -325,7 +325,7 @@ signals:
void roleEditingFinished(int index, const QByteArray& role, const QVariant& value); void roleEditingFinished(int index, const QByteArray& role, const QVariant& value);
protected: 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 setItemSize(const QSizeF& size);
void setStyleOption(const KItemListStyleOption& option); void setStyleOption(const KItemListStyleOption& option);
@ -382,13 +382,13 @@ protected:
virtual void onTransactionBegin(); virtual void onTransactionBegin();
virtual void onTransactionEnd(); virtual void onTransactionEnd();
virtual bool event(QEvent* event) Q_DECL_OVERRIDE; bool event(QEvent* event) override;
virtual void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; void mousePressEvent(QGraphicsSceneMouseEvent* event) override;
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override;
virtual void dragEnterEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; void dragEnterEvent(QGraphicsSceneDragDropEvent* event) override;
virtual void dragMoveEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; void dragMoveEvent(QGraphicsSceneDragDropEvent* event) override;
virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; void dragLeaveEvent(QGraphicsSceneDragDropEvent* event) override;
virtual void dropEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; void dropEvent(QGraphicsSceneDragDropEvent* event) override;
QList<KItemListWidget*> visibleItemListWidgets() const; QList<KItemListWidget*> visibleItemListWidgets() const;
@ -803,7 +803,7 @@ private:
class DOLPHIN_EXPORT KItemListWidgetCreatorBase : public KItemListCreatorBase class DOLPHIN_EXPORT KItemListWidgetCreatorBase : public KItemListCreatorBase
{ {
public: public:
virtual ~KItemListWidgetCreatorBase(); ~KItemListWidgetCreatorBase() override;
virtual KItemListWidget* create(KItemListView* view) = 0; virtual KItemListWidget* create(KItemListView* view) = 0;
@ -824,15 +824,15 @@ class KItemListWidgetCreator : public KItemListWidgetCreatorBase
{ {
public: public:
KItemListWidgetCreator(); KItemListWidgetCreator();
virtual ~KItemListWidgetCreator(); ~KItemListWidgetCreator() override;
virtual KItemListWidget* create(KItemListView* view) Q_DECL_OVERRIDE; KItemListWidget* create(KItemListView* view) override;
virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const Q_DECL_OVERRIDE; void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const override;
virtual qreal preferredRoleColumnWidth(const QByteArray& role, qreal preferredRoleColumnWidth(const QByteArray& role,
int index, int index,
const KItemListView* view) const Q_DECL_OVERRIDE; const KItemListView* view) const override;
private: private:
KItemListWidgetInformant* m_informant; KItemListWidgetInformant* m_informant;
}; };
@ -885,7 +885,7 @@ qreal KItemListWidgetCreator<T>::preferredRoleColumnWidth(const QByteArray& role
class DOLPHIN_EXPORT KItemListGroupHeaderCreatorBase : public KItemListCreatorBase class DOLPHIN_EXPORT KItemListGroupHeaderCreatorBase : public KItemListCreatorBase
{ {
public: public:
virtual ~KItemListGroupHeaderCreatorBase(); ~KItemListGroupHeaderCreatorBase() override;
virtual KItemListGroupHeader* create(KItemListView* view) = 0; virtual KItemListGroupHeader* create(KItemListView* view) = 0;
virtual void recycle(KItemListGroupHeader* header); virtual void recycle(KItemListGroupHeader* header);
}; };
@ -894,8 +894,8 @@ template <class T>
class KItemListGroupHeaderCreator : public KItemListGroupHeaderCreatorBase class KItemListGroupHeaderCreator : public KItemListGroupHeaderCreatorBase
{ {
public: public:
virtual ~KItemListGroupHeaderCreator(); ~KItemListGroupHeaderCreator() override;
virtual KItemListGroupHeader* create(KItemListView* view) Q_DECL_OVERRIDE; KItemListGroupHeader* create(KItemListView* view) override;
}; };
template <class T> template <class T>

112
src/kitemviews/kitemlistviewaccessible.h
View file

@ -36,44 +36,44 @@ class DOLPHIN_EXPORT KItemListViewAccessible: public QAccessibleObject, public Q
{ {
public: public:
explicit KItemListViewAccessible(KItemListView* view); 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::Role role() const override;
QAccessible::State state() const Q_DECL_OVERRIDE; QAccessible::State state() const override;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; QString text(QAccessible::Text t) const override;
QRect rect() const Q_DECL_OVERRIDE; QRect rect() const override;
QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; QAccessibleInterface* child(int index) const override;
int childCount() const Q_DECL_OVERRIDE; int childCount() const override;
int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE; int indexOfChild(const QAccessibleInterface*) const override;
QAccessibleInterface* childAt(int x, int y) const Q_DECL_OVERRIDE; QAccessibleInterface* childAt(int x, int y) const override;
QAccessibleInterface* parent() const Q_DECL_OVERRIDE; QAccessibleInterface* parent() const override;
// Table interface // Table interface
virtual QAccessibleInterface* cellAt(int row, int column) const Q_DECL_OVERRIDE; QAccessibleInterface* cellAt(int row, int column) const override;
virtual QAccessibleInterface* caption() const Q_DECL_OVERRIDE; QAccessibleInterface* caption() const override;
virtual QAccessibleInterface* summary() const Q_DECL_OVERRIDE; QAccessibleInterface* summary() const override;
virtual QString columnDescription(int column) const Q_DECL_OVERRIDE; QString columnDescription(int column) const override;
virtual QString rowDescription(int row) const Q_DECL_OVERRIDE; QString rowDescription(int row) const override;
virtual int columnCount() const Q_DECL_OVERRIDE; int columnCount() const override;
virtual int rowCount() const Q_DECL_OVERRIDE; int rowCount() const override;
// Selection // Selection
virtual int selectedCellCount() const Q_DECL_OVERRIDE; int selectedCellCount() const override;
virtual int selectedColumnCount() const Q_DECL_OVERRIDE; int selectedColumnCount() const override;
virtual int selectedRowCount() const Q_DECL_OVERRIDE; int selectedRowCount() const override;
virtual QList<QAccessibleInterface*> selectedCells() const Q_DECL_OVERRIDE; QList<QAccessibleInterface*> selectedCells() const override;
virtual QList<int> selectedColumns() const Q_DECL_OVERRIDE; QList<int> selectedColumns() const override;
virtual QList<int> selectedRows() const Q_DECL_OVERRIDE; QList<int> selectedRows() const override;
virtual bool isColumnSelected(int column) const Q_DECL_OVERRIDE; bool isColumnSelected(int column) const override;
virtual bool isRowSelected(int row) const Q_DECL_OVERRIDE; bool isRowSelected(int row) const override;
virtual bool selectRow(int row) Q_DECL_OVERRIDE; bool selectRow(int row) override;
virtual bool selectColumn(int column) Q_DECL_OVERRIDE; bool selectColumn(int column) override;
virtual bool unselectRow(int row) Q_DECL_OVERRIDE; bool unselectRow(int row) override;
virtual bool unselectColumn(int column) Q_DECL_OVERRIDE; bool unselectColumn(int column) override;
virtual void modelChange(QAccessibleTableModelChangeEvent*) Q_DECL_OVERRIDE; void modelChange(QAccessibleTableModelChangeEvent*) override;
KItemListView* view() const; KItemListView* view() const;
@ -94,32 +94,32 @@ class DOLPHIN_EXPORT KItemListAccessibleCell: public QAccessibleInterface, publi
public: public:
KItemListAccessibleCell(KItemListView* view, int m_index); KItemListAccessibleCell(KItemListView* view, int m_index);
void* interface_cast(QAccessible::InterfaceType type) Q_DECL_OVERRIDE; void* interface_cast(QAccessible::InterfaceType type) override;
QObject* object() const Q_DECL_OVERRIDE; QObject* object() const override;
bool isValid() const Q_DECL_OVERRIDE; bool isValid() const override;
QAccessible::Role role() const Q_DECL_OVERRIDE; QAccessible::Role role() const override;
QAccessible::State state() const Q_DECL_OVERRIDE; QAccessible::State state() const override;
QRect rect() const Q_DECL_OVERRIDE; QRect rect() const override;
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; QString text(QAccessible::Text t) const override;
void setText(QAccessible::Text t, const QString& text) Q_DECL_OVERRIDE; void setText(QAccessible::Text t, const QString& text) override;
QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; QAccessibleInterface* child(int index) const override;
int childCount() const Q_DECL_OVERRIDE; int childCount() const override;
QAccessibleInterface* childAt(int x, int y) const Q_DECL_OVERRIDE; QAccessibleInterface* childAt(int x, int y) const override;
int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE; int indexOfChild(const QAccessibleInterface*) const override;
QAccessibleInterface* parent() const Q_DECL_OVERRIDE; QAccessibleInterface* parent() const override;
bool isExpandable() const; bool isExpandable() const;
// Cell Interface // Cell Interface
virtual int columnExtent() const Q_DECL_OVERRIDE; int columnExtent() const override;
virtual QList<QAccessibleInterface*> columnHeaderCells() const Q_DECL_OVERRIDE; QList<QAccessibleInterface*> columnHeaderCells() const override;
virtual int columnIndex() const Q_DECL_OVERRIDE; int columnIndex() const override;
virtual int rowExtent() const Q_DECL_OVERRIDE; int rowExtent() const override;
virtual QList<QAccessibleInterface*> rowHeaderCells() const Q_DECL_OVERRIDE; QList<QAccessibleInterface*> rowHeaderCells() const override;
virtual int rowIndex() const Q_DECL_OVERRIDE; int rowIndex() const override;
virtual bool isSelected() const Q_DECL_OVERRIDE; bool isSelected() const override;
virtual QAccessibleInterface* table() const Q_DECL_OVERRIDE; QAccessibleInterface* table() const override;
inline int index() const; inline int index() const;
@ -132,11 +132,11 @@ class DOLPHIN_EXPORT KItemListContainerAccessible : public QAccessibleWidget
{ {
public: public:
explicit KItemListContainerAccessible(KItemListContainer* container); explicit KItemListContainerAccessible(KItemListContainer* container);
virtual ~KItemListContainerAccessible(); ~KItemListContainerAccessible() override;
QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; QAccessibleInterface* child(int index) const override;
int childCount() const Q_DECL_OVERRIDE; int childCount() const override;
int indexOfChild(const QAccessibleInterface* child) const Q_DECL_OVERRIDE; int indexOfChild(const QAccessibleInterface* child) const override;
private: private:
const KItemListContainer* container() const; const KItemListContainer* container() const;

8
src/kitemviews/kitemlistwidget.h
View file

@ -69,7 +69,7 @@ class DOLPHIN_EXPORT KItemListWidget : public QGraphicsWidget
public: public:
KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
virtual ~KItemListWidget(); ~KItemListWidget() override;
void setIndex(int index); void setIndex(int index);
int index() const; int index() const;
@ -82,7 +82,7 @@ public:
* to show the data of the custom model provided by KItemListWidget::data(). * to show the data of the custom model provided by KItemListWidget::data().
* @reimp * @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<QByteArray>& roles); void setVisibleRoles(const QList<QByteArray>& roles);
QList<QByteArray> visibleRoles() const; QList<QByteArray> visibleRoles() const;
@ -142,7 +142,7 @@ public:
* or KItemListWidget::expansionToggleRect(). * or KItemListWidget::expansionToggleRect().
* @reimp * @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. * @return Rectangle for the area that shows the icon.
@ -203,7 +203,7 @@ protected:
virtual void alternateBackgroundChanged(bool enabled); virtual void alternateBackgroundChanged(bool enabled);
virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous); virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous);
virtual void editedRoleChanged(const QByteArray& current, const QByteArray& 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 * @return The current opacity of the hover-animation. When implementing a custom painting-code for a hover-state

2
src/kitemviews/kitemmodelbase.h
View file

@ -57,7 +57,7 @@ class DOLPHIN_EXPORT KItemModelBase : public QObject
public: public:
KItemModelBase(QObject* parent = 0); KItemModelBase(QObject* parent = 0);
explicit KItemModelBase(const QByteArray& sortRole, QObject* parent = 0); explicit KItemModelBase(const QByteArray& sortRole, QObject* parent = 0);
virtual ~KItemModelBase(); ~KItemModelBase() override;
/** @return The number of items. */ /** @return The number of items. */
virtual int count() const = 0; virtual int count() const = 0;

14
src/kitemviews/kstandarditemlistgroupheader.h
View file

@ -33,16 +33,16 @@ class DOLPHIN_EXPORT KStandardItemListGroupHeader : public KItemListGroupHeader
public: public:
KStandardItemListGroupHeader(QGraphicsWidget* parent = 0); 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: protected:
virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) Q_DECL_OVERRIDE; void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) override;
virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE; void paintSeparator(QPainter* painter, const QColor& color) override;
virtual void roleChanged(const QByteArray &current, const QByteArray &previous) Q_DECL_OVERRIDE; void roleChanged(const QByteArray &current, const QByteArray &previous) override;
virtual void dataChanged(const QVariant& current, const QVariant& previous) Q_DECL_OVERRIDE; void dataChanged(const QVariant& current, const QVariant& previous) override;
virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; void resizeEvent(QGraphicsSceneResizeEvent* event) override;
private: private:
void updateCache(); void updateCache();

16
src/kitemviews/kstandarditemlistview.h
View file

@ -53,21 +53,21 @@ public:
}; };
KStandardItemListView(QGraphicsWidget* parent = 0); KStandardItemListView(QGraphicsWidget* parent = 0);
virtual ~KStandardItemListView(); ~KStandardItemListView() override;
void setItemLayout(ItemLayout layout); void setItemLayout(ItemLayout layout);
ItemLayout itemLayout() const; ItemLayout itemLayout() const;
protected: protected:
virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE; KItemListWidgetCreatorBase* defaultWidgetCreator() const override;
virtual KItemListGroupHeaderCreatorBase* defaultGroupHeaderCreator() const Q_DECL_OVERRIDE; KItemListGroupHeaderCreatorBase* defaultGroupHeaderCreator() const override;
virtual void initializeItemListWidget(KItemListWidget* item) Q_DECL_OVERRIDE; void initializeItemListWidget(KItemListWidget* item) override;
virtual bool itemSizeHintUpdateRequired(const QSet<QByteArray>& changedRoles) const Q_DECL_OVERRIDE; bool itemSizeHintUpdateRequired(const QSet<QByteArray>& changedRoles) const override;
virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const; virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const;
virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous); virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous);
virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) Q_DECL_OVERRIDE; void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) override;
virtual void onSupportsItemExpandingChanged(bool supportsExpanding) Q_DECL_OVERRIDE; void onSupportsItemExpandingChanged(bool supportsExpanding) override;
virtual void polishEvent() Q_DECL_OVERRIDE; void polishEvent() override;
private: private:
void applyDefaultStyleOption(int iconSize, int padding, int horizontalMargin, int verticalMargin); void applyDefaultStyleOption(int iconSize, int padding, int horizontalMargin, int verticalMargin);

50
src/kitemviews/kstandarditemlistwidget.h
View file

@ -36,13 +36,13 @@ class DOLPHIN_EXPORT KStandardItemListWidgetInformant : public KItemListWidgetIn
{ {
public: public:
KStandardItemListWidgetInformant(); KStandardItemListWidgetInformant();
virtual ~KStandardItemListWidgetInformant(); ~KStandardItemListWidgetInformant() override;
virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const Q_DECL_OVERRIDE; void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const override;
virtual qreal preferredRoleColumnWidth(const QByteArray& role, qreal preferredRoleColumnWidth(const QByteArray& role,
int index, int index,
const KItemListView* view) const Q_DECL_OVERRIDE; const KItemListView* view) const override;
protected: protected:
/** /**
* @return The value of the "text" role. The default implementation returns * @return The value of the "text" role. The default implementation returns
@ -96,7 +96,7 @@ public:
}; };
KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
virtual ~KStandardItemListWidget(); ~KStandardItemListWidget() override;
void setLayout(Layout layout); void setLayout(Layout layout);
Layout layout() const; Layout layout() const;
@ -104,15 +104,15 @@ public:
void setSupportsItemExpanding(bool supportsItemExpanding); void setSupportsItemExpanding(bool supportsItemExpanding);
bool supportsItemExpanding() const; 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; QRectF iconRect() const override;
virtual QRectF textRect() const Q_DECL_OVERRIDE; QRectF textRect() const override;
virtual QRectF textFocusRect() const Q_DECL_OVERRIDE; QRectF textFocusRect() const override;
virtual QRectF selectionRect() const Q_DECL_OVERRIDE; QRectF selectionRect() const override;
virtual QRectF expansionToggleRect() const Q_DECL_OVERRIDE; QRectF expansionToggleRect() const override;
virtual QRectF selectionToggleRect() const Q_DECL_OVERRIDE; QRectF selectionToggleRect() const override;
virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override;
static KItemListWidgetInformant* createInformant(); static KItemListWidgetInformant* createInformant();
@ -172,18 +172,18 @@ protected:
*/ */
virtual int selectionLength(const QString& text) const; virtual int selectionLength(const QString& text) const;
virtual void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>()) Q_DECL_OVERRIDE; void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>()) override;
virtual void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) Q_DECL_OVERRIDE; void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) override;
virtual void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) Q_DECL_OVERRIDE; void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) override;
virtual void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) Q_DECL_OVERRIDE; void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) override;
virtual void hoveredChanged(bool hovered) Q_DECL_OVERRIDE; void hoveredChanged(bool hovered) override;
virtual void selectedChanged(bool selected) Q_DECL_OVERRIDE; void selectedChanged(bool selected) override;
virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) Q_DECL_OVERRIDE; void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) override;
virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE; void editedRoleChanged(const QByteArray& current, const QByteArray& previous) override;
virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; void resizeEvent(QGraphicsSceneResizeEvent* event) override;
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; void hideEvent(QHideEvent* event) override;
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
public slots: public slots:
void finishRoleEditing(); void finishRoleEditing();

18
src/kitemviews/kstandarditemmodel.h
View file

@ -41,7 +41,7 @@ class DOLPHIN_EXPORT KStandardItemModel : public KItemModelBase
public: public:
explicit KStandardItemModel(QObject* parent = 0); explicit KStandardItemModel(QObject* parent = 0);
virtual ~KStandardItemModel(); ~KStandardItemModel() override;
/** /**
* Inserts the item \a item at the index \a index. If the index * Inserts the item \a item at the index \a index. If the index
@ -69,14 +69,14 @@ public:
*/ */
void appendItem(KStandardItem* item); void appendItem(KStandardItem* item);
virtual int count() const Q_DECL_OVERRIDE; int count() const override;
virtual QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE; QHash<QByteArray, QVariant> data(int index) const override;
virtual bool setData(int index, const QHash<QByteArray, QVariant>& values) Q_DECL_OVERRIDE; bool setData(int index, const QHash<QByteArray, QVariant>& values) override;
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<QPair<int, QVariant> > groups() const Q_DECL_OVERRIDE; QList<QPair<int, QVariant> > groups() const override;
virtual void clear(); virtual void clear();
protected: protected:

2
src/kitemviews/private/kdirectorycontentscounter.h
View file

@ -36,7 +36,7 @@ class KDirectoryContentsCounter : public QObject
public: public:
explicit KDirectoryContentsCounter(KFileItemModel* model, QObject* parent = 0); explicit KDirectoryContentsCounter(KFileItemModel* model, QObject* parent = 0);
~KDirectoryContentsCounter(); ~KDirectoryContentsCounter() override;
/** /**
* Requests the number of items inside the directory \a path. The actual * Requests the number of items inside the directory \a path. The actual

2
src/kitemviews/private/kfileitemclipboard.h
View file

@ -46,7 +46,7 @@ signals:
void cutItemsChanged(); void cutItemsChanged();
protected: protected:
virtual ~KFileItemClipboard(); ~KFileItemClipboard() override;
private slots: private slots:
void updateCutItems(); void updateCutItems();

4
src/kitemviews/private/kfileitemmodeldirlister.h
View file

@ -35,7 +35,7 @@ class DOLPHIN_EXPORT KFileItemModelDirLister : public KDirLister
public: public:
KFileItemModelDirLister(QObject* parent = 0); KFileItemModelDirLister(QObject* parent = 0);
virtual ~KFileItemModelDirLister(); ~KFileItemModelDirLister() override;
signals: signals:
/** Is emitted whenever an error has occurred. */ /** Is emitted whenever an error has occurred. */
@ -48,7 +48,7 @@ signals:
void urlIsFileError(const QUrl& url); void urlIsFileError(const QUrl& url);
protected: protected:
void handleError(KIO::Job* job) Q_DECL_OVERRIDE; void handleError(KIO::Job* job) override;
}; };
#endif #endif

18
src/kitemviews/private/kitemlistheaderwidget.h
View file

@ -39,7 +39,7 @@ class DOLPHIN_EXPORT KItemListHeaderWidget : public QGraphicsWidget
public: public:
KItemListHeaderWidget(QGraphicsWidget* parent = 0); KItemListHeaderWidget(QGraphicsWidget* parent = 0);
virtual ~KItemListHeaderWidget(); ~KItemListHeaderWidget() override;
void setModel(KItemModelBase* model); void setModel(KItemModelBase* model);
KItemModelBase* model() const; KItemModelBase* model() const;
@ -64,7 +64,7 @@ public:
qreal minimumColumnWidth() const; 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: signals:
/** /**
@ -104,13 +104,13 @@ signals:
void sortRoleChanged(const QByteArray& current, const QByteArray& previous); void sortRoleChanged(const QByteArray& current, const QByteArray& previous);
protected: protected:
void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; void mousePressEvent(QGraphicsSceneMouseEvent* event) override;
void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override;
void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override;
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override;
void hoverEnterEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; void hoverEnterEvent(QGraphicsSceneHoverEvent* event) override;
void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) override;
void hoverMoveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; void hoverMoveEvent(QGraphicsSceneHoverEvent* event) override;
private slots: private slots:
void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous); void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous);

2
src/kitemviews/private/kitemlistkeyboardsearchmanager.h
View file

@ -42,7 +42,7 @@ class DOLPHIN_EXPORT KItemListKeyboardSearchManager : public QObject
public: public:
KItemListKeyboardSearchManager(QObject* parent = 0); KItemListKeyboardSearchManager(QObject* parent = 0);
virtual ~KItemListKeyboardSearchManager(); ~KItemListKeyboardSearchManager() override;
/** /**
* Add \a keys to the text buffer used for searching. * Add \a keys to the text buffer used for searching.

8
src/kitemviews/private/kitemlistroleeditor.h
View file

@ -39,20 +39,20 @@ class DOLPHIN_EXPORT KItemListRoleEditor : public KTextEdit
public: public:
explicit KItemListRoleEditor(QWidget* parent); explicit KItemListRoleEditor(QWidget* parent);
virtual ~KItemListRoleEditor(); ~KItemListRoleEditor() override;
void setRole(const QByteArray& role); void setRole(const QByteArray& role);
QByteArray role() const; QByteArray role() const;
bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE; bool eventFilter(QObject* watched, QEvent* event) override;
signals: signals:
void roleEditingFinished(const QByteArray& role, const QVariant& value); void roleEditingFinished(const QByteArray& role, const QVariant& value);
void roleEditingCanceled(const QByteArray& role, const QVariant& value); void roleEditingCanceled(const QByteArray& role, const QVariant& value);
protected: protected:
bool event(QEvent* event) Q_DECL_OVERRIDE; bool event(QEvent* event) override;
void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent* event) override;
private slots: private slots:
/** /**

2
src/kitemviews/private/kitemlistrubberband.h
View file

@ -33,7 +33,7 @@ class DOLPHIN_EXPORT KItemListRubberBand : public QObject
public: public:
explicit KItemListRubberBand(QObject* parent = 0); explicit KItemListRubberBand(QObject* parent = 0);
virtual ~KItemListRubberBand(); ~KItemListRubberBand() override;
void setStartPosition(const QPointF& pos); void setStartPosition(const QPointF& pos);
QPointF startPosition() const; QPointF startPosition() const;

6
src/kitemviews/private/kitemlistselectiontoggle.h
View file

@ -35,17 +35,17 @@ class DOLPHIN_EXPORT KItemListSelectionToggle : public QGraphicsWidget
public: public:
KItemListSelectionToggle(QGraphicsItem* parent); KItemListSelectionToggle(QGraphicsItem* parent);
virtual ~KItemListSelectionToggle(); ~KItemListSelectionToggle() override;
void setChecked(bool checked); void setChecked(bool checked);
bool isChecked() const; bool isChecked() const;
void setHovered(bool hovered); 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: protected:
void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; void resizeEvent(QGraphicsSceneResizeEvent* event) override;
private: private:
void updatePixmap(); void updatePixmap();

4
src/kitemviews/private/kitemlistsmoothscroller.h
View file

@ -40,7 +40,7 @@ class DOLPHIN_EXPORT KItemListSmoothScroller : public QObject
public: public:
explicit KItemListSmoothScroller(QScrollBar* scrollBar, explicit KItemListSmoothScroller(QScrollBar* scrollBar,
QObject* parent = 0); QObject* parent = 0);
virtual ~KItemListSmoothScroller(); ~KItemListSmoothScroller() override;
void setScrollBar(QScrollBar* scrollBar); void setScrollBar(QScrollBar* scrollBar);
QScrollBar* scrollBar() const; QScrollBar* scrollBar() const;
@ -83,7 +83,7 @@ public:
void handleWheelEvent(QWheelEvent* event); void handleWheelEvent(QWheelEvent* event);
protected: protected:
bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; bool eventFilter(QObject* obj, QEvent* event) override;
private slots: private slots:
void slotAnimationStateChanged(QAbstractAnimation::State newState, void slotAnimationStateChanged(QAbstractAnimation::State newState,

2
src/kitemviews/private/kitemlistviewanimation.h
View file

@ -49,7 +49,7 @@ public:
}; };
KItemListViewAnimation(QObject* parent = 0); KItemListViewAnimation(QObject* parent = 0);
virtual ~KItemListViewAnimation(); ~KItemListViewAnimation() override;
void setScrollOrientation(Qt::Orientation orientation); void setScrollOrientation(Qt::Orientation orientation);
Qt::Orientation scrollOrientation() const; Qt::Orientation scrollOrientation() const;

2
src/kitemviews/private/kitemlistviewlayouter.h
View file

@ -51,7 +51,7 @@ class DOLPHIN_EXPORT KItemListViewLayouter : public QObject
public: public:
KItemListViewLayouter(KItemListSizeHintResolver* sizeHintResolver, QObject* parent = 0); KItemListViewLayouter(KItemListSizeHintResolver* sizeHintResolver, QObject* parent = 0);
virtual ~KItemListViewLayouter(); ~KItemListViewLayouter() override;
void setScrollOrientation(Qt::Orientation orientation); void setScrollOrientation(Qt::Orientation orientation);
Qt::Orientation scrollOrientation() const; Qt::Orientation scrollOrientation() const;

4
src/panels/folders/foldersitemlistwidget.h
View file

@ -31,10 +31,10 @@ class FoldersItemListWidget : public KFileItemListWidget
public: public:
FoldersItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); FoldersItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
virtual ~FoldersItemListWidget(); ~FoldersItemListWidget() override;
protected: protected:
virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE; QPalette::ColorRole normalTextColorRole() const override;
}; };
#endif #endif

4
src/panels/folders/folderspanel.cpp
View file

@ -91,7 +91,7 @@ void FoldersPanel::setLimitFoldersPanelToHome(bool enable)
bool FoldersPanel::limitFoldersPanelToHome() const bool FoldersPanel::limitFoldersPanelToHome() const
{ {
return FoldersPanelSettings::limitFoldersPanelToHome(); return limitFoldersPanelToHome();
} }
void FoldersPanel::setAutoScrolling(bool enable) void FoldersPanel::setAutoScrolling(bool enable)
@ -325,7 +325,7 @@ void FoldersPanel::loadTree(const QUrl& url)
QUrl baseUrl; QUrl baseUrl;
if (url.isLocalFile()) { if (url.isLocalFile()) {
const bool isInHomeFolder = Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url); const bool isInHomeFolder = Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url);
if (FoldersPanelSettings::limitFoldersPanelToHome() && isInHomeFolder) { if (limitFoldersPanelToHome() && isInHomeFolder) {
baseUrl = Dolphin::homeUrl(); baseUrl = Dolphin::homeUrl();
} else { } else {
// Use the root directory as base for local URLs (#150941) // Use the root directory as base for local URLs (#150941)

8
src/panels/folders/folderspanel.h
View file

@ -40,7 +40,7 @@ class FoldersPanel : public Panel
public: public:
explicit FoldersPanel(QWidget* parent = nullptr); explicit FoldersPanel(QWidget* parent = nullptr);
virtual ~FoldersPanel(); ~FoldersPanel() override;
void setShowHiddenFiles(bool show); void setShowHiddenFiles(bool show);
void setLimitFoldersPanelToHome(bool enable); void setLimitFoldersPanelToHome(bool enable);
@ -59,13 +59,13 @@ signals:
protected: protected:
/** @see Panel::urlChanged() */ /** @see Panel::urlChanged() */
virtual bool urlChanged() Q_DECL_OVERRIDE; bool urlChanged() override;
/** @see QWidget::showEvent() */ /** @see QWidget::showEvent() */
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
/** @see QWidget::keyPressEvent() */ /** @see QWidget::keyPressEvent() */
virtual void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent* event) override;
private slots: private slots:
void slotItemActivated(int index); void slotItemActivated(int index);

2
src/panels/folders/treeviewcontextmenu.h
View file

@ -45,7 +45,7 @@ public:
TreeViewContextMenu(FoldersPanel* parent, TreeViewContextMenu(FoldersPanel* parent,
const KFileItem& fileInfo); const KFileItem& fileInfo);
virtual ~TreeViewContextMenu(); ~TreeViewContextMenu() override;
/** Opens the context menu modal. */ /** Opens the context menu modal. */
void open(); void open();

2
src/panels/information/filemetadataconfigurationdialog.h
View file

@ -44,7 +44,7 @@ class FileMetaDataConfigurationDialog : public QDialog
public: public:
explicit FileMetaDataConfigurationDialog(QWidget* parent = 0); explicit FileMetaDataConfigurationDialog(QWidget* parent = 0);
virtual ~FileMetaDataConfigurationDialog(); ~FileMetaDataConfigurationDialog() override;
/** /**
* Sets the items, for which the visibility of the meta data should * Sets the items, for which the visibility of the meta data should

10
src/panels/information/informationpanel.h
View file

@ -37,7 +37,7 @@ class InformationPanel : public Panel
public: public:
explicit InformationPanel(QWidget* parent = nullptr); explicit InformationPanel(QWidget* parent = nullptr);
virtual ~InformationPanel(); ~InformationPanel() override;
signals: signals:
void urlActivated(const QUrl& url); void urlActivated(const QUrl& url);
@ -59,16 +59,16 @@ public slots:
protected: protected:
/** @see Panel::urlChanged() */ /** @see Panel::urlChanged() */
virtual bool urlChanged() Q_DECL_OVERRIDE; bool urlChanged() override;
/** @see QWidget::showEvent() */ /** @see QWidget::showEvent() */
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
/** @see QWidget::resizeEvent() */ /** @see QWidget::resizeEvent() */
virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE; void resizeEvent(QResizeEvent* event) override;
/** @see QWidget::contextMenuEvent() */ /** @see QWidget::contextMenuEvent() */
virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE; void contextMenuEvent(QContextMenuEvent* event) override;
private slots: private slots:
/** /**

4
src/panels/information/informationpanelcontent.h
View file

@ -58,7 +58,7 @@ class InformationPanelContent : public QWidget
public: public:
explicit InformationPanelContent(QWidget* parent = 0); explicit InformationPanelContent(QWidget* parent = 0);
virtual ~InformationPanelContent(); ~InformationPanelContent() override;
/** /**
* Shows the meta information for the item \p item. * Shows the meta information for the item \p item.
@ -85,7 +85,7 @@ signals:
protected: protected:
/** @see QObject::eventFilter() */ /** @see QObject::eventFilter() */
virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; bool eventFilter(QObject* obj, QEvent* event) override;
private slots: private slots:
/** /**

2
src/panels/information/phononwidget.cpp
View file

@ -52,7 +52,7 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget
updateGeometry(); updateGeometry();
} }
QSize sizeHint() const Q_DECL_OVERRIDE QSize sizeHint() const override
{ {
return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint(); return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint();
} }

4
src/panels/information/phononwidget.h
View file

@ -63,8 +63,8 @@ class PhononWidget : public QWidget
void hasVideoChanged(bool hasVideo); void hasVideoChanged(bool hasVideo);
protected: protected:
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; void showEvent(QShowEvent *event) override;
virtual void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; void hideEvent(QHideEvent *event) override;
private slots: private slots:
void stateChanged(Phonon::State); void stateChanged(Phonon::State);

6
src/panels/information/pixmapviewer.h
View file

@ -62,7 +62,7 @@ public:
explicit PixmapViewer(QWidget* parent, explicit PixmapViewer(QWidget* parent,
Transition transition = DefaultTransition); Transition transition = DefaultTransition);
virtual ~PixmapViewer(); ~PixmapViewer() override;
void setPixmap(const QPixmap& pixmap); void setPixmap(const QPixmap& pixmap);
QPixmap pixmap() const; QPixmap pixmap() const;
@ -71,10 +71,10 @@ public:
* of the parent widget. Per default no size hint is given. * of the parent widget. Per default no size hint is given.
*/ */
void setSizeHint(const QSize& size); void setSizeHint(const QSize& size);
virtual QSize sizeHint() const Q_DECL_OVERRIDE; QSize sizeHint() const override;
protected: protected:
virtual void paintEvent(QPaintEvent* event) Q_DECL_OVERRIDE; void paintEvent(QPaintEvent* event) override;
private Q_SLOTS: private Q_SLOTS:
void checkPendingPixmaps(); void checkPendingPixmaps();

4
src/panels/panel.h
View file

@ -36,7 +36,7 @@ class Panel : public QWidget
public: public:
explicit Panel(QWidget* parent = 0); explicit Panel(QWidget* parent = 0);
virtual ~Panel(); ~Panel() override;
/** Returns the current set URL of the active Dolphin view. */ /** Returns the current set URL of the active Dolphin view. */
QUrl url() const; QUrl url() const;
@ -49,7 +49,7 @@ public:
void setCustomContextMenuActions(const QList<QAction*>& actions); void setCustomContextMenuActions(const QList<QAction*>& actions);
QList<QAction*> customContextMenuActions() const; QList<QAction*> customContextMenuActions() const;
virtual QSize sizeHint() const Q_DECL_OVERRIDE; QSize sizeHint() const override;
public slots: public slots:
/** /**

10
src/panels/places/placesitem.h
View file

@ -49,7 +49,7 @@ public:
}; };
explicit PlacesItem(const KBookmark& bookmark, PlacesItem* parent = 0); explicit PlacesItem(const KBookmark& bookmark, PlacesItem* parent = 0);
virtual ~PlacesItem(); ~PlacesItem() override;
void setUrl(const QUrl& url); void setUrl(const QUrl& url);
QUrl url() const; QUrl url() const;
@ -82,12 +82,12 @@ public:
PlacesItemSignalHandler* signalHandler() const; PlacesItemSignalHandler* signalHandler() const;
protected: protected:
virtual void onDataValueChanged(const QByteArray& role, void onDataValueChanged(const QByteArray& role,
const QVariant& current, const QVariant& current,
const QVariant& previous) Q_DECL_OVERRIDE; const QVariant& previous) override;
virtual void onDataChanged(const QHash<QByteArray, QVariant>& current, void onDataChanged(const QHash<QByteArray, QVariant>& current,
const QHash<QByteArray, QVariant>& previous) Q_DECL_OVERRIDE; const QHash<QByteArray, QVariant>& previous) override;
private: private:
PlacesItem(const PlacesItem& item); PlacesItem(const PlacesItem& item);

4
src/panels/places/placesitemeditdialog.h
View file

@ -39,7 +39,7 @@ class PlacesItemEditDialog: public QDialog
public: public:
explicit PlacesItemEditDialog(QWidget* parent = 0); explicit PlacesItemEditDialog(QWidget* parent = 0);
virtual ~PlacesItemEditDialog(); ~PlacesItemEditDialog() override;
void setIcon(const QString& icon); void setIcon(const QString& icon);
QString icon() const; QString icon() const;
@ -54,7 +54,7 @@ public:
bool allowGlobal() const; bool allowGlobal() const;
protected: protected:
virtual bool event(QEvent* event) Q_DECL_OVERRIDE; bool event(QEvent* event) override;
private slots: private slots:
void slotUrlChanged(const QString& text); void slotUrlChanged(const QString& text);

6
src/panels/places/placesitemlistgroupheader.h
View file

@ -28,12 +28,12 @@ class PlacesItemListGroupHeader : public KStandardItemListGroupHeader
public: public:
PlacesItemListGroupHeader(QGraphicsWidget* parent = 0); PlacesItemListGroupHeader(QGraphicsWidget* parent = 0);
virtual ~PlacesItemListGroupHeader(); ~PlacesItemListGroupHeader() override;
protected: 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 #endif

6
src/panels/places/placesitemlistwidget.h
View file

@ -32,11 +32,11 @@ class PlacesItemListWidget : public KStandardItemListWidget
public: public:
PlacesItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); PlacesItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
virtual ~PlacesItemListWidget(); ~PlacesItemListWidget() override;
protected: protected:
virtual bool isHidden() const Q_DECL_OVERRIDE; bool isHidden() const override;
virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE; QPalette::ColorRole normalTextColorRole() const override;
}; };
#endif #endif

16
src/panels/places/placesitemmodel.h
View file

@ -51,7 +51,7 @@ class PlacesItemModel: public KStandardItemModel
public: public:
explicit PlacesItemModel(QObject* parent = 0); explicit PlacesItemModel(QObject* parent = 0);
virtual ~PlacesItemModel(); ~PlacesItemModel() override;
/** /**
* @return A new instance of a places item with the given * @return A new instance of a places item with the given
@ -107,9 +107,9 @@ public:
bool storageSetupNeeded(int index) const; bool storageSetupNeeded(int index) const;
void requestStorageSetup(int index); 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); void dropMimeDataBefore(int index, const QMimeData* mimeData);
@ -121,7 +121,7 @@ public:
*/ */
static QUrl convertedUrl(const QUrl& url); static QUrl convertedUrl(const QUrl& url);
virtual void clear() Q_DECL_OVERRIDE; void clear() override;
void proceedWithTearDown(); void proceedWithTearDown();
@ -132,7 +132,7 @@ public:
*/ */
void saveBookmarks(); void saveBookmarks();
bool isDir(int index) const Q_DECL_OVERRIDE; bool isDir(int index) const override;
signals: signals:
void errorMessage(const QString& message); void errorMessage(const QString& message);
void storageSetupDone(int index, bool success); void storageSetupDone(int index, bool success);
@ -140,9 +140,9 @@ signals:
void storageTearDownExternallyRequested(const QString& mountPath); void storageTearDownExternallyRequested(const QString& mountPath);
protected: protected:
virtual void onItemInserted(int index) Q_DECL_OVERRIDE; void onItemInserted(int index) override;
virtual void onItemRemoved(int index, KStandardItem* removedItem) Q_DECL_OVERRIDE; void onItemRemoved(int index, KStandardItem* removedItem) override;
virtual void onItemChanged(int index, const QSet<QByteArray>& changedRoles) Q_DECL_OVERRIDE; void onItemChanged(int index, const QSet<QByteArray>& changedRoles) override;
private slots: private slots:
void slotDeviceAdded(const QString& udi); void slotDeviceAdded(const QString& udi);

2
src/panels/places/placesitemsignalhandler.h
View file

@ -48,7 +48,7 @@ class PlacesItemSignalHandler: public QObject
public: public:
explicit PlacesItemSignalHandler(PlacesItem* item, QObject* parent = nullptr); explicit PlacesItemSignalHandler(PlacesItem* item, QObject* parent = nullptr);
virtual ~PlacesItemSignalHandler(); ~PlacesItemSignalHandler() override;
public slots: public slots:
/** /**

8
src/panels/places/placespanel.h
View file

@ -40,7 +40,7 @@ class PlacesPanel : public Panel
public: public:
explicit PlacesPanel(QWidget* parent); explicit PlacesPanel(QWidget* parent);
virtual ~PlacesPanel(); ~PlacesPanel() override;
void proceedWithTearDown(); void proceedWithTearDown();
signals: signals:
@ -51,11 +51,11 @@ signals:
void storageTearDownExternallyRequested(const QString& mountPath); void storageTearDownExternallyRequested(const QString& mountPath);
protected: protected:
virtual bool urlChanged() Q_DECL_OVERRIDE; bool urlChanged() override;
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
public slots: public slots:
virtual void readSettings() Q_DECL_OVERRIDE; void readSettings() override;
private slots: private slots:
void slotItemActivated(int index); void slotItemActivated(int index);

6
src/panels/terminal/terminalpanel.h
View file

@ -46,7 +46,7 @@ class TerminalPanel : public Panel
public: public:
explicit TerminalPanel(QWidget* parent = nullptr); explicit TerminalPanel(QWidget* parent = nullptr);
virtual ~TerminalPanel(); ~TerminalPanel() override;
/** /**
* @brief This function is used to set the terminal panels's cwd to * @brief This function is used to set the terminal panels's cwd to
@ -68,9 +68,9 @@ signals:
void changeUrl(const QUrl& url); void changeUrl(const QUrl& url);
protected: 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: private slots:
void slotMostLocalUrlResult(KJob* job); void slotMostLocalUrlResult(KJob* job);

2
src/search/dolphinfacetswidget.h
View file

@ -48,7 +48,7 @@ class DolphinFacetsWidget : public QWidget
public: public:
explicit DolphinFacetsWidget(QWidget* parent = nullptr); explicit DolphinFacetsWidget(QWidget* parent = nullptr);
virtual ~DolphinFacetsWidget(); ~DolphinFacetsWidget() override;
QString ratingTerm() const; QString ratingTerm() const;
QString facetType() const; QString facetType() const;

12
src/search/dolphinsearchbox.h
View file

@ -47,7 +47,7 @@ class DolphinSearchBox : public QWidget {
public: public:
explicit DolphinSearchBox(QWidget* parent = 0); explicit DolphinSearchBox(QWidget* parent = 0);
virtual ~DolphinSearchBox(); ~DolphinSearchBox() override;
/** /**
* Sets the text that should be used as input for * Sets the text that should be used as input for
@ -99,11 +99,11 @@ public:
bool isActive() const; bool isActive() const;
protected: protected:
virtual bool event(QEvent* event) Q_DECL_OVERRIDE; bool event(QEvent* event) override;
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; void hideEvent(QHideEvent* event) override;
virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent* event) override;
virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; bool eventFilter(QObject* obj, QEvent* event) override;
signals: signals:
/** /**

4
src/settings/additionalinfodialog.h
View file

@ -34,11 +34,11 @@ class AdditionalInfoDialog : public QDialog
public: public:
AdditionalInfoDialog(QWidget* parent, const QList<QByteArray>& visibleRoles); AdditionalInfoDialog(QWidget* parent, const QList<QByteArray>& visibleRoles);
virtual ~AdditionalInfoDialog(); ~AdditionalInfoDialog() override;
QList<QByteArray> visibleRoles() const; QList<QByteArray> visibleRoles() const;
public slots: public slots:
void accept() Q_DECL_OVERRIDE; void accept() override;
private: private:
QList<QByteArray> m_visibleRoles; QList<QByteArray> m_visibleRoles;

4
src/settings/applyviewpropsjob.h
View file

@ -60,11 +60,11 @@ public:
* sub directories. * sub directories.
*/ */
ApplyViewPropsJob(const QUrl& dir, const ViewProperties& viewProps); ApplyViewPropsJob(const QUrl& dir, const ViewProperties& viewProps);
virtual ~ApplyViewPropsJob(); ~ApplyViewPropsJob() override;
int progress() const; int progress() const;
private slots: private slots:
virtual void slotResult(KJob* job) Q_DECL_OVERRIDE; void slotResult(KJob* job) override;
void slotEntries(KIO::Job*, const KIO::UDSEntryList&); void slotEntries(KIO::Job*, const KIO::UDSEntryList&);
private: private:

2
src/settings/dolphinsettingsdialog.h
View file

@ -37,7 +37,7 @@ class DolphinSettingsDialog : public KPageDialog
public: public:
explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = 0); explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = 0);
virtual ~DolphinSettingsDialog(); ~DolphinSettingsDialog() override;
signals: signals:
void settingsChanged(); void settingsChanged();

6
src/settings/general/behaviorsettingspage.h
View file

@ -37,13 +37,13 @@ class BehaviorSettingsPage : public SettingsPageBase
public: public:
BehaviorSettingsPage(const QUrl &url, QWidget* parent); BehaviorSettingsPage(const QUrl &url, QWidget* parent);
virtual ~BehaviorSettingsPage(); ~BehaviorSettingsPage() override;
/** @see SettingsPageBase::applySettings() */ /** @see SettingsPageBase::applySettings() */
virtual void applySettings() Q_DECL_OVERRIDE; void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */ /** @see SettingsPageBase::restoreDefaults() */
virtual void restoreDefaults() Q_DECL_OVERRIDE; void restoreDefaults() override;
private: private:
void loadSettings(); void loadSettings();

2
src/settings/general/configurepreviewplugindialog.h
View file

@ -40,7 +40,7 @@ public:
ConfigurePreviewPluginDialog(const QString& pluginName, ConfigurePreviewPluginDialog(const QString& pluginName,
const QString& desktopEntryName, const QString& desktopEntryName,
QWidget* parent); QWidget* parent);
virtual ~ConfigurePreviewPluginDialog() = default; ~ConfigurePreviewPluginDialog() override = default;
}; };
#endif #endif

6
src/settings/general/confirmationssettingspage.h
View file

@ -32,13 +32,13 @@ class ConfirmationsSettingsPage : public SettingsPageBase
public: public:
ConfirmationsSettingsPage(QWidget* parent); ConfirmationsSettingsPage(QWidget* parent);
virtual ~ConfirmationsSettingsPage(); ~ConfirmationsSettingsPage() override;
/** @see SettingsPageBase::applySettings() */ /** @see SettingsPageBase::applySettings() */
virtual void applySettings() Q_DECL_OVERRIDE; void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */ /** @see SettingsPageBase::restoreDefaults() */
virtual void restoreDefaults() Q_DECL_OVERRIDE; void restoreDefaults() override;
private: private:
void loadSettings(); void loadSettings();

6
src/settings/general/generalsettingspage.h
View file

@ -41,13 +41,13 @@ class GeneralSettingsPage : public SettingsPageBase
public: public:
GeneralSettingsPage(const QUrl& url, QWidget* parent); GeneralSettingsPage(const QUrl& url, QWidget* parent);
virtual ~GeneralSettingsPage(); ~GeneralSettingsPage() override;
/** @see SettingsPageBase::applySettings() */ /** @see SettingsPageBase::applySettings() */
virtual void applySettings() Q_DECL_OVERRIDE; void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */ /** @see SettingsPageBase::restoreDefaults() */
virtual void restoreDefaults() Q_DECL_OVERRIDE; void restoreDefaults() override;
private: private:
QList<SettingsPageBase*> m_pages; QList<SettingsPageBase*> m_pages;

8
src/settings/general/previewssettingspage.h
View file

@ -35,20 +35,20 @@ class PreviewsSettingsPage : public SettingsPageBase
public: public:
PreviewsSettingsPage(QWidget* parent); PreviewsSettingsPage(QWidget* parent);
virtual ~PreviewsSettingsPage(); ~PreviewsSettingsPage() override;
/** /**
* Applies the general settings for the view modes * Applies the general settings for the view modes
* The settings are persisted automatically when * The settings are persisted automatically when
* closing Dolphin. * closing Dolphin.
*/ */
virtual void applySettings() Q_DECL_OVERRIDE; void applySettings() override;
/** Restores the settings to default values. */ /** Restores the settings to default values. */
virtual void restoreDefaults() Q_DECL_OVERRIDE; void restoreDefaults() override;
protected: protected:
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
private slots: private slots:
void configureService(const QModelIndex& index); void configureService(const QModelIndex& index);

6
src/settings/general/statusbarsettingspage.h
View file

@ -32,13 +32,13 @@ class StatusBarSettingsPage : public SettingsPageBase
public: public:
StatusBarSettingsPage(QWidget* parent); StatusBarSettingsPage(QWidget* parent);
virtual ~StatusBarSettingsPage(); ~StatusBarSettingsPage() override;
/** @see SettingsPageBase::applySettings() */ /** @see SettingsPageBase::applySettings() */
virtual void applySettings() Q_DECL_OVERRIDE; void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */ /** @see SettingsPageBase::restoreDefaults() */
virtual void restoreDefaults() Q_DECL_OVERRIDE; void restoreDefaults() override;
private: private:
void loadSettings(); void loadSettings();

6
src/settings/kcm/kcmdolphingeneral.h
View file

@ -34,10 +34,10 @@ class DolphinGeneralConfigModule : public KCModule
public: public:
DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args); DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args);
virtual ~DolphinGeneralConfigModule(); ~DolphinGeneralConfigModule() override;
virtual void save() Q_DECL_OVERRIDE; void save() override;
virtual void defaults() Q_DECL_OVERRIDE; void defaults() override;
private: private:
QList<SettingsPageBase*> m_pages; QList<SettingsPageBase*> m_pages;

6
src/settings/kcm/kcmdolphinnavigation.h
View file

@ -33,10 +33,10 @@ class DolphinNavigationConfigModule : public KCModule
public: public:
DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args); DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args);
virtual ~DolphinNavigationConfigModule(); ~DolphinNavigationConfigModule() override;
virtual void save() Q_DECL_OVERRIDE; void save() override;
virtual void defaults() Q_DECL_OVERRIDE; void defaults() override;
private: private:
NavigationSettingsPage* m_navigation; NavigationSettingsPage* m_navigation;

6
src/settings/kcm/kcmdolphinservices.h
View file

@ -33,10 +33,10 @@ class DolphinServicesConfigModule : public KCModule
public: public:
DolphinServicesConfigModule(QWidget* parent, const QVariantList& args); DolphinServicesConfigModule(QWidget* parent, const QVariantList& args);
virtual ~DolphinServicesConfigModule(); ~DolphinServicesConfigModule() override;
virtual void save() Q_DECL_OVERRIDE; void save() override;
virtual void defaults() Q_DECL_OVERRIDE; void defaults() override;
private: private:
ServicesSettingsPage* m_services; ServicesSettingsPage* m_services;

6
src/settings/kcm/kcmdolphinviewmodes.h
View file

@ -33,10 +33,10 @@ class DolphinViewModesConfigModule : public KCModule
public: public:
DolphinViewModesConfigModule(QWidget* parent, const QVariantList& args); DolphinViewModesConfigModule(QWidget* parent, const QVariantList& args);
virtual ~DolphinViewModesConfigModule(); ~DolphinViewModesConfigModule() override;
virtual void save() Q_DECL_OVERRIDE; void save() override;
virtual void defaults() Q_DECL_OVERRIDE; void defaults() override;
private: private:
void reparseConfiguration(); void reparseConfiguration();

6
src/settings/navigation/navigationsettingspage.h
View file

@ -32,13 +32,13 @@ class NavigationSettingsPage : public SettingsPageBase
public: public:
NavigationSettingsPage(QWidget* parent); NavigationSettingsPage(QWidget* parent);
virtual ~NavigationSettingsPage(); ~NavigationSettingsPage() override;
/** @see SettingsPageBase::applySettings() */ /** @see SettingsPageBase::applySettings() */
virtual void applySettings() Q_DECL_OVERRIDE; void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */ /** @see SettingsPageBase::restoreDefaults() */
virtual void restoreDefaults() Q_DECL_OVERRIDE; void restoreDefaults() override;
private: private:
void loadSettings(); void loadSettings();

16
src/settings/serviceitemdelegate.h
View file

@ -34,19 +34,19 @@ class ServiceItemDelegate : public KWidgetItemDelegate
public: public:
explicit ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent = 0); explicit ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent = 0);
virtual ~ServiceItemDelegate(); ~ServiceItemDelegate() override;
virtual QSize sizeHint(const QStyleOptionViewItem &option, QSize sizeHint(const QStyleOptionViewItem &option,
const QModelIndex &index) const Q_DECL_OVERRIDE; const QModelIndex &index) const override;
virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, void paint(QPainter* painter, const QStyleOptionViewItem& option,
const QModelIndex& index) const Q_DECL_OVERRIDE; const QModelIndex& index) const override;
virtual QList<QWidget*> createItemWidgets(const QModelIndex&) const Q_DECL_OVERRIDE; QList<QWidget*> createItemWidgets(const QModelIndex&) const override;
virtual void updateItemWidgets(const QList<QWidget*> widgets, void updateItemWidgets(const QList<QWidget*> widgets,
const QStyleOptionViewItem& option, const QStyleOptionViewItem& option,
const QPersistentModelIndex& index) const Q_DECL_OVERRIDE; const QPersistentModelIndex& index) const override;
signals: signals:
void requestServiceConfiguration(const QModelIndex& index); void requestServiceConfiguration(const QModelIndex& index);

10
src/settings/servicemodel.h
View file

@ -45,12 +45,12 @@ public:
}; };
explicit ServiceModel(QObject* parent = 0); explicit ServiceModel(QObject* parent = 0);
virtual ~ServiceModel(); ~ServiceModel() override;
virtual bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) Q_DECL_OVERRIDE; bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) override;
virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE; bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; int rowCount(const QModelIndex& parent = QModelIndex()) const override;
private: private:
struct ServiceItem struct ServiceItem

8
src/settings/services/servicessettingspage.h
View file

@ -36,16 +36,16 @@ class ServicesSettingsPage : public SettingsPageBase
public: public:
ServicesSettingsPage(QWidget* parent); ServicesSettingsPage(QWidget* parent);
virtual ~ServicesSettingsPage(); ~ServicesSettingsPage() override;
/** @see SettingsPageBase::applySettings() */ /** @see SettingsPageBase::applySettings() */
virtual void applySettings() Q_DECL_OVERRIDE; void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */ /** @see SettingsPageBase::restoreDefaults() */
virtual void restoreDefaults() Q_DECL_OVERRIDE; void restoreDefaults() override;
protected: protected:
virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
private slots: private slots:
/** /**

2
src/settings/settingspagebase.h
View file

@ -32,7 +32,7 @@ class SettingsPageBase : public QWidget
public: public:
explicit SettingsPageBase(QWidget* parent = 0); explicit SettingsPageBase(QWidget* parent = 0);
virtual ~SettingsPageBase(); ~SettingsPageBase() override;
/** /**
* Must be implemented by a derived class to * Must be implemented by a derived class to

6
src/settings/startup/startupsettingspage.h
View file

@ -37,13 +37,13 @@ class StartupSettingsPage : public SettingsPageBase
public: public:
StartupSettingsPage(const QUrl& url, QWidget* parent); StartupSettingsPage(const QUrl& url, QWidget* parent);
virtual ~StartupSettingsPage(); ~StartupSettingsPage() override;
/** @see SettingsPageBase::applySettings() */ /** @see SettingsPageBase::applySettings() */
virtual void applySettings() Q_DECL_OVERRIDE; void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */ /** @see SettingsPageBase::restoreDefaults() */
virtual void restoreDefaults() Q_DECL_OVERRIDE; void restoreDefaults() override;
private slots: private slots:
void slotSettingsChanged(); void slotSettingsChanged();

6
src/settings/trash/trashsettingspage.h
View file

@ -31,13 +31,13 @@ class TrashSettingsPage : public SettingsPageBase
public: public:
TrashSettingsPage(QWidget* parent); TrashSettingsPage(QWidget* parent);
virtual ~TrashSettingsPage(); ~TrashSettingsPage() override;
/** @see SettingsPageBase::applySettings() */ /** @see SettingsPageBase::applySettings() */
virtual void applySettings() Q_DECL_OVERRIDE; void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */ /** @see SettingsPageBase::restoreDefaults() */
virtual void restoreDefaults() Q_DECL_OVERRIDE; void restoreDefaults() override;
private: private:
void loadSettings(); void loadSettings();

2
src/settings/viewmodes/dolphinfontrequester.h
View file

@ -41,7 +41,7 @@ public:
}; };
DolphinFontRequester(QWidget* parent); DolphinFontRequester(QWidget* parent);
virtual ~DolphinFontRequester(); ~DolphinFontRequester() override;
void setMode(Mode mode); void setMode(Mode mode);
Mode mode() const; Mode mode() const;

6
src/settings/viewmodes/viewsettingspage.h
View file

@ -37,13 +37,13 @@ class ViewSettingsPage : public SettingsPageBase
public: public:
ViewSettingsPage(QWidget* parent); ViewSettingsPage(QWidget* parent);
virtual ~ViewSettingsPage(); ~ViewSettingsPage() override;
/** @see SettingsPageBase::applySettings() */ /** @see SettingsPageBase::applySettings() */
virtual void applySettings() Q_DECL_OVERRIDE; void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */ /** @see SettingsPageBase::restoreDefaults() */
virtual void restoreDefaults() Q_DECL_OVERRIDE; void restoreDefaults() override;
private: private:
QList<ViewSettingsTab*> m_tabs; QList<ViewSettingsTab*> m_tabs;

2
src/settings/viewmodes/viewsettingstab.h
View file

@ -44,7 +44,7 @@ public:
}; };
explicit ViewSettingsTab(Mode mode, QWidget* parent = 0); explicit ViewSettingsTab(Mode mode, QWidget* parent = 0);
virtual ~ViewSettingsTab(); ~ViewSettingsTab() override;
void applySettings(); void applySettings();
void restoreDefaultSettings(); void restoreDefaultSettings();

4
src/settings/viewpropertiesdialog.h
View file

@ -45,10 +45,10 @@ class DOLPHIN_EXPORT ViewPropertiesDialog : public QDialog
public: public:
explicit ViewPropertiesDialog(DolphinView* dolphinView); explicit ViewPropertiesDialog(DolphinView* dolphinView);
virtual ~ViewPropertiesDialog(); ~ViewPropertiesDialog() override;
public slots: public slots:
void accept() Q_DECL_OVERRIDE; void accept() override;
private slots: private slots:
void slotApply(); void slotApply();

6
src/settings/viewpropsprogressinfo.h
View file

@ -53,13 +53,13 @@ public:
const QUrl& dir, const QUrl& dir,
const ViewProperties& viewProps); const ViewProperties& viewProps);
virtual ~ViewPropsProgressInfo(); ~ViewPropsProgressInfo() override;
protected: protected:
virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE; void closeEvent(QCloseEvent* event) override;
public slots: public slots:
void reject() Q_DECL_OVERRIDE; void reject() override;
private slots: private slots:
void updateProgress(); void updateProgress();

6
src/statusbar/dolphinstatusbar.h
View file

@ -43,7 +43,7 @@ class DolphinStatusBar : public QWidget
public: public:
DolphinStatusBar(QWidget* parent); DolphinStatusBar(QWidget* parent);
virtual ~DolphinStatusBar(); ~DolphinStatusBar() override;
QString text() const; QString text() const;
@ -101,8 +101,8 @@ signals:
void zoomLevelChanged(int zoomLevel); void zoomLevelChanged(int zoomLevel);
protected: protected:
virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE; void contextMenuEvent(QContextMenuEvent* event) override;
virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; bool eventFilter(QObject* obj, QEvent* event) override;
private slots: private slots:
void showZoomSliderToolTip(int zoomLevel); void showZoomSliderToolTip(int zoomLevel);

2
src/statusbar/mountpointobserver.h
View file

@ -54,7 +54,7 @@ class MountPointObserver : public QObject
Q_OBJECT Q_OBJECT
explicit MountPointObserver(const QUrl& url, QObject* parent = 0); explicit MountPointObserver(const QUrl& url, QObject* parent = 0);
virtual ~MountPointObserver() {} ~MountPointObserver() override {}
public: public:
/** /**

2
src/statusbar/mountpointobservercache.h
View file

@ -31,7 +31,7 @@ class MountPointObserverCache : public QObject
Q_OBJECT Q_OBJECT
MountPointObserverCache(); MountPointObserverCache();
virtual ~MountPointObserverCache(); ~MountPointObserverCache() override;
public: public:
static MountPointObserverCache* instance(); static MountPointObserverCache* instance();

2
src/statusbar/spaceinfoobserver.h
View file

@ -33,7 +33,7 @@ class SpaceInfoObserver : public QObject
public: public:
explicit SpaceInfoObserver(const QUrl& url, QObject* parent = 0); explicit SpaceInfoObserver(const QUrl& url, QObject* parent = 0);
virtual ~SpaceInfoObserver(); ~SpaceInfoObserver() override;
quint64 size() const; quint64 size() const;
quint64 available() const; quint64 available() const;

8
src/statusbar/statusbarspaceinfo.h
View file

@ -41,15 +41,15 @@ class StatusBarSpaceInfo : public KCapacityBar
public: public:
explicit StatusBarSpaceInfo(QWidget* parent = 0); explicit StatusBarSpaceInfo(QWidget* parent = 0);
virtual ~StatusBarSpaceInfo(); ~StatusBarSpaceInfo() override;
void setUrl(const QUrl& url); void setUrl(const QUrl& url);
QUrl url() const; QUrl url() const;
protected: protected:
void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; void hideEvent(QHideEvent* event) override;
void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE; void mousePressEvent(QMouseEvent* event) override;
private slots: private slots:
void slotValuesChanged(); void slotValuesChanged();

2
src/tests/kitemlistcontrollertest.cpp
View file

@ -58,7 +58,7 @@ public:
int styleHint(StyleHint hint, int styleHint(StyleHint hint,
const QStyleOption* option = nullptr, const QStyleOption* option = nullptr,
const QWidget* widget = nullptr, const QWidget* widget = nullptr,
QStyleHintReturn* returnData = nullptr) const Q_DECL_OVERRIDE QStyleHintReturn* returnData = nullptr) const override
{ {
switch (hint) { switch (hint) {
case QStyle::SH_ItemView_ActivateItemOnSingleClick: case QStyle::SH_ItemView_ActivateItemOnSingleClick:

4
src/tests/kitemlistselectionmanagertest.cpp
View file

@ -30,8 +30,8 @@ class DummyModel : public KItemModelBase
public: public:
DummyModel(); DummyModel();
void setCount(int count); void setCount(int count);
int count() const Q_DECL_OVERRIDE; int count() const override;
QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE; QHash<QByteArray, QVariant> data(int index) const override;
private: private:
int m_count; int m_count;

4
src/views/dolphinfileitemlistwidget.h
View file

@ -37,10 +37,10 @@ class DOLPHIN_EXPORT DolphinFileItemListWidget : public KFileItemListWidget
public: public:
DolphinFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); DolphinFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
virtual ~DolphinFileItemListWidget(); ~DolphinFileItemListWidget() override;
protected: protected:
virtual void refreshCache() Q_DECL_OVERRIDE; void refreshCache() override;
private: private:
static QPixmap overlayForState(KVersionControlPlugin::ItemVersion version, int size); static QPixmap overlayForState(KVersionControlPlugin::ItemVersion version, int size);

16
src/views/dolphinitemlistview.h
View file

@ -40,7 +40,7 @@ class DOLPHIN_EXPORT DolphinItemListView : public KFileItemListView
public: public:
explicit DolphinItemListView(QGraphicsWidget* parent = 0); explicit DolphinItemListView(QGraphicsWidget* parent = 0);
virtual ~DolphinItemListView(); ~DolphinItemListView() override;
void setZoomLevel(int level); void setZoomLevel(int level);
int zoomLevel() const; int zoomLevel() const;
@ -49,14 +49,14 @@ public:
void writeSettings(); void writeSettings();
protected: protected:
virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE; KItemListWidgetCreatorBase* defaultWidgetCreator() const override;
virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const Q_DECL_OVERRIDE; bool itemLayoutSupportsItemExpanding(ItemLayout layout) const override;
virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous) Q_DECL_OVERRIDE; void onItemLayoutChanged(ItemLayout current, ItemLayout previous) override;
virtual void onPreviewsShownChanged(bool shown) Q_DECL_OVERRIDE; void onPreviewsShownChanged(bool shown) override;
virtual void onVisibleRolesChanged(const QList<QByteArray>& current, void onVisibleRolesChanged(const QList<QByteArray>& current,
const QList<QByteArray>& previous) Q_DECL_OVERRIDE; const QList<QByteArray>& previous) override;
virtual void updateFont() Q_DECL_OVERRIDE; void updateFont() override;
private: private:
void updateGridSize(); void updateGridSize();

2
src/views/dolphinnewfilemenuobserver.h
View file

@ -48,7 +48,7 @@ signals:
private: private:
DolphinNewFileMenuObserver(); DolphinNewFileMenuObserver();
virtual ~DolphinNewFileMenuObserver(); ~DolphinNewFileMenuObserver() override;
friend class DolphinNewFileMenuObserverSingleton; friend class DolphinNewFileMenuObserverSingleton;
}; };

2
src/views/dolphinremoteencoding.h
View file

@ -40,7 +40,7 @@ class DOLPHIN_EXPORT DolphinRemoteEncoding: public QObject
Q_OBJECT Q_OBJECT
public: public:
DolphinRemoteEncoding(QObject* parent, DolphinViewActionHandler* actionHandler); DolphinRemoteEncoding(QObject* parent, DolphinViewActionHandler* actionHandler);
~DolphinRemoteEncoding(); ~DolphinRemoteEncoding() override;
public Q_SLOTS: public Q_SLOTS:
void slotAboutToOpenUrl(); void slotAboutToOpenUrl();

10
src/views/dolphinview.h
View file

@ -93,7 +93,7 @@ public:
*/ */
DolphinView(const QUrl& url, QWidget* parent); DolphinView(const QUrl& url, QWidget* parent);
virtual ~DolphinView(); ~DolphinView() override;
/** /**
* Returns the current active URL, where all actions are applied. * Returns the current active URL, where all actions are applied.
@ -370,7 +370,7 @@ public slots:
void stopLoading(); void stopLoading();
/** Activates the view if the item list container gets focus. */ /** 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: signals:
/** /**
@ -552,10 +552,10 @@ signals:
protected: protected:
/** Changes the zoom level if Control is pressed during a wheel event. */ /** 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; void hideEvent(QHideEvent* event) override;
virtual bool event(QEvent* event) Q_DECL_OVERRIDE; bool event(QEvent* event) override;
private slots: private slots:
/** /**

2
src/views/renamedialog.h
View file

@ -39,7 +39,7 @@ class DOLPHIN_EXPORT RenameDialog : public QDialog
public: public:
explicit RenameDialog(QWidget* parent, const KFileItemList& items); explicit RenameDialog(QWidget* parent, const KFileItemList& items);
virtual ~RenameDialog(); ~RenameDialog() override;
signals: signals:
void renamingFinished(const QList<QUrl>& urls); void renamingFinished(const QList<QUrl>& urls);

2
src/views/tooltips/dolphinfilemetadatawidget.h
View file

@ -46,7 +46,7 @@ class DolphinFileMetaDataWidget : public QWidget
public: public:
DolphinFileMetaDataWidget(QWidget* parent = 0); DolphinFileMetaDataWidget(QWidget* parent = 0);
virtual ~DolphinFileMetaDataWidget(); ~DolphinFileMetaDataWidget() override;
void setPreview(const QPixmap& pixmap); void setPreview(const QPixmap& pixmap);
QPixmap preview() const; QPixmap preview() const;

Some files were not shown because too many files have changed in this diff Show more