┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/kitemviews/private
diff options
context:
space:
mode:
authorKevin Funk <[email protected]>2017-11-20 23:25:06 +0100
committerKevin Funk <[email protected]>2017-11-20 23:25:48 +0100
commit464b13f3828e5cdd03438d0881c3a62c7cda6333 (patch)
tree724c10c4e06ac3030666f2604066b6cbcc83ffd0 /src/kitemviews/private
parent5bee1889e1682f1e7ffe55e49beaf4544eaf7157 (diff)
Modernize: Use override where possible
Also use override instead of Q_DECL_OVERRIDE
Diffstat (limited to 'src/kitemviews/private')
-rw-r--r--src/kitemviews/private/kdirectorycontentscounter.h2
-rw-r--r--src/kitemviews/private/kfileitemclipboard.h2
-rw-r--r--src/kitemviews/private/kfileitemmodeldirlister.h4
-rw-r--r--src/kitemviews/private/kitemlistheaderwidget.h18
-rw-r--r--src/kitemviews/private/kitemlistkeyboardsearchmanager.h2
-rw-r--r--src/kitemviews/private/kitemlistroleeditor.h8
-rw-r--r--src/kitemviews/private/kitemlistrubberband.h2
-rw-r--r--src/kitemviews/private/kitemlistselectiontoggle.h6
-rw-r--r--src/kitemviews/private/kitemlistsmoothscroller.h4
-rw-r--r--src/kitemviews/private/kitemlistviewanimation.h2
-rw-r--r--src/kitemviews/private/kitemlistviewlayouter.h2
11 files changed, 26 insertions, 26 deletions
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;