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/statusbar | |
| parent | 5bee1889e1682f1e7ffe55e49beaf4544eaf7157 (diff) | |
Modernize: Use override where possible
Also use override instead of Q_DECL_OVERRIDE
Diffstat (limited to 'src/statusbar')
| -rw-r--r-- | src/statusbar/dolphinstatusbar.h | 6 | ||||
| -rw-r--r-- | src/statusbar/mountpointobserver.h | 2 | ||||
| -rw-r--r-- | src/statusbar/mountpointobservercache.h | 2 | ||||
| -rw-r--r-- | src/statusbar/spaceinfoobserver.h | 2 | ||||
| -rw-r--r-- | src/statusbar/statusbarspaceinfo.h | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/statusbar/dolphinstatusbar.h b/src/statusbar/dolphinstatusbar.h index 1a4ccf682..582e56907 100644 --- a/src/statusbar/dolphinstatusbar.h +++ b/src/statusbar/dolphinstatusbar.h @@ -43,7 +43,7 @@ class DolphinStatusBar : public QWidget public: DolphinStatusBar(QWidget* parent); - virtual ~DolphinStatusBar(); + ~DolphinStatusBar() override; QString text() const; @@ -101,8 +101,8 @@ signals: void zoomLevelChanged(int zoomLevel); protected: - virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent* event) override; + bool eventFilter(QObject* obj, QEvent* event) override; private slots: void showZoomSliderToolTip(int zoomLevel); diff --git a/src/statusbar/mountpointobserver.h b/src/statusbar/mountpointobserver.h index c3d2aa677..939e84866 100644 --- a/src/statusbar/mountpointobserver.h +++ b/src/statusbar/mountpointobserver.h @@ -54,7 +54,7 @@ class MountPointObserver : public QObject Q_OBJECT explicit MountPointObserver(const QUrl& url, QObject* parent = 0); - virtual ~MountPointObserver() {} + ~MountPointObserver() override {} public: /** diff --git a/src/statusbar/mountpointobservercache.h b/src/statusbar/mountpointobservercache.h index 8a1496d89..74cef0674 100644 --- a/src/statusbar/mountpointobservercache.h +++ b/src/statusbar/mountpointobservercache.h @@ -31,7 +31,7 @@ class MountPointObserverCache : public QObject Q_OBJECT MountPointObserverCache(); - virtual ~MountPointObserverCache(); + ~MountPointObserverCache() override; public: static MountPointObserverCache* instance(); diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h index e1311abde..3f203b47f 100644 --- a/src/statusbar/spaceinfoobserver.h +++ b/src/statusbar/spaceinfoobserver.h @@ -33,7 +33,7 @@ class SpaceInfoObserver : public QObject public: explicit SpaceInfoObserver(const QUrl& url, QObject* parent = 0); - virtual ~SpaceInfoObserver(); + ~SpaceInfoObserver() override; quint64 size() const; quint64 available() const; diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h index 326c419ab..e89966a59 100644 --- a/src/statusbar/statusbarspaceinfo.h +++ b/src/statusbar/statusbarspaceinfo.h @@ -41,15 +41,15 @@ class StatusBarSpaceInfo : public KCapacityBar public: explicit StatusBarSpaceInfo(QWidget* parent = 0); - virtual ~StatusBarSpaceInfo(); + ~StatusBarSpaceInfo() override; void setUrl(const QUrl& url); QUrl url() const; protected: - void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; + void hideEvent(QHideEvent* event) override; + void mousePressEvent(QMouseEvent* event) override; private slots: void slotValuesChanged(); |
