diff options
| author | Kevin Funk <[email protected]> | 2017-11-20 23:25:06 +0100 |
|---|---|---|
| committer | Kevin Funk <[email protected]> | 2017-11-20 23:25:48 +0100 |
| commit | 464b13f3828e5cdd03438d0881c3a62c7cda6333 (patch) | |
| tree | 724c10c4e06ac3030666f2604066b6cbcc83ffd0 /src/kitemviews | |
| parent | 5bee1889e1682f1e7ffe55e49beaf4544eaf7157 (diff) | |
Modernize: Use override where possible
Also use override instead of Q_DECL_OVERRIDE
Diffstat (limited to 'src/kitemviews')
29 files changed, 214 insertions, 214 deletions
diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h index 84aa17d89..c1c260e93 100644 --- a/src/kitemviews/kfileitemlistview.h +++ b/src/kitemviews/kfileitemlistview.h @@ -42,7 +42,7 @@ class DOLPHIN_EXPORT KFileItemListView : public KStandardItemListView public: KFileItemListView(QGraphicsWidget* parent = 0); - virtual ~KFileItemListView(); + ~KFileItemListView() override; void setPreviewsShown(bool show); bool previewsShown() const; @@ -72,27 +72,27 @@ public: */ QStringList enabledPlugins() const; - virtual QPixmap createDragPixmap(const KItemSet& indexes) const Q_DECL_OVERRIDE; + QPixmap createDragPixmap(const KItemSet& indexes) const override; protected: - virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE; - virtual void initializeItemListWidget(KItemListWidget* item) Q_DECL_OVERRIDE; + KItemListWidgetCreatorBase* defaultWidgetCreator() const override; + void initializeItemListWidget(KItemListWidget* item) override; virtual void onPreviewsShownChanged(bool shown); - virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous) Q_DECL_OVERRIDE; - virtual void onModelChanged(KItemModelBase* current, KItemModelBase* previous) Q_DECL_OVERRIDE; - virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) Q_DECL_OVERRIDE; - virtual void onItemSizeChanged(const QSizeF& current, const QSizeF& previous) Q_DECL_OVERRIDE; - virtual void onScrollOffsetChanged(qreal current, qreal previous) Q_DECL_OVERRIDE; - virtual void onVisibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) Q_DECL_OVERRIDE; - virtual void onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) Q_DECL_OVERRIDE; - virtual void onSupportsItemExpandingChanged(bool supportsExpanding) Q_DECL_OVERRIDE; - virtual void onTransactionBegin() Q_DECL_OVERRIDE; - virtual void onTransactionEnd() Q_DECL_OVERRIDE; - virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; + void onItemLayoutChanged(ItemLayout current, ItemLayout previous) override; + void onModelChanged(KItemModelBase* current, KItemModelBase* previous) override; + void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) override; + void onItemSizeChanged(const QSizeF& current, const QSizeF& previous) override; + void onScrollOffsetChanged(qreal current, qreal previous) override; + void onVisibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) override; + void onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) override; + void onSupportsItemExpandingChanged(bool supportsExpanding) override; + void onTransactionBegin() override; + void onTransactionEnd() override; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; protected slots: - virtual void slotItemsRemoved(const KItemRangeList& itemRanges) Q_DECL_OVERRIDE; - virtual void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE; + void slotItemsRemoved(const KItemRangeList& itemRanges) override; + void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) override; private slots: void triggerVisibleIndexRangeUpdate(); diff --git a/src/kitemviews/kfileitemlistwidget.h b/src/kitemviews/kfileitemlistwidget.h index 07ca59b44..fbb0300f8 100644 --- a/src/kitemviews/kfileitemlistwidget.h +++ b/src/kitemviews/kfileitemlistwidget.h @@ -28,13 +28,13 @@ class DOLPHIN_EXPORT KFileItemListWidgetInformant : public KStandardItemListWidg { public: KFileItemListWidgetInformant(); - virtual ~KFileItemListWidgetInformant(); + ~KFileItemListWidgetInformant() override; protected: - virtual QString itemText(int index, const KItemListView* view) const Q_DECL_OVERRIDE; - virtual bool itemIsLink(int index, const KItemListView* view) const Q_DECL_OVERRIDE; - virtual QString roleText(const QByteArray& role, const QHash<QByteArray, QVariant>& values) const Q_DECL_OVERRIDE; - virtual QFont customizedFontForLinks(const QFont& baseFont) const Q_DECL_OVERRIDE; + QString itemText(int index, const KItemListView* view) const override; + bool itemIsLink(int index, const KItemListView* view) const override; + QString roleText(const QByteArray& role, const QHash<QByteArray, QVariant>& values) const override; + QFont customizedFontForLinks(const QFont& baseFont) const override; }; class DOLPHIN_EXPORT KFileItemListWidget : public KStandardItemListWidget @@ -43,19 +43,19 @@ class DOLPHIN_EXPORT KFileItemListWidget : public KStandardItemListWidget public: KFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); - virtual ~KFileItemListWidget(); + ~KFileItemListWidget() override; static KItemListWidgetInformant* createInformant(); protected: - virtual bool isRoleRightAligned(const QByteArray& role) const Q_DECL_OVERRIDE; - virtual bool isHidden() const Q_DECL_OVERRIDE; - virtual QFont customizedFont(const QFont& baseFont) const Q_DECL_OVERRIDE; + bool isRoleRightAligned(const QByteArray& role) const override; + bool isHidden() const override; + QFont customizedFont(const QFont& baseFont) const override; /** * @return Selection length without MIME-type extension */ - virtual int selectionLength(const QString& text) const Q_DECL_OVERRIDE; + int selectionLength(const QString& text) const override; }; #endif diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 0ca748d7a..3cd119dc8 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -51,7 +51,7 @@ class DOLPHIN_EXPORT KFileItemModel : public KItemModelBase public: explicit KFileItemModel(QObject* parent = 0); - virtual ~KFileItemModel(); + ~KFileItemModel() override; /** * Loads the directory specified by \a url. The signals @@ -73,7 +73,7 @@ public: * the root-parent of all items. * @see rootItem() */ - QUrl directory() const Q_DECL_OVERRIDE; + QUrl directory() const override; /** * Cancels the loading of a directory which has been started by either @@ -81,9 +81,9 @@ public: */ void cancelDirectoryLoading(); - virtual int count() const Q_DECL_OVERRIDE; - virtual QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE; - virtual bool setData(int index, const QHash<QByteArray, QVariant>& values) Q_DECL_OVERRIDE; + int count() const override; + QHash<QByteArray, QVariant> data(int index) const override; + bool setData(int index, const QHash<QByteArray, QVariant>& values) override; /** * Sets a separate sorting with directories first (true) or a mixed @@ -102,15 +102,15 @@ public: void setShowDirectoriesOnly(bool enabled); bool showDirectoriesOnly() const; - virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE; + QMimeData* createMimeData(const KItemSet& indexes) const override; - virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const Q_DECL_OVERRIDE; + int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const override; - virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE; + bool supportsDropping(int index) const override; - virtual QString roleDescription(const QByteArray& role) const Q_DECL_OVERRIDE; + QString roleDescription(const QByteArray& role) const override; - virtual QList<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 @@ -156,10 +156,10 @@ public: void setRoles(const QSet<QByteArray>& roles); QSet<QByteArray> roles() const; - virtual bool setExpanded(int index, bool expanded) Q_DECL_OVERRIDE; - virtual bool isExpanded(int index) const Q_DECL_OVERRIDE; - virtual bool isExpandable(int index) const Q_DECL_OVERRIDE; - virtual int expandedParentsCount(int index) const Q_DECL_OVERRIDE; + bool setExpanded(int index, bool expanded) override; + bool isExpanded(int index) const override; + bool isExpandable(int index) const override; + int expandedParentsCount(int index) const override; QSet<QUrl> expandedDirectories() const; @@ -258,9 +258,9 @@ signals: void urlIsFileError(const QUrl& url); protected: - virtual void onGroupedSortingChanged(bool current) Q_DECL_OVERRIDE; - virtual void onSortRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE; - virtual void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) Q_DECL_OVERRIDE; + void onGroupedSortingChanged(bool current) override; + void onSortRoleChanged(const QByteArray& current, const QByteArray& previous) override; + void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) override; private slots: /** diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h index cd86fce1e..15d46d79e 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -95,7 +95,7 @@ class DOLPHIN_EXPORT KFileItemModelRolesUpdater : public QObject public: explicit KFileItemModelRolesUpdater(KFileItemModel* model, QObject* parent = 0); - virtual ~KFileItemModelRolesUpdater(); + ~KFileItemModelRolesUpdater() override; void setIconSize(const QSize& size); QSize iconSize() const; diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index b4ea62fac..8bab6cfad 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -48,7 +48,7 @@ class KItemListContainerViewport : public QGraphicsView public: KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent); protected: - void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent* event) override; }; KItemListContainerViewport::KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent) : diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h index 9fc3d4957..dc7b19e20 100644 --- a/src/kitemviews/kitemlistcontainer.h +++ b/src/kitemviews/kitemlistcontainer.h @@ -51,18 +51,18 @@ public: * @param parent Optional parent widget. */ explicit KItemListContainer(KItemListController* controller, QWidget* parent = 0); - virtual ~KItemListContainer(); + ~KItemListContainer() override; KItemListController* controller() const; void setEnabledFrame(bool enable); bool enabledFrame() const; protected: - virtual void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE; - virtual void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; - virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent* event) override; + void showEvent(QShowEvent* event) override; + void resizeEvent(QResizeEvent* event) override; + void scrollContentsBy(int dx, int dy) override; + void wheelEvent(QWheelEvent* event) override; private slots: void slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h index f29377443..ff0171a02 100644 --- a/src/kitemviews/kitemlistcontroller.h +++ b/src/kitemviews/kitemlistcontroller.h @@ -89,7 +89,7 @@ public: * @param parent Optional parent object. */ KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent = 0); - virtual ~KItemListController(); + ~KItemListController() override; void setModel(KItemModelBase* model); KItemModelBase* model() const; diff --git a/src/kitemviews/kitemlistgroupheader.h b/src/kitemviews/kitemlistgroupheader.h index 4612bc4da..f720076df 100644 --- a/src/kitemviews/kitemlistgroupheader.h +++ b/src/kitemviews/kitemlistgroupheader.h @@ -43,7 +43,7 @@ class DOLPHIN_EXPORT KItemListGroupHeader : public QGraphicsWidget public: KItemListGroupHeader(QGraphicsWidget* parent = 0); - virtual ~KItemListGroupHeader(); + ~KItemListGroupHeader() override; void setRole(const QByteArray& role); QByteArray role() const; @@ -65,7 +65,7 @@ public: void setItemIndex(int index); int itemIndex() const; - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; protected: virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) = 0; @@ -101,7 +101,7 @@ protected: */ virtual void itemIndexChanged(int current, int previous); - virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; virtual QPalette::ColorRole normalTextColorRole() const; virtual QPalette::ColorRole normalBaseColorRole() const; diff --git a/src/kitemviews/kitemlistheader.h b/src/kitemviews/kitemlistheader.h index 76c420559..4d9d9a5b0 100644 --- a/src/kitemviews/kitemlistheader.h +++ b/src/kitemviews/kitemlistheader.h @@ -38,7 +38,7 @@ class DOLPHIN_EXPORT KItemListHeader : public QObject Q_OBJECT public: - virtual ~KItemListHeader(); + ~KItemListHeader() override; /** * If set to true, KItemListView will automatically adjust the diff --git a/src/kitemviews/kitemlistselectionmanager.h b/src/kitemviews/kitemlistselectionmanager.h index 16761428b..d8faac4cd 100644 --- a/src/kitemviews/kitemlistselectionmanager.h +++ b/src/kitemviews/kitemlistselectionmanager.h @@ -52,7 +52,7 @@ public: }; KItemListSelectionManager(QObject* parent = 0); - virtual ~KItemListSelectionManager(); + ~KItemListSelectionManager() override; void setCurrentItem(int current); int currentItem() const; diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h index e64ac7e31..3415d52ec 100644 --- a/src/kitemviews/kitemlistview.h +++ b/src/kitemviews/kitemlistview.h @@ -68,7 +68,7 @@ class DOLPHIN_EXPORT KItemListView : public QGraphicsWidget public: KItemListView(QGraphicsWidget* parent = 0); - virtual ~KItemListView(); + ~KItemListView() override; /** * Offset of the scrollbar that represents the scroll-orientation @@ -165,7 +165,7 @@ public: const KItemListStyleOption& styleOption() const; - virtual void setGeometry(const QRectF& rect) Q_DECL_OVERRIDE; + void setGeometry(const QRectF& rect) override; /** * @return The page step which should be used by the vertical scroll bar. @@ -285,7 +285,7 @@ public: */ void editRole(int index, const QByteArray& role); - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; signals: void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); @@ -325,7 +325,7 @@ signals: void roleEditingFinished(int index, const QByteArray& role, const QVariant& value); protected: - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; void setItemSize(const QSizeF& size); void setStyleOption(const KItemListStyleOption& option); @@ -382,13 +382,13 @@ protected: virtual void onTransactionBegin(); virtual void onTransactionEnd(); - virtual bool event(QEvent* event) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; - virtual void dragEnterEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; - virtual void dragMoveEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; - virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; - virtual void dropEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; + bool event(QEvent* event) override; + void mousePressEvent(QGraphicsSceneMouseEvent* event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override; + void dragEnterEvent(QGraphicsSceneDragDropEvent* event) override; + void dragMoveEvent(QGraphicsSceneDragDropEvent* event) override; + void dragLeaveEvent(QGraphicsSceneDragDropEvent* event) override; + void dropEvent(QGraphicsSceneDragDropEvent* event) override; QList<KItemListWidget*> visibleItemListWidgets() const; @@ -803,7 +803,7 @@ private: class DOLPHIN_EXPORT KItemListWidgetCreatorBase : public KItemListCreatorBase { public: - virtual ~KItemListWidgetCreatorBase(); + ~KItemListWidgetCreatorBase() override; virtual KItemListWidget* create(KItemListView* view) = 0; @@ -824,15 +824,15 @@ class KItemListWidgetCreator : public KItemListWidgetCreatorBase { public: KItemListWidgetCreator(); - virtual ~KItemListWidgetCreator(); + ~KItemListWidgetCreator() override; - virtual KItemListWidget* create(KItemListView* view) Q_DECL_OVERRIDE; + KItemListWidget* create(KItemListView* view) override; - virtual void calculateItemSizeHints(QVector<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, - const KItemListView* view) const Q_DECL_OVERRIDE; + const KItemListView* view) const override; private: KItemListWidgetInformant* m_informant; }; @@ -885,7 +885,7 @@ qreal KItemListWidgetCreator<T>::preferredRoleColumnWidth(const QByteArray& role class DOLPHIN_EXPORT KItemListGroupHeaderCreatorBase : public KItemListCreatorBase { public: - virtual ~KItemListGroupHeaderCreatorBase(); + ~KItemListGroupHeaderCreatorBase() override; virtual KItemListGroupHeader* create(KItemListView* view) = 0; virtual void recycle(KItemListGroupHeader* header); }; @@ -894,8 +894,8 @@ template <class T> class KItemListGroupHeaderCreator : public KItemListGroupHeaderCreatorBase { public: - virtual ~KItemListGroupHeaderCreator(); - virtual KItemListGroupHeader* create(KItemListView* view) Q_DECL_OVERRIDE; + ~KItemListGroupHeaderCreator() override; + KItemListGroupHeader* create(KItemListView* view) override; }; template <class T> diff --git a/src/kitemviews/kitemlistviewaccessible.h b/src/kitemviews/kitemlistviewaccessible.h index afef2d5fe..674d98ee6 100644 --- a/src/kitemviews/kitemlistviewaccessible.h +++ b/src/kitemviews/kitemlistviewaccessible.h @@ -36,44 +36,44 @@ class DOLPHIN_EXPORT KItemListViewAccessible: public QAccessibleObject, public Q { public: explicit KItemListViewAccessible(KItemListView* view); - ~KItemListViewAccessible(); + ~KItemListViewAccessible() override; - void* interface_cast(QAccessible::InterfaceType type) Q_DECL_OVERRIDE; + void* interface_cast(QAccessible::InterfaceType type) override; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; + QAccessible::Role role() const override; + QAccessible::State state() const override; + QString text(QAccessible::Text t) const override; + QRect rect() const override; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE; - QAccessibleInterface* childAt(int x, int y) const Q_DECL_OVERRIDE; - QAccessibleInterface* parent() const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface*) const override; + QAccessibleInterface* childAt(int x, int y) const override; + QAccessibleInterface* parent() const override; // Table interface - virtual QAccessibleInterface* cellAt(int row, int column) const Q_DECL_OVERRIDE; - virtual QAccessibleInterface* caption() const Q_DECL_OVERRIDE; - virtual QAccessibleInterface* summary() const Q_DECL_OVERRIDE; - virtual QString columnDescription(int column) const Q_DECL_OVERRIDE; - virtual QString rowDescription(int row) const Q_DECL_OVERRIDE; - virtual int columnCount() const Q_DECL_OVERRIDE; - virtual int rowCount() const Q_DECL_OVERRIDE; + QAccessibleInterface* cellAt(int row, int column) const override; + QAccessibleInterface* caption() const override; + QAccessibleInterface* summary() const override; + QString columnDescription(int column) const override; + QString rowDescription(int row) const override; + int columnCount() const override; + int rowCount() const override; // Selection - virtual int selectedCellCount() const Q_DECL_OVERRIDE; - virtual int selectedColumnCount() const Q_DECL_OVERRIDE; - virtual int selectedRowCount() const Q_DECL_OVERRIDE; - virtual QList<QAccessibleInterface*> selectedCells() const Q_DECL_OVERRIDE; - virtual QList<int> selectedColumns() const Q_DECL_OVERRIDE; - virtual QList<int> selectedRows() const Q_DECL_OVERRIDE; - virtual bool isColumnSelected(int column) const Q_DECL_OVERRIDE; - virtual bool isRowSelected(int row) const Q_DECL_OVERRIDE; - virtual bool selectRow(int row) Q_DECL_OVERRIDE; - virtual bool selectColumn(int column) Q_DECL_OVERRIDE; - virtual bool unselectRow(int row) Q_DECL_OVERRIDE; - virtual bool unselectColumn(int column) Q_DECL_OVERRIDE; - virtual void modelChange(QAccessibleTableModelChangeEvent*) Q_DECL_OVERRIDE; + int selectedCellCount() const override; + int selectedColumnCount() const override; + int selectedRowCount() const override; + QList<QAccessibleInterface*> selectedCells() const override; + QList<int> selectedColumns() const override; + QList<int> selectedRows() const override; + bool isColumnSelected(int column) const override; + bool isRowSelected(int row) const override; + bool selectRow(int row) override; + bool selectColumn(int column) override; + bool unselectRow(int row) override; + bool unselectColumn(int column) override; + void modelChange(QAccessibleTableModelChangeEvent*) override; KItemListView* view() const; @@ -94,32 +94,32 @@ class DOLPHIN_EXPORT KItemListAccessibleCell: public QAccessibleInterface, publi public: KItemListAccessibleCell(KItemListView* view, int m_index); - void* interface_cast(QAccessible::InterfaceType type) Q_DECL_OVERRIDE; - QObject* object() const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString& text) Q_DECL_OVERRIDE; + void* interface_cast(QAccessible::InterfaceType type) override; + QObject* object() const override; + bool isValid() const override; + QAccessible::Role role() const override; + QAccessible::State state() const override; + QRect rect() const override; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString& text) override; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface* childAt(int x, int y) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const override; + int childCount() const override; + QAccessibleInterface* childAt(int x, int y) const override; + int indexOfChild(const QAccessibleInterface*) const override; - QAccessibleInterface* parent() const Q_DECL_OVERRIDE; + QAccessibleInterface* parent() const override; bool isExpandable() const; // Cell Interface - virtual int columnExtent() const Q_DECL_OVERRIDE; - virtual QList<QAccessibleInterface*> columnHeaderCells() const Q_DECL_OVERRIDE; - virtual int columnIndex() const Q_DECL_OVERRIDE; - virtual int rowExtent() const Q_DECL_OVERRIDE; - virtual QList<QAccessibleInterface*> rowHeaderCells() const Q_DECL_OVERRIDE; - virtual int rowIndex() const Q_DECL_OVERRIDE; - virtual bool isSelected() const Q_DECL_OVERRIDE; - virtual QAccessibleInterface* table() const Q_DECL_OVERRIDE; + int columnExtent() const override; + QList<QAccessibleInterface*> columnHeaderCells() const override; + int columnIndex() const override; + int rowExtent() const override; + QList<QAccessibleInterface*> rowHeaderCells() const override; + int rowIndex() const override; + bool isSelected() const override; + QAccessibleInterface* table() const override; inline int index() const; @@ -132,11 +132,11 @@ class DOLPHIN_EXPORT KItemListContainerAccessible : public QAccessibleWidget { public: explicit KItemListContainerAccessible(KItemListContainer* container); - virtual ~KItemListContainerAccessible(); + ~KItemListContainerAccessible() override; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface* child) const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface* child) const override; private: const KItemListContainer* container() const; diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h index d1ea7c9da..1480c1acb 100644 --- a/src/kitemviews/kitemlistwidget.h +++ b/src/kitemviews/kitemlistwidget.h @@ -69,7 +69,7 @@ class DOLPHIN_EXPORT KItemListWidget : public QGraphicsWidget public: KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); - virtual ~KItemListWidget(); + ~KItemListWidget() override; void setIndex(int index); int index() const; @@ -82,7 +82,7 @@ public: * to show the data of the custom model provided by KItemListWidget::data(). * @reimp */ - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; void setVisibleRoles(const QList<QByteArray>& roles); QList<QByteArray> visibleRoles() const; @@ -142,7 +142,7 @@ public: * or KItemListWidget::expansionToggleRect(). * @reimp */ - virtual bool contains(const QPointF& point) const override; + bool contains(const QPointF& point) const override; /** * @return Rectangle for the area that shows the icon. @@ -203,7 +203,7 @@ protected: virtual void alternateBackgroundChanged(bool enabled); virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous); virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous); - virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; /** * @return The current opacity of the hover-animation. When implementing a custom painting-code for a hover-state diff --git a/src/kitemviews/kitemmodelbase.h b/src/kitemviews/kitemmodelbase.h index a7773ee3b..d604f423f 100644 --- a/src/kitemviews/kitemmodelbase.h +++ b/src/kitemviews/kitemmodelbase.h @@ -57,7 +57,7 @@ class DOLPHIN_EXPORT KItemModelBase : public QObject public: KItemModelBase(QObject* parent = 0); explicit KItemModelBase(const QByteArray& sortRole, QObject* parent = 0); - virtual ~KItemModelBase(); + ~KItemModelBase() override; /** @return The number of items. */ virtual int count() const = 0; diff --git a/src/kitemviews/kstandarditemlistgroupheader.h b/src/kitemviews/kstandarditemlistgroupheader.h index f0eacfd49..1d9989cdf 100644 --- a/src/kitemviews/kstandarditemlistgroupheader.h +++ b/src/kitemviews/kstandarditemlistgroupheader.h @@ -33,16 +33,16 @@ class DOLPHIN_EXPORT KStandardItemListGroupHeader : public KItemListGroupHeader public: KStandardItemListGroupHeader(QGraphicsWidget* parent = 0); - virtual ~KStandardItemListGroupHeader(); + ~KStandardItemListGroupHeader() override; - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; protected: - virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) Q_DECL_OVERRIDE; - virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE; - virtual void roleChanged(const QByteArray ¤t, const QByteArray &previous) Q_DECL_OVERRIDE; - virtual void dataChanged(const QVariant& current, const QVariant& previous) Q_DECL_OVERRIDE; - virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; + void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) override; + void paintSeparator(QPainter* painter, const QColor& color) override; + void roleChanged(const QByteArray ¤t, const QByteArray &previous) override; + void dataChanged(const QVariant& current, const QVariant& previous) override; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; private: void updateCache(); diff --git a/src/kitemviews/kstandarditemlistview.h b/src/kitemviews/kstandarditemlistview.h index 2e4c7a0a0..d22a51b34 100644 --- a/src/kitemviews/kstandarditemlistview.h +++ b/src/kitemviews/kstandarditemlistview.h @@ -53,21 +53,21 @@ public: }; KStandardItemListView(QGraphicsWidget* parent = 0); - virtual ~KStandardItemListView(); + ~KStandardItemListView() override; void setItemLayout(ItemLayout layout); ItemLayout itemLayout() const; protected: - virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE; - virtual KItemListGroupHeaderCreatorBase* defaultGroupHeaderCreator() const Q_DECL_OVERRIDE; - virtual void initializeItemListWidget(KItemListWidget* item) Q_DECL_OVERRIDE; - virtual bool itemSizeHintUpdateRequired(const QSet<QByteArray>& changedRoles) const Q_DECL_OVERRIDE; + KItemListWidgetCreatorBase* defaultWidgetCreator() const override; + KItemListGroupHeaderCreatorBase* defaultGroupHeaderCreator() const override; + void initializeItemListWidget(KItemListWidget* item) override; + bool itemSizeHintUpdateRequired(const QSet<QByteArray>& changedRoles) const override; virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const; virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous); - virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) Q_DECL_OVERRIDE; - virtual void onSupportsItemExpandingChanged(bool supportsExpanding) Q_DECL_OVERRIDE; - virtual void polishEvent() Q_DECL_OVERRIDE; + void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) override; + void onSupportsItemExpandingChanged(bool supportsExpanding) override; + void polishEvent() override; private: void applyDefaultStyleOption(int iconSize, int padding, int horizontalMargin, int verticalMargin); diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h index cb7364795..bd4b52923 100644 --- a/src/kitemviews/kstandarditemlistwidget.h +++ b/src/kitemviews/kstandarditemlistwidget.h @@ -36,13 +36,13 @@ class DOLPHIN_EXPORT KStandardItemListWidgetInformant : public KItemListWidgetIn { public: KStandardItemListWidgetInformant(); - virtual ~KStandardItemListWidgetInformant(); + ~KStandardItemListWidgetInformant() override; - virtual void calculateItemSizeHints(QVector<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, - const KItemListView* view) const Q_DECL_OVERRIDE; + const KItemListView* view) const override; protected: /** * @return The value of the "text" role. The default implementation returns @@ -96,7 +96,7 @@ public: }; KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent); - virtual ~KStandardItemListWidget(); + ~KStandardItemListWidget() override; void setLayout(Layout layout); Layout layout() const; @@ -104,15 +104,15 @@ public: void setSupportsItemExpanding(bool supportsItemExpanding); bool supportsItemExpanding() const; - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; - virtual QRectF iconRect() const Q_DECL_OVERRIDE; - virtual QRectF textRect() const Q_DECL_OVERRIDE; - virtual QRectF textFocusRect() const Q_DECL_OVERRIDE; - virtual QRectF selectionRect() const Q_DECL_OVERRIDE; - virtual QRectF expansionToggleRect() const Q_DECL_OVERRIDE; - virtual QRectF selectionToggleRect() const Q_DECL_OVERRIDE; - virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + QRectF iconRect() const override; + QRectF textRect() const override; + QRectF textFocusRect() const override; + QRectF selectionRect() const override; + QRectF expansionToggleRect() const override; + QRectF selectionToggleRect() const override; + QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; static KItemListWidgetInformant* createInformant(); @@ -172,18 +172,18 @@ protected: */ virtual int selectionLength(const QString& text) const; - virtual void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>()) Q_DECL_OVERRIDE; - virtual void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) Q_DECL_OVERRIDE; - virtual void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) Q_DECL_OVERRIDE; - virtual void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) Q_DECL_OVERRIDE; - virtual void hoveredChanged(bool hovered) Q_DECL_OVERRIDE; - virtual void selectedChanged(bool selected) Q_DECL_OVERRIDE; - virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) Q_DECL_OVERRIDE; - virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE; - virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; - virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>()) override; + void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) override; + void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) override; + void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) override; + void hoveredChanged(bool hovered) override; + void selectedChanged(bool selected) override; + void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) override; + void editedRoleChanged(const QByteArray& current, const QByteArray& previous) override; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; + void showEvent(QShowEvent* event) override; + void hideEvent(QHideEvent* event) override; + bool event(QEvent *event) override; public slots: void finishRoleEditing(); diff --git a/src/kitemviews/kstandarditemmodel.h b/src/kitemviews/kstandarditemmodel.h index 58c5a5d88..6e63daa81 100644 --- a/src/kitemviews/kstandarditemmodel.h +++ b/src/kitemviews/kstandarditemmodel.h @@ -41,7 +41,7 @@ class DOLPHIN_EXPORT KStandardItemModel : public KItemModelBase public: explicit KStandardItemModel(QObject* parent = 0); - virtual ~KStandardItemModel(); + ~KStandardItemModel() override; /** * Inserts the item \a item at the index \a index. If the index @@ -69,14 +69,14 @@ public: */ void appendItem(KStandardItem* item); - virtual int count() const Q_DECL_OVERRIDE; - virtual QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE; - virtual bool setData(int index, const QHash<QByteArray, QVariant>& values) Q_DECL_OVERRIDE; - virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE; - virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const Q_DECL_OVERRIDE; - virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE; - virtual QString roleDescription(const QByteArray& role) const Q_DECL_OVERRIDE; - virtual QList<QPair<int, QVariant> > groups() const Q_DECL_OVERRIDE; + int count() const override; + QHash<QByteArray, QVariant> data(int index) const override; + bool setData(int index, const QHash<QByteArray, QVariant>& values) override; + QMimeData* createMimeData(const KItemSet& indexes) const override; + int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const override; + bool supportsDropping(int index) const override; + QString roleDescription(const QByteArray& role) const override; + QList<QPair<int, QVariant> > groups() const override; virtual void clear(); protected: diff --git a/src/kitemviews/private/kdirectorycontentscounter.h b/src/kitemviews/private/kdirectorycontentscounter.h index 988208e02..13726fae7 100644 --- a/src/kitemviews/private/kdirectorycontentscounter.h +++ b/src/kitemviews/private/kdirectorycontentscounter.h @@ -36,7 +36,7 @@ class KDirectoryContentsCounter : public QObject public: explicit KDirectoryContentsCounter(KFileItemModel* model, QObject* parent = 0); - ~KDirectoryContentsCounter(); + ~KDirectoryContentsCounter() override; /** * Requests the number of items inside the directory \a path. The actual diff --git a/src/kitemviews/private/kfileitemclipboard.h b/src/kitemviews/private/kfileitemclipboard.h index 3ee50d661..5b5ab1eec 100644 --- a/src/kitemviews/private/kfileitemclipboard.h +++ b/src/kitemviews/private/kfileitemclipboard.h @@ -46,7 +46,7 @@ signals: void cutItemsChanged(); protected: - virtual ~KFileItemClipboard(); + ~KFileItemClipboard() override; private slots: void updateCutItems(); diff --git a/src/kitemviews/private/kfileitemmodeldirlister.h b/src/kitemviews/private/kfileitemmodeldirlister.h index 5aa2b6303..ca5f76de6 100644 --- a/src/kitemviews/private/kfileitemmodeldirlister.h +++ b/src/kitemviews/private/kfileitemmodeldirlister.h @@ -35,7 +35,7 @@ class DOLPHIN_EXPORT KFileItemModelDirLister : public KDirLister public: KFileItemModelDirLister(QObject* parent = 0); - virtual ~KFileItemModelDirLister(); + ~KFileItemModelDirLister() override; signals: /** Is emitted whenever an error has occurred. */ @@ -48,7 +48,7 @@ signals: void urlIsFileError(const QUrl& url); protected: - void handleError(KIO::Job* job) Q_DECL_OVERRIDE; + void handleError(KIO::Job* job) override; }; #endif diff --git a/src/kitemviews/private/kitemlistheaderwidget.h b/src/kitemviews/private/kitemlistheaderwidget.h index 2342b4907..8248fb7bb 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.h +++ b/src/kitemviews/private/kitemlistheaderwidget.h @@ -39,7 +39,7 @@ class DOLPHIN_EXPORT KItemListHeaderWidget : public QGraphicsWidget public: KItemListHeaderWidget(QGraphicsWidget* parent = 0); - virtual ~KItemListHeaderWidget(); + ~KItemListHeaderWidget() override; void setModel(KItemModelBase* model); KItemModelBase* model() const; @@ -64,7 +64,7 @@ public: qreal minimumColumnWidth() const; - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; signals: /** @@ -104,13 +104,13 @@ signals: void sortRoleChanged(const QByteArray& current, const QByteArray& previous); protected: - void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; - void hoverEnterEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; - void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; - void hoverMoveEvent(QGraphicsSceneHoverEvent* event) Q_DECL_OVERRIDE; + void mousePressEvent(QGraphicsSceneMouseEvent* event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent* event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent* event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent* event) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent* event) override; private slots: void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous); diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h index 2a14ca470..be1d96c74 100644 --- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h +++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h @@ -42,7 +42,7 @@ class DOLPHIN_EXPORT KItemListKeyboardSearchManager : public QObject public: KItemListKeyboardSearchManager(QObject* parent = 0); - virtual ~KItemListKeyboardSearchManager(); + ~KItemListKeyboardSearchManager() override; /** * Add \a keys to the text buffer used for searching. diff --git a/src/kitemviews/private/kitemlistroleeditor.h b/src/kitemviews/private/kitemlistroleeditor.h index f889ea4f4..7285d62f7 100644 --- a/src/kitemviews/private/kitemlistroleeditor.h +++ b/src/kitemviews/private/kitemlistroleeditor.h @@ -39,20 +39,20 @@ class DOLPHIN_EXPORT KItemListRoleEditor : public KTextEdit public: explicit KItemListRoleEditor(QWidget* parent); - virtual ~KItemListRoleEditor(); + ~KItemListRoleEditor() override; void setRole(const QByteArray& role); QByteArray role() const; - bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE; + bool eventFilter(QObject* watched, QEvent* event) override; signals: void roleEditingFinished(const QByteArray& role, const QVariant& value); void roleEditingCanceled(const QByteArray& role, const QVariant& value); protected: - bool event(QEvent* event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; + bool event(QEvent* event) override; + void keyPressEvent(QKeyEvent* event) override; private slots: /** diff --git a/src/kitemviews/private/kitemlistrubberband.h b/src/kitemviews/private/kitemlistrubberband.h index b47c30c1f..fa7401c9e 100644 --- a/src/kitemviews/private/kitemlistrubberband.h +++ b/src/kitemviews/private/kitemlistrubberband.h @@ -33,7 +33,7 @@ class DOLPHIN_EXPORT KItemListRubberBand : public QObject public: explicit KItemListRubberBand(QObject* parent = 0); - virtual ~KItemListRubberBand(); + ~KItemListRubberBand() override; void setStartPosition(const QPointF& pos); QPointF startPosition() const; diff --git a/src/kitemviews/private/kitemlistselectiontoggle.h b/src/kitemviews/private/kitemlistselectiontoggle.h index e3f5bb63c..7c283fb54 100644 --- a/src/kitemviews/private/kitemlistselectiontoggle.h +++ b/src/kitemviews/private/kitemlistselectiontoggle.h @@ -35,17 +35,17 @@ class DOLPHIN_EXPORT KItemListSelectionToggle : public QGraphicsWidget public: KItemListSelectionToggle(QGraphicsItem* parent); - virtual ~KItemListSelectionToggle(); + ~KItemListSelectionToggle() override; void setChecked(bool checked); bool isChecked() const; void setHovered(bool hovered); - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; protected: - void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; + void resizeEvent(QGraphicsSceneResizeEvent* event) override; private: void updatePixmap(); diff --git a/src/kitemviews/private/kitemlistsmoothscroller.h b/src/kitemviews/private/kitemlistsmoothscroller.h index 7d01a6b62..6dccde9a2 100644 --- a/src/kitemviews/private/kitemlistsmoothscroller.h +++ b/src/kitemviews/private/kitemlistsmoothscroller.h @@ -40,7 +40,7 @@ class DOLPHIN_EXPORT KItemListSmoothScroller : public QObject public: explicit KItemListSmoothScroller(QScrollBar* scrollBar, QObject* parent = 0); - virtual ~KItemListSmoothScroller(); + ~KItemListSmoothScroller() override; void setScrollBar(QScrollBar* scrollBar); QScrollBar* scrollBar() const; @@ -83,7 +83,7 @@ public: void handleWheelEvent(QWheelEvent* event); protected: - bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; + bool eventFilter(QObject* obj, QEvent* event) override; private slots: void slotAnimationStateChanged(QAbstractAnimation::State newState, diff --git a/src/kitemviews/private/kitemlistviewanimation.h b/src/kitemviews/private/kitemlistviewanimation.h index 06c81c9b8..ddcb5e964 100644 --- a/src/kitemviews/private/kitemlistviewanimation.h +++ b/src/kitemviews/private/kitemlistviewanimation.h @@ -49,7 +49,7 @@ public: }; KItemListViewAnimation(QObject* parent = 0); - virtual ~KItemListViewAnimation(); + ~KItemListViewAnimation() override; void setScrollOrientation(Qt::Orientation orientation); Qt::Orientation scrollOrientation() const; diff --git a/src/kitemviews/private/kitemlistviewlayouter.h b/src/kitemviews/private/kitemlistviewlayouter.h index 3f1cf68d4..84bbfff58 100644 --- a/src/kitemviews/private/kitemlistviewlayouter.h +++ b/src/kitemviews/private/kitemlistviewlayouter.h @@ -51,7 +51,7 @@ class DOLPHIN_EXPORT KItemListViewLayouter : public QObject public: KItemListViewLayouter(KItemListSizeHintResolver* sizeHintResolver, QObject* parent = 0); - virtual ~KItemListViewLayouter(); + ~KItemListViewLayouter() override; void setScrollOrientation(Qt::Orientation orientation); Qt::Orientation scrollOrientation() const; |
