┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/general
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/settings/general
parent5bee1889e1682f1e7ffe55e49beaf4544eaf7157 (diff)
Modernize: Use override where possible
Also use override instead of Q_DECL_OVERRIDE
Diffstat (limited to 'src/settings/general')
-rw-r--r--src/settings/general/behaviorsettingspage.h6
-rw-r--r--src/settings/general/configurepreviewplugindialog.h2
-rw-r--r--src/settings/general/confirmationssettingspage.h6
-rw-r--r--src/settings/general/generalsettingspage.h6
-rw-r--r--src/settings/general/previewssettingspage.h8
-rw-r--r--src/settings/general/statusbarsettingspage.h6
6 files changed, 17 insertions, 17 deletions
diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index 96eaf3d64..16a3e95c2 100644
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -37,13 +37,13 @@ class BehaviorSettingsPage : public SettingsPageBase
public:
BehaviorSettingsPage(const QUrl &url, QWidget* parent);
- virtual ~BehaviorSettingsPage();
+ ~BehaviorSettingsPage() override;
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings() Q_DECL_OVERRIDE;
+ void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults() Q_DECL_OVERRIDE;
+ void restoreDefaults() override;
private:
void loadSettings();
diff --git a/src/settings/general/configurepreviewplugindialog.h b/src/settings/general/configurepreviewplugindialog.h
index 620caeb51..e54fb464a 100644
--- a/src/settings/general/configurepreviewplugindialog.h
+++ b/src/settings/general/configurepreviewplugindialog.h
@@ -40,7 +40,7 @@ public:
ConfigurePreviewPluginDialog(const QString& pluginName,
const QString& desktopEntryName,
QWidget* parent);
- virtual ~ConfigurePreviewPluginDialog() = default;
+ ~ConfigurePreviewPluginDialog() override = default;
};
#endif
diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h
index e702fe8ae..f8e5e3540 100644
--- a/src/settings/general/confirmationssettingspage.h
+++ b/src/settings/general/confirmationssettingspage.h
@@ -32,13 +32,13 @@ class ConfirmationsSettingsPage : public SettingsPageBase
public:
ConfirmationsSettingsPage(QWidget* parent);
- virtual ~ConfirmationsSettingsPage();
+ ~ConfirmationsSettingsPage() override;
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings() Q_DECL_OVERRIDE;
+ void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults() Q_DECL_OVERRIDE;
+ void restoreDefaults() override;
private:
void loadSettings();
diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h
index 7073258ff..a68fc933b 100644
--- a/src/settings/general/generalsettingspage.h
+++ b/src/settings/general/generalsettingspage.h
@@ -41,13 +41,13 @@ class GeneralSettingsPage : public SettingsPageBase
public:
GeneralSettingsPage(const QUrl& url, QWidget* parent);
- virtual ~GeneralSettingsPage();
+ ~GeneralSettingsPage() override;
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings() Q_DECL_OVERRIDE;
+ void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults() Q_DECL_OVERRIDE;
+ void restoreDefaults() override;
private:
QList<SettingsPageBase*> m_pages;
diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h
index 6e896f05e..0bac4da65 100644
--- a/src/settings/general/previewssettingspage.h
+++ b/src/settings/general/previewssettingspage.h
@@ -35,20 +35,20 @@ class PreviewsSettingsPage : public SettingsPageBase
public:
PreviewsSettingsPage(QWidget* parent);
- virtual ~PreviewsSettingsPage();
+ ~PreviewsSettingsPage() override;
/**
* Applies the general settings for the view modes
* The settings are persisted automatically when
* closing Dolphin.
*/
- virtual void applySettings() Q_DECL_OVERRIDE;
+ void applySettings() override;
/** Restores the settings to default values. */
- virtual void restoreDefaults() Q_DECL_OVERRIDE;
+ void restoreDefaults() override;
protected:
- virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+ void showEvent(QShowEvent* event) override;
private slots:
void configureService(const QModelIndex& index);
diff --git a/src/settings/general/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h
index 608354371..d85f0aaa1 100644
--- a/src/settings/general/statusbarsettingspage.h
+++ b/src/settings/general/statusbarsettingspage.h
@@ -32,13 +32,13 @@ class StatusBarSettingsPage : public SettingsPageBase
public:
StatusBarSettingsPage(QWidget* parent);
- virtual ~StatusBarSettingsPage();
+ ~StatusBarSettingsPage() override;
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings() Q_DECL_OVERRIDE;
+ void applySettings() override;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults() Q_DECL_OVERRIDE;
+ void restoreDefaults() override;
private:
void loadSettings();