┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/views
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/views
parent5bee1889e1682f1e7ffe55e49beaf4544eaf7157 (diff)
Modernize: Use override where possible
Also use override instead of Q_DECL_OVERRIDE
Diffstat (limited to 'src/views')
-rw-r--r--src/views/dolphinfileitemlistwidget.h4
-rw-r--r--src/views/dolphinitemlistview.h16
-rw-r--r--src/views/dolphinnewfilemenuobserver.h2
-rw-r--r--src/views/dolphinremoteencoding.h2
-rw-r--r--src/views/dolphinview.h10
-rw-r--r--src/views/renamedialog.h2
-rw-r--r--src/views/tooltips/dolphinfilemetadatawidget.h2
-rw-r--r--src/views/tooltips/tooltipmanager.h2
-rw-r--r--src/views/versioncontrol/kversioncontrolplugin.h2
-rw-r--r--src/views/versioncontrol/updateitemstatesthread.h4
-rw-r--r--src/views/versioncontrol/versioncontrolobserver.h2
-rw-r--r--src/views/viewmodecontroller.h2
12 files changed, 25 insertions, 25 deletions
diff --git a/src/views/dolphinfileitemlistwidget.h b/src/views/dolphinfileitemlistwidget.h
index af73ac937..a04bc6828 100644
--- a/src/views/dolphinfileitemlistwidget.h
+++ b/src/views/dolphinfileitemlistwidget.h
@@ -37,10 +37,10 @@ class DOLPHIN_EXPORT DolphinFileItemListWidget : public KFileItemListWidget
public:
DolphinFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
- virtual ~DolphinFileItemListWidget();
+ ~DolphinFileItemListWidget() override;
protected:
- virtual void refreshCache() Q_DECL_OVERRIDE;
+ void refreshCache() override;
private:
static QPixmap overlayForState(KVersionControlPlugin::ItemVersion version, int size);
diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h
index 7eec6f17a..7b3f1f8d0 100644
--- a/src/views/dolphinitemlistview.h
+++ b/src/views/dolphinitemlistview.h
@@ -40,7 +40,7 @@ class DOLPHIN_EXPORT DolphinItemListView : public KFileItemListView
public:
explicit DolphinItemListView(QGraphicsWidget* parent = 0);
- virtual ~DolphinItemListView();
+ ~DolphinItemListView() override;
void setZoomLevel(int level);
int zoomLevel() const;
@@ -49,14 +49,14 @@ public:
void writeSettings();
protected:
- virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE;
- virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const Q_DECL_OVERRIDE;
- virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous) Q_DECL_OVERRIDE;
- virtual void onPreviewsShownChanged(bool shown) Q_DECL_OVERRIDE;
- virtual void onVisibleRolesChanged(const QList<QByteArray>& current,
- const QList<QByteArray>& previous) Q_DECL_OVERRIDE;
+ KItemListWidgetCreatorBase* defaultWidgetCreator() const override;
+ bool itemLayoutSupportsItemExpanding(ItemLayout layout) const override;
+ void onItemLayoutChanged(ItemLayout current, ItemLayout previous) override;
+ void onPreviewsShownChanged(bool shown) override;
+ void onVisibleRolesChanged(const QList<QByteArray>& current,
+ const QList<QByteArray>& previous) override;
- virtual void updateFont() Q_DECL_OVERRIDE;
+ void updateFont() override;
private:
void updateGridSize();
diff --git a/src/views/dolphinnewfilemenuobserver.h b/src/views/dolphinnewfilemenuobserver.h
index df4621f17..2386bce1e 100644
--- a/src/views/dolphinnewfilemenuobserver.h
+++ b/src/views/dolphinnewfilemenuobserver.h
@@ -48,7 +48,7 @@ signals:
private:
DolphinNewFileMenuObserver();
- virtual ~DolphinNewFileMenuObserver();
+ ~DolphinNewFileMenuObserver() override;
friend class DolphinNewFileMenuObserverSingleton;
};
diff --git a/src/views/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h
index 28ff52cb3..ca1cea2c7 100644
--- a/src/views/dolphinremoteencoding.h
+++ b/src/views/dolphinremoteencoding.h
@@ -40,7 +40,7 @@ class DOLPHIN_EXPORT DolphinRemoteEncoding: public QObject
Q_OBJECT
public:
DolphinRemoteEncoding(QObject* parent, DolphinViewActionHandler* actionHandler);
- ~DolphinRemoteEncoding();
+ ~DolphinRemoteEncoding() override;
public Q_SLOTS:
void slotAboutToOpenUrl();
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 2df1cf9e4..61f6af1e2 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -93,7 +93,7 @@ public:
*/
DolphinView(const QUrl& url, QWidget* parent);
- virtual ~DolphinView();
+ ~DolphinView() override;
/**
* Returns the current active URL, where all actions are applied.
@@ -370,7 +370,7 @@ public slots:
void stopLoading();
/** Activates the view if the item list container gets focus. */
- virtual bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE;
+ bool eventFilter(QObject* watched, QEvent* event) override;
signals:
/**
@@ -552,10 +552,10 @@ signals:
protected:
/** Changes the zoom level if Control is pressed during a wheel event. */
- virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
+ void wheelEvent(QWheelEvent* event) override;
- virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
- virtual bool event(QEvent* event) Q_DECL_OVERRIDE;
+ void hideEvent(QHideEvent* event) override;
+ bool event(QEvent* event) override;
private slots:
/**
diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h
index 7ead0ca9f..8a92ea1b9 100644
--- a/src/views/renamedialog.h
+++ b/src/views/renamedialog.h
@@ -39,7 +39,7 @@ class DOLPHIN_EXPORT RenameDialog : public QDialog
public:
explicit RenameDialog(QWidget* parent, const KFileItemList& items);
- virtual ~RenameDialog();
+ ~RenameDialog() override;
signals:
void renamingFinished(const QList<QUrl>& urls);
diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h
index c5c228766..0b9add581 100644
--- a/src/views/tooltips/dolphinfilemetadatawidget.h
+++ b/src/views/tooltips/dolphinfilemetadatawidget.h
@@ -46,7 +46,7 @@ class DolphinFileMetaDataWidget : public QWidget
public:
DolphinFileMetaDataWidget(QWidget* parent = 0);
- virtual ~DolphinFileMetaDataWidget();
+ ~DolphinFileMetaDataWidget() override;
void setPreview(const QPixmap& pixmap);
QPixmap preview() const;
diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h
index 9f1f104f1..746d6cb67 100644
--- a/src/views/tooltips/tooltipmanager.h
+++ b/src/views/tooltips/tooltipmanager.h
@@ -43,7 +43,7 @@ class ToolTipManager : public QObject
public:
explicit ToolTipManager(QWidget* parent);
- virtual ~ToolTipManager();
+ ~ToolTipManager() override;
/**
* Triggers the showing of the tooltip for the item \p item
diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h
index 1696f975c..b9b1f0b5b 100644
--- a/src/views/versioncontrol/kversioncontrolplugin.h
+++ b/src/views/versioncontrol/kversioncontrolplugin.h
@@ -145,7 +145,7 @@ public:
};
KVersionControlPlugin(QObject* parent = 0);
- virtual ~KVersionControlPlugin();
+ ~KVersionControlPlugin() override;
/**
* Returns the name of the file which stores
diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h
index 3dc03fc75..d33a64cc7 100644
--- a/src/views/versioncontrol/updateitemstatesthread.h
+++ b/src/views/versioncontrol/updateitemstatesthread.h
@@ -46,12 +46,12 @@ public:
*/
UpdateItemStatesThread(KVersionControlPlugin* plugin,
const QMap<QString, QVector<VersionControlObserver::ItemState> >& itemStates);
- virtual ~UpdateItemStatesThread();
+ ~UpdateItemStatesThread() override;
QMap<QString, QVector<VersionControlObserver::ItemState> > itemStates() const;
protected:
- virtual void run() Q_DECL_OVERRIDE;
+ void run() override;
private:
QMutex* m_globalPluginMutex; // Protects the m_plugin globally
diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index c817c2187..0b702f5f1 100644
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -51,7 +51,7 @@ class DOLPHIN_EXPORT VersionControlObserver : public QObject
public:
explicit VersionControlObserver(QObject* parent = 0);
- virtual ~VersionControlObserver();
+ ~VersionControlObserver() override;
void setModel(KFileItemModel* model);
KFileItemModel* model() const;
diff --git a/src/views/viewmodecontroller.h b/src/views/viewmodecontroller.h
index 4b1ff2083..015fdec85 100644
--- a/src/views/viewmodecontroller.h
+++ b/src/views/viewmodecontroller.h
@@ -39,7 +39,7 @@ class DOLPHIN_EXPORT ViewModeController : public QObject
public:
explicit ViewModeController(QObject* parent = 0);
- virtual ~ViewModeController();
+ ~ViewModeController() override;
/**
* @return URL that is shown by the view mode implementation.