┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
authorLukáš Tinkl <[email protected]>2014-11-03 23:52:18 +0100
committerLukáš Tinkl <[email protected]>2014-11-03 23:52:18 +0100
commit037d5db85bb0bd798d40c557d424c5c9b87457a8 (patch)
treee032bfeb3f7e6bf3a1e118ff195df9009949a7d6 /src/settings
parentb96def1856bfd043ba7dae56368ceed6940bd6c4 (diff)
Q_DECL_OVERRIDE
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/applyviewpropsjob.h2
-rw-r--r--src/settings/general/behaviorsettingspage.h4
-rw-r--r--src/settings/general/confirmationssettingspage.h4
-rw-r--r--src/settings/general/generalsettingspage.h4
-rw-r--r--src/settings/general/previewssettingspage.h6
-rw-r--r--src/settings/general/statusbarsettingspage.h4
-rw-r--r--src/settings/kcm/kcmdolphingeneral.h4
-rw-r--r--src/settings/kcm/kcmdolphinnavigation.h4
-rw-r--r--src/settings/kcm/kcmdolphinservices.h4
-rw-r--r--src/settings/kcm/kcmdolphinviewmodes.h4
-rw-r--r--src/settings/navigation/navigationsettingspage.h4
-rw-r--r--src/settings/serviceitemdelegate.h6
-rw-r--r--src/settings/servicemodel.h8
-rw-r--r--src/settings/services/servicessettingspage.h6
-rw-r--r--src/settings/startup/startupsettingspage.h4
-rw-r--r--src/settings/trash/trashsettingspage.h4
-rw-r--r--src/settings/viewmodes/viewsettingspage.h4
-rw-r--r--src/settings/viewpropsprogressinfo.h2
18 files changed, 39 insertions, 39 deletions
diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index 297adb823..ea9688718 100644
--- a/src/settings/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
@@ -64,7 +64,7 @@ public:
int progress() const;
private slots:
- virtual void slotResult(KJob* job);
+ virtual void slotResult(KJob* job) Q_DECL_OVERRIDE;
void slotEntries(KIO::Job*, const KIO::UDSEntryList&);
private:
diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index 71ee2849a..6e491696c 100644
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -39,10 +39,10 @@ public:
virtual ~BehaviorSettingsPage();
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings();
+ virtual void applySettings() Q_DECL_OVERRIDE;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults();
+ virtual void restoreDefaults() Q_DECL_OVERRIDE;
private:
void loadSettings();
diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h
index 4d0a652d3..e702fe8ae 100644
--- a/src/settings/general/confirmationssettingspage.h
+++ b/src/settings/general/confirmationssettingspage.h
@@ -35,10 +35,10 @@ public:
virtual ~ConfirmationsSettingsPage();
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings();
+ virtual void applySettings() Q_DECL_OVERRIDE;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults();
+ virtual void restoreDefaults() Q_DECL_OVERRIDE;
private:
void loadSettings();
diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h
index 245773aee..7073258ff 100644
--- a/src/settings/general/generalsettingspage.h
+++ b/src/settings/general/generalsettingspage.h
@@ -44,10 +44,10 @@ public:
virtual ~GeneralSettingsPage();
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings();
+ virtual void applySettings() Q_DECL_OVERRIDE;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults();
+ virtual void restoreDefaults() Q_DECL_OVERRIDE;
private:
QList<SettingsPageBase*> m_pages;
diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h
index a43535133..3abf8f926 100644
--- a/src/settings/general/previewssettingspage.h
+++ b/src/settings/general/previewssettingspage.h
@@ -42,13 +42,13 @@ public:
* The settings are persisted automatically when
* closing Dolphin.
*/
- virtual void applySettings();
+ virtual void applySettings() Q_DECL_OVERRIDE;
/** Restores the settings to default values. */
- virtual void restoreDefaults();
+ virtual void restoreDefaults() Q_DECL_OVERRIDE;
protected:
- virtual void showEvent(QShowEvent* event);
+ virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
private slots:
void configureService(const QModelIndex& index);
diff --git a/src/settings/general/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h
index 17bc799bc..608354371 100644
--- a/src/settings/general/statusbarsettingspage.h
+++ b/src/settings/general/statusbarsettingspage.h
@@ -35,10 +35,10 @@ public:
virtual ~StatusBarSettingsPage();
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings();
+ virtual void applySettings() Q_DECL_OVERRIDE;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults();
+ virtual void restoreDefaults() Q_DECL_OVERRIDE;
private:
void loadSettings();
diff --git a/src/settings/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h
index 6b844c9a8..50331a75c 100644
--- a/src/settings/kcm/kcmdolphingeneral.h
+++ b/src/settings/kcm/kcmdolphingeneral.h
@@ -36,8 +36,8 @@ public:
DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args);
virtual ~DolphinGeneralConfigModule();
- virtual void save();
- virtual void defaults();
+ virtual void save() Q_DECL_OVERRIDE;
+ virtual void defaults() Q_DECL_OVERRIDE;
private:
QList<SettingsPageBase*> m_pages;
diff --git a/src/settings/kcm/kcmdolphinnavigation.h b/src/settings/kcm/kcmdolphinnavigation.h
index e7634d661..e8de0753e 100644
--- a/src/settings/kcm/kcmdolphinnavigation.h
+++ b/src/settings/kcm/kcmdolphinnavigation.h
@@ -35,8 +35,8 @@ public:
DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args);
virtual ~DolphinNavigationConfigModule();
- virtual void save();
- virtual void defaults();
+ virtual void save() Q_DECL_OVERRIDE;
+ virtual void defaults() Q_DECL_OVERRIDE;
private:
NavigationSettingsPage* m_navigation;
diff --git a/src/settings/kcm/kcmdolphinservices.h b/src/settings/kcm/kcmdolphinservices.h
index 70ed366fe..8a63bb045 100644
--- a/src/settings/kcm/kcmdolphinservices.h
+++ b/src/settings/kcm/kcmdolphinservices.h
@@ -35,8 +35,8 @@ public:
DolphinServicesConfigModule(QWidget* parent, const QVariantList& args);
virtual ~DolphinServicesConfigModule();
- virtual void save();
- virtual void defaults();
+ virtual void save() Q_DECL_OVERRIDE;
+ virtual void defaults() Q_DECL_OVERRIDE;
private:
ServicesSettingsPage* m_services;
diff --git a/src/settings/kcm/kcmdolphinviewmodes.h b/src/settings/kcm/kcmdolphinviewmodes.h
index 3181198fe..0a0b0ff10 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.h
+++ b/src/settings/kcm/kcmdolphinviewmodes.h
@@ -35,8 +35,8 @@ public:
DolphinViewModesConfigModule(QWidget* parent, const QVariantList& args);
virtual ~DolphinViewModesConfigModule();
- virtual void save();
- virtual void defaults();
+ virtual void save() Q_DECL_OVERRIDE;
+ virtual void defaults() Q_DECL_OVERRIDE;
private:
void reparseConfiguration();
diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h
index 7d5b981d4..ff1ed31ef 100644
--- a/src/settings/navigation/navigationsettingspage.h
+++ b/src/settings/navigation/navigationsettingspage.h
@@ -36,10 +36,10 @@ public:
virtual ~NavigationSettingsPage();
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings();
+ virtual void applySettings() Q_DECL_OVERRIDE;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults();
+ virtual void restoreDefaults() Q_DECL_OVERRIDE;
private:
void loadSettings();
diff --git a/src/settings/serviceitemdelegate.h b/src/settings/serviceitemdelegate.h
index 958d0dc57..9f0ced40c 100644
--- a/src/settings/serviceitemdelegate.h
+++ b/src/settings/serviceitemdelegate.h
@@ -37,16 +37,16 @@ public:
virtual ~ServiceItemDelegate();
virtual QSize sizeHint(const QStyleOptionViewItem &option,
- const QModelIndex &index) const;
+ const QModelIndex &index) const Q_DECL_OVERRIDE;
virtual void paint(QPainter* painter, const QStyleOptionViewItem& option,
- const QModelIndex& index) const;
+ const QModelIndex& index) const Q_DECL_OVERRIDE;
virtual QList<QWidget*> createItemWidgets(const QModelIndex&) const Q_DECL_OVERRIDE;
virtual void updateItemWidgets(const QList<QWidget*> widgets,
const QStyleOptionViewItem& option,
- const QPersistentModelIndex& index) const;
+ const QPersistentModelIndex& index) const Q_DECL_OVERRIDE;
signals:
void requestServiceConfiguration(const QModelIndex& index);
diff --git a/src/settings/servicemodel.h b/src/settings/servicemodel.h
index b8c2d5248..f2b91c7e4 100644
--- a/src/settings/servicemodel.h
+++ b/src/settings/servicemodel.h
@@ -47,10 +47,10 @@ public:
explicit ServiceModel(QObject* parent = 0);
virtual ~ServiceModel();
- virtual bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex());
- virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
- virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
- virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
+ virtual bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) Q_DECL_OVERRIDE;
+ virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
+ virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+ virtual int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
private:
struct ServiceItem
diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h
index 5dbb691af..a883aa947 100644
--- a/src/settings/services/servicessettingspage.h
+++ b/src/settings/services/servicessettingspage.h
@@ -39,13 +39,13 @@ public:
virtual ~ServicesSettingsPage();
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings();
+ virtual void applySettings() Q_DECL_OVERRIDE;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults();
+ virtual void restoreDefaults() Q_DECL_OVERRIDE;
protected:
- virtual void showEvent(QShowEvent* event);
+ virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
private slots:
/**
diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h
index d8b15cf5b..aeb5d6333 100644
--- a/src/settings/startup/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
@@ -40,10 +40,10 @@ public:
virtual ~StartupSettingsPage();
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings();
+ virtual void applySettings() Q_DECL_OVERRIDE;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults();
+ virtual void restoreDefaults() Q_DECL_OVERRIDE;
private slots:
void slotSettingsChanged();
diff --git a/src/settings/trash/trashsettingspage.h b/src/settings/trash/trashsettingspage.h
index bf4a71ea4..5c88aeab7 100644
--- a/src/settings/trash/trashsettingspage.h
+++ b/src/settings/trash/trashsettingspage.h
@@ -34,10 +34,10 @@ public:
virtual ~TrashSettingsPage();
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings();
+ virtual void applySettings() Q_DECL_OVERRIDE;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults();
+ virtual void restoreDefaults() Q_DECL_OVERRIDE;
private:
void loadSettings();
diff --git a/src/settings/viewmodes/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h
index 446403182..61671077e 100644
--- a/src/settings/viewmodes/viewsettingspage.h
+++ b/src/settings/viewmodes/viewsettingspage.h
@@ -40,10 +40,10 @@ public:
virtual ~ViewSettingsPage();
/** @see SettingsPageBase::applySettings() */
- virtual void applySettings();
+ virtual void applySettings() Q_DECL_OVERRIDE;
/** @see SettingsPageBase::restoreDefaults() */
- virtual void restoreDefaults();
+ virtual void restoreDefaults() Q_DECL_OVERRIDE;
private:
QList<ViewSettingsTab*> m_tabs;
diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index 7522cf84c..13089b79f 100644
--- a/src/settings/viewpropsprogressinfo.h
+++ b/src/settings/viewpropsprogressinfo.h
@@ -56,7 +56,7 @@ public:
virtual ~ViewPropsProgressInfo();
protected:
- virtual void closeEvent(QCloseEvent* event);
+ virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;
private slots:
void updateProgress();