diff options
Diffstat (limited to 'src/settings/viewmodes')
| -rw-r--r-- | src/settings/viewmodes/dolphinfontrequester.cpp | 4 | ||||
| -rw-r--r-- | src/settings/viewmodes/dolphinfontrequester.h | 4 | ||||
| -rw-r--r-- | src/settings/viewmodes/viewmodesettings.h | 2 | ||||
| -rw-r--r-- | src/settings/viewmodes/viewsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/settings/viewmodes/viewsettingspage.h | 8 | ||||
| -rw-r--r-- | src/settings/viewmodes/viewsettingstab.cpp | 14 | ||||
| -rw-r--r-- | src/settings/viewmodes/viewsettingstab.h | 4 |
7 files changed, 19 insertions, 19 deletions
diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp index b9c5d97cf..c185fc55d 100644 --- a/src/settings/viewmodes/dolphinfontrequester.cpp +++ b/src/settings/viewmodes/dolphinfontrequester.cpp @@ -29,8 +29,8 @@ DolphinFontRequester::DolphinFontRequester(QWidget* parent) : QWidget(parent), - m_modeCombo(0), - m_chooseFontButton(0), + m_modeCombo(nullptr), + m_chooseFontButton(nullptr), m_mode(SystemFont), m_customFont() { diff --git a/src/settings/viewmodes/dolphinfontrequester.h b/src/settings/viewmodes/dolphinfontrequester.h index 6ef6e3e72..6f1b8400e 100644 --- a/src/settings/viewmodes/dolphinfontrequester.h +++ b/src/settings/viewmodes/dolphinfontrequester.h @@ -40,8 +40,8 @@ public: CustomFont = 1 }; - DolphinFontRequester(QWidget* parent); - virtual ~DolphinFontRequester(); + explicit DolphinFontRequester(QWidget* parent); + ~DolphinFontRequester() override; void setMode(Mode mode); Mode mode() const; diff --git a/src/settings/viewmodes/viewmodesettings.h b/src/settings/viewmodes/viewmodesettings.h index 9f0b44e9b..8bc9b562e 100644 --- a/src/settings/viewmodes/viewmodesettings.h +++ b/src/settings/viewmodes/viewmodesettings.h @@ -36,7 +36,7 @@ public: DetailsMode }; - ViewModeSettings(ViewMode mode); + explicit ViewModeSettings(ViewMode mode); virtual ~ViewModeSettings(); void setIconSize(int size) const; diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp index 3ed57715a..ab87201e2 100644 --- a/src/settings/viewmodes/viewsettingspage.cpp +++ b/src/settings/viewmodes/viewsettingspage.cpp @@ -56,7 +56,7 @@ ViewSettingsPage::ViewSettingsPage(QWidget* parent) : m_tabs.append(compactTab); m_tabs.append(detailsTab); - topLayout->addWidget(tabWidget, 0, 0); + topLayout->addWidget(tabWidget, 0, nullptr); } ViewSettingsPage::~ViewSettingsPage() diff --git a/src/settings/viewmodes/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h index 61671077e..2e456a867 100644 --- a/src/settings/viewmodes/viewsettingspage.h +++ b/src/settings/viewmodes/viewsettingspage.h @@ -36,14 +36,14 @@ class ViewSettingsPage : public SettingsPageBase Q_OBJECT public: - ViewSettingsPage(QWidget* parent); - virtual ~ViewSettingsPage(); + explicit ViewSettingsPage(QWidget* parent); + ~ViewSettingsPage() 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<ViewSettingsTab*> m_tabs; diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index ae751f9aa..98f818c96 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -40,12 +40,12 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : QWidget(parent), m_mode(mode), - m_defaultSizeSlider(0), - m_previewSizeSlider(0), - m_fontRequester(0), - m_widthBox(0), - m_maxLinesBox(0), - m_expandableFolders(0) + m_defaultSizeSlider(nullptr), + m_previewSizeSlider(nullptr), + m_fontRequester(nullptr), + m_widthBox(nullptr), + m_maxLinesBox(nullptr), + m_expandableFolders(nullptr) { QVBoxLayout* topLayout = new QVBoxLayout(this); @@ -202,7 +202,7 @@ void ViewSettingsTab::applySettings() void ViewSettingsTab::restoreDefaultSettings() { - KConfigSkeleton* settings = 0; + KConfigSkeleton* settings = nullptr; switch (m_mode) { case IconsMode: settings = IconsModeSettings::self(); break; case CompactMode: settings = CompactModeSettings::self(); break; diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h index 6bea95b90..8b1ffc428 100644 --- a/src/settings/viewmodes/viewsettingstab.h +++ b/src/settings/viewmodes/viewsettingstab.h @@ -43,8 +43,8 @@ public: DetailsMode }; - explicit ViewSettingsTab(Mode mode, QWidget* parent = 0); - virtual ~ViewSettingsTab(); + explicit ViewSettingsTab(Mode mode, QWidget* parent = nullptr); + ~ViewSettingsTab() override; void applySettings(); void restoreDefaultSettings(); |
