diff options
Diffstat (limited to 'src/settings')
42 files changed, 135 insertions, 137 deletions
diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp index 4589b5d44..3eacd522f 100644 --- a/src/settings/additionalinfodialog.cpp +++ b/src/settings/additionalinfodialog.cpp @@ -41,7 +41,7 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent, const QList<QByteArray>& visibleRoles) : QDialog(parent), m_visibleRoles(visibleRoles), - m_listWidget(0) + m_listWidget(nullptr) { setWindowTitle(i18nc("@title:window", "Additional Information")); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); diff --git a/src/settings/additionalinfodialog.h b/src/settings/additionalinfodialog.h index fd72a7ce1..2a4cd7dba 100644 --- a/src/settings/additionalinfodialog.h +++ b/src/settings/additionalinfodialog.h @@ -34,11 +34,11 @@ class AdditionalInfoDialog : public QDialog public: AdditionalInfoDialog(QWidget* parent, const QList<QByteArray>& visibleRoles); - virtual ~AdditionalInfoDialog(); + ~AdditionalInfoDialog() override; QList<QByteArray> visibleRoles() const; public slots: - void accept() Q_DECL_OVERRIDE; + void accept() override; private: QList<QByteArray> m_visibleRoles; diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp index 591966759..59f8c8eee 100644 --- a/src/settings/applyviewpropsjob.cpp +++ b/src/settings/applyviewpropsjob.cpp @@ -26,7 +26,7 @@ ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir, const ViewProperties& viewProps) : KIO::Job(), - m_viewProps(0), + m_viewProps(nullptr), m_progress(0), m_dir(dir) { @@ -46,7 +46,7 @@ ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir, ApplyViewPropsJob::~ApplyViewPropsJob() { delete m_viewProps; // the properties are written by the destructor - m_viewProps = 0; + m_viewProps = nullptr; } void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list) diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h index ea9688718..aeb4a60c6 100644 --- a/src/settings/applyviewpropsjob.h +++ b/src/settings/applyviewpropsjob.h @@ -60,11 +60,11 @@ public: * sub directories. */ ApplyViewPropsJob(const QUrl& dir, const ViewProperties& viewProps); - virtual ~ApplyViewPropsJob(); + ~ApplyViewPropsJob() override; int progress() const; private slots: - virtual void slotResult(KJob* job) Q_DECL_OVERRIDE; + void slotResult(KJob* job) override; void slotEntries(KIO::Job*, const KIO::UDSEntryList&); private: diff --git a/src/settings/dolphin_directoryviewpropertysettings.kcfg b/src/settings/dolphin_directoryviewpropertysettings.kcfg index 9584fc8b3..6bcf3cd02 100644 --- a/src/settings/dolphin_directoryviewpropertysettings.kcfg +++ b/src/settings/dolphin_directoryviewpropertysettings.kcfg @@ -30,7 +30,7 @@ <entry name="PreviewsShown" type="Bool" > <label context="@label">Previews shown</label> <whatsthis context="@info:whatsthis">When this option is enabled, a preview of the file content is shown as an icon.</whatsthis> - <default>false</default> + <default>true</default> </entry> <entry name="GroupedSorting" type="Bool" > diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h index 194af28fc..4c8768fde 100644 --- a/src/settings/dolphinsettingsdialog.h +++ b/src/settings/dolphinsettingsdialog.h @@ -36,8 +36,8 @@ class DolphinSettingsDialog : public KPageDialog Q_OBJECT public: - explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = 0); - virtual ~DolphinSettingsDialog(); + explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = nullptr); + ~DolphinSettingsDialog() override; signals: void settingsChanged(); 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.cpp b/src/settings/general/confirmationssettingspage.cpp index 2419dc0f4..90dd0ad37 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -35,9 +35,9 @@ namespace { ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) : SettingsPageBase(parent), - m_confirmMoveToTrash(0), - m_confirmDelete(0), - m_confirmClosingMultipleTabs(0) + m_confirmMoveToTrash(nullptr), + m_confirmDelete(nullptr), + m_confirmClosingMultipleTabs(nullptr) { QVBoxLayout* topLayout = new QVBoxLayout(this); 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.cpp b/src/settings/general/generalsettingspage.cpp index d8f61ef90..f9a2c67d0 100644 --- a/src/settings/general/generalsettingspage.cpp +++ b/src/settings/general/generalsettingspage.cpp @@ -65,7 +65,7 @@ GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) : m_pages.append(confirmationsPage); m_pages.append(statusBarPage); - topLayout->addWidget(tabWidget, 0, 0); + topLayout->addWidget(tabWidget, 0, nullptr); } GeneralSettingsPage::~GeneralSettingsPage() 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.cpp b/src/settings/general/previewssettingspage.cpp index 1a92cd16c..e579a572d 100644 --- a/src/settings/general/previewssettingspage.cpp +++ b/src/settings/general/previewssettingspage.cpp @@ -26,6 +26,7 @@ #include <KLocalizedString> #include <KServiceTypeTrader> #include <KService> +#include <KIO/PreviewJob> #include <settings/serviceitemdelegate.h> #include <settings/servicemodel.h> @@ -51,9 +52,9 @@ namespace { PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : SettingsPageBase(parent), m_initialized(false), - m_listView(0), + m_listView(nullptr), m_enabledPreviewPlugins(), - m_remoteFileSizeBox(0) + m_remoteFileSizeBox(nullptr) { QVBoxLayout* topLayout = new QVBoxLayout(this); @@ -172,11 +173,8 @@ void PreviewsSettingsPage::loadPreviewPlugins() void PreviewsSettingsPage::loadSettings() { - KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings"); - m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList() - << QStringLiteral("directorythumbnail") - << QStringLiteral("imagethumbnail") - << QStringLiteral("jpegthumbnail")); + const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings")); + m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins()); const qulonglong defaultRemotePreview = static_cast<qulonglong>(MaxRemotePreviewSize) * 1024 * 1024; const qulonglong maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", defaultRemotePreview); 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(); diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index f5ac4cd55..3aedf5075 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -65,7 +65,7 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV m_pages.append(previewsPage); m_pages.append(confirmationsPage); - topLayout->addWidget(tabWidget, 0, 0); + topLayout->addWidget(tabWidget, 0, nullptr); } DolphinGeneralConfigModule::~DolphinGeneralConfigModule() diff --git a/src/settings/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h index 50331a75c..66e42009f 100644 --- a/src/settings/kcm/kcmdolphingeneral.h +++ b/src/settings/kcm/kcmdolphingeneral.h @@ -34,10 +34,10 @@ class DolphinGeneralConfigModule : public KCModule public: DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args); - virtual ~DolphinGeneralConfigModule(); + ~DolphinGeneralConfigModule() override; - virtual void save() Q_DECL_OVERRIDE; - virtual void defaults() Q_DECL_OVERRIDE; + void save() override; + void defaults() override; private: QList<SettingsPageBase*> m_pages; diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp index 9ec6ca166..54cf7ed3c 100644 --- a/src/settings/kcm/kcmdolphinnavigation.cpp +++ b/src/settings/kcm/kcmdolphinnavigation.cpp @@ -30,7 +30,7 @@ K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin<DolphinNaviga DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args) : KCModule(parent), - m_navigation(0) + m_navigation(nullptr) { Q_UNUSED(args); @@ -41,7 +41,7 @@ DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, co m_navigation = new NavigationSettingsPage(this); connect(m_navigation, &NavigationSettingsPage::changed, this, static_cast<void(DolphinNavigationConfigModule::*)()>(&DolphinNavigationConfigModule::changed)); - topLayout->addWidget(m_navigation, 0, 0); + topLayout->addWidget(m_navigation, 0, nullptr); } DolphinNavigationConfigModule::~DolphinNavigationConfigModule() diff --git a/src/settings/kcm/kcmdolphinnavigation.h b/src/settings/kcm/kcmdolphinnavigation.h index e8de0753e..2bcc7abab 100644 --- a/src/settings/kcm/kcmdolphinnavigation.h +++ b/src/settings/kcm/kcmdolphinnavigation.h @@ -33,10 +33,10 @@ class DolphinNavigationConfigModule : public KCModule public: DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args); - virtual ~DolphinNavigationConfigModule(); + ~DolphinNavigationConfigModule() override; - virtual void save() Q_DECL_OVERRIDE; - virtual void defaults() Q_DECL_OVERRIDE; + void save() override; + void defaults() override; private: NavigationSettingsPage* m_navigation; diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp index 39136724e..5d011c627 100644 --- a/src/settings/kcm/kcmdolphinservices.cpp +++ b/src/settings/kcm/kcmdolphinservices.cpp @@ -30,7 +30,7 @@ K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServices DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const QVariantList& args) : KCModule(parent), - m_services(0) + m_services(nullptr) { Q_UNUSED(args); @@ -41,7 +41,7 @@ DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const m_services = new ServicesSettingsPage(this); connect(m_services, &ServicesSettingsPage::changed, this, static_cast<void(DolphinServicesConfigModule::*)()>(&DolphinServicesConfigModule::changed)); - topLayout->addWidget(m_services, 0, 0); + topLayout->addWidget(m_services, 0, nullptr); } DolphinServicesConfigModule::~DolphinServicesConfigModule() diff --git a/src/settings/kcm/kcmdolphinservices.h b/src/settings/kcm/kcmdolphinservices.h index 8a63bb045..6c6af6728 100644 --- a/src/settings/kcm/kcmdolphinservices.h +++ b/src/settings/kcm/kcmdolphinservices.h @@ -33,10 +33,10 @@ class DolphinServicesConfigModule : public KCModule public: DolphinServicesConfigModule(QWidget* parent, const QVariantList& args); - virtual ~DolphinServicesConfigModule(); + ~DolphinServicesConfigModule() override; - virtual void save() Q_DECL_OVERRIDE; - virtual void defaults() Q_DECL_OVERRIDE; + void save() override; + void defaults() override; private: ServicesSettingsPage* m_services; diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp index 710ebc70b..af9b49026 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -66,7 +66,7 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons m_tabs.append(compactTab); m_tabs.append(detailsTab); - topLayout->addWidget(tabWidget, 0, 0); + topLayout->addWidget(tabWidget, 0, nullptr); } DolphinViewModesConfigModule::~DolphinViewModesConfigModule() diff --git a/src/settings/kcm/kcmdolphinviewmodes.h b/src/settings/kcm/kcmdolphinviewmodes.h index 0a0b0ff10..c3775adff 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.h +++ b/src/settings/kcm/kcmdolphinviewmodes.h @@ -33,10 +33,10 @@ class DolphinViewModesConfigModule : public KCModule public: DolphinViewModesConfigModule(QWidget* parent, const QVariantList& args); - virtual ~DolphinViewModesConfigModule(); + ~DolphinViewModesConfigModule() override; - virtual void save() Q_DECL_OVERRIDE; - virtual void defaults() Q_DECL_OVERRIDE; + void save() override; + void defaults() override; private: void reparseConfiguration(); diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp index e37a35d8e..82015480a 100644 --- a/src/settings/navigation/navigationsettingspage.cpp +++ b/src/settings/navigation/navigationsettingspage.cpp @@ -28,8 +28,8 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) : SettingsPageBase(parent), - m_openArchivesAsFolder(0), - m_autoExpandFolders(0) + m_openArchivesAsFolder(nullptr), + m_autoExpandFolders(nullptr) { QVBoxLayout* topLayout = new QVBoxLayout(this); QWidget* vBox = new QWidget(this); diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h index 5410a4efa..d58a8e811 100644 --- a/src/settings/navigation/navigationsettingspage.h +++ b/src/settings/navigation/navigationsettingspage.h @@ -32,13 +32,13 @@ class NavigationSettingsPage : public SettingsPageBase public: NavigationSettingsPage(QWidget* parent); - virtual ~NavigationSettingsPage(); + ~NavigationSettingsPage() 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/serviceitemdelegate.h b/src/settings/serviceitemdelegate.h index 9f0ced40c..7b0d216db 100644 --- a/src/settings/serviceitemdelegate.h +++ b/src/settings/serviceitemdelegate.h @@ -33,20 +33,20 @@ class ServiceItemDelegate : public KWidgetItemDelegate Q_OBJECT public: - explicit ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent = 0); - virtual ~ServiceItemDelegate(); + explicit ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent = nullptr); + ~ServiceItemDelegate() override; - virtual QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + QSize sizeHint(const QStyleOptionViewItem &option, + const QModelIndex &index) const override; - virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, - const QModelIndex& index) const Q_DECL_OVERRIDE; + void paint(QPainter* painter, const QStyleOptionViewItem& option, + const QModelIndex& index) const override; - virtual QList<QWidget*> createItemWidgets(const QModelIndex&) const Q_DECL_OVERRIDE; + QList<QWidget*> createItemWidgets(const QModelIndex&) const override; - virtual void updateItemWidgets(const QList<QWidget*> widgets, + void updateItemWidgets(const QList<QWidget*> widgets, const QStyleOptionViewItem& option, - const QPersistentModelIndex& index) const Q_DECL_OVERRIDE; + const QPersistentModelIndex& index) const override; signals: void requestServiceConfiguration(const QModelIndex& index); diff --git a/src/settings/servicemodel.h b/src/settings/servicemodel.h index f2b91c7e4..a08844b82 100644 --- a/src/settings/servicemodel.h +++ b/src/settings/servicemodel.h @@ -44,13 +44,13 @@ public: ConfigurableRole }; - explicit ServiceModel(QObject* parent = 0); - virtual ~ServiceModel(); + explicit ServiceModel(QObject* parent = nullptr); + ~ServiceModel() override; - 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; + bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) override; + bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; private: struct ServiceItem diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp index 2b9b8f46f..a0d9effc8 100644 --- a/src/settings/services/servicessettingspage.cpp +++ b/src/settings/services/servicessettingspage.cpp @@ -58,9 +58,9 @@ namespace ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) : SettingsPageBase(parent), m_initialized(false), - m_serviceModel(0), - m_sortModel(0), - m_listView(0), + m_serviceModel(nullptr), + m_sortModel(nullptr), + m_listView(nullptr), m_enabledVcsPlugins() { QVBoxLayout* topLayout = new QVBoxLayout(this); diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h index a883aa947..c1239c9f5 100644 --- a/src/settings/services/servicessettingspage.h +++ b/src/settings/services/servicessettingspage.h @@ -36,16 +36,16 @@ class ServicesSettingsPage : public SettingsPageBase public: ServicesSettingsPage(QWidget* parent); - virtual ~ServicesSettingsPage(); + ~ServicesSettingsPage() 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; protected: - virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent* event) override; private slots: /** diff --git a/src/settings/settingspagebase.h b/src/settings/settingspagebase.h index 05973d452..2bc1dfaaa 100644 --- a/src/settings/settingspagebase.h +++ b/src/settings/settingspagebase.h @@ -31,8 +31,8 @@ class SettingsPageBase : public QWidget Q_OBJECT public: - explicit SettingsPageBase(QWidget* parent = 0); - virtual ~SettingsPageBase(); + explicit SettingsPageBase(QWidget* parent = nullptr); + ~SettingsPageBase() override; /** * Must be implemented by a derived class to diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h index 7a69cd3d6..da278e371 100644 --- a/src/settings/startup/startupsettingspage.h +++ b/src/settings/startup/startupsettingspage.h @@ -37,13 +37,13 @@ class StartupSettingsPage : public SettingsPageBase public: StartupSettingsPage(const QUrl& url, QWidget* parent); - virtual ~StartupSettingsPage(); + ~StartupSettingsPage() 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 slots: void slotSettingsChanged(); diff --git a/src/settings/trash/trashsettingspage.h b/src/settings/trash/trashsettingspage.h index 5c88aeab7..57631b760 100644 --- a/src/settings/trash/trashsettingspage.h +++ b/src/settings/trash/trashsettingspage.h @@ -31,13 +31,13 @@ class TrashSettingsPage : public SettingsPageBase public: TrashSettingsPage(QWidget* parent); - virtual ~TrashSettingsPage(); + ~TrashSettingsPage() 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/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..3f355e314 100644 --- a/src/settings/viewmodes/dolphinfontrequester.h +++ b/src/settings/viewmodes/dolphinfontrequester.h @@ -41,7 +41,7 @@ public: }; DolphinFontRequester(QWidget* parent); - virtual ~DolphinFontRequester(); + ~DolphinFontRequester() override; void setMode(Mode mode); Mode mode() 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..4f57e5c19 100644 --- a/src/settings/viewmodes/viewsettingspage.h +++ b/src/settings/viewmodes/viewsettingspage.h @@ -37,13 +37,13 @@ class ViewSettingsPage : public SettingsPageBase public: ViewSettingsPage(QWidget* parent); - virtual ~ViewSettingsPage(); + ~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 a673769ad..bfa3aa16e 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(); diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index c317ed052..980ab0bba 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -52,19 +52,19 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : QDialog(dolphinView), m_isDirty(false), m_dolphinView(dolphinView), - m_viewProps(0), - m_viewMode(0), - m_sortOrder(0), - m_sorting(0), - m_sortFoldersFirst(0), - m_previewsShown(0), - m_showInGroups(0), - m_showHiddenFiles(0), - m_additionalInfo(0), - m_applyToCurrentFolder(0), - m_applyToSubFolders(0), - m_applyToAllFolders(0), - m_useAsDefault(0) + m_viewProps(nullptr), + m_viewMode(nullptr), + m_sortOrder(nullptr), + m_sorting(nullptr), + m_sortFoldersFirst(nullptr), + m_previewsShown(nullptr), + m_showInGroups(nullptr), + m_showHiddenFiles(nullptr), + m_additionalInfo(nullptr), + m_applyToCurrentFolder(nullptr), + m_applyToSubFolders(nullptr), + m_applyToAllFolders(nullptr), + m_useAsDefault(nullptr) { Q_ASSERT(dolphinView); const bool useGlobalViewProps = GeneralSettings::globalViewProps(); @@ -217,7 +217,7 @@ ViewPropertiesDialog::~ViewPropertiesDialog() { m_isDirty = false; delete m_viewProps; - m_viewProps = 0; + m_viewProps = nullptr; KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "ViewPropertiesDialog"); KWindowConfig::saveWindowSize(windowHandle(), dialogConfig); diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h index 5490be85b..35c18718e 100644 --- a/src/settings/viewpropertiesdialog.h +++ b/src/settings/viewpropertiesdialog.h @@ -45,10 +45,10 @@ class DOLPHIN_EXPORT ViewPropertiesDialog : public QDialog public: explicit ViewPropertiesDialog(DolphinView* dolphinView); - virtual ~ViewPropertiesDialog(); + ~ViewPropertiesDialog() override; public slots: - void accept() Q_DECL_OVERRIDE; + void accept() override; private slots: void slotApply(); diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp index 56fee8027..1878c8137 100644 --- a/src/settings/viewpropsprogressinfo.cpp +++ b/src/settings/viewpropsprogressinfo.cpp @@ -39,12 +39,12 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent, const ViewProperties& viewProps) : QDialog(parent), m_dir(dir), - m_viewProps(0), - m_label(0), - m_progressBar(0), - m_dirSizeJob(0), - m_applyViewPropsJob(0), - m_timer(0) + m_viewProps(nullptr), + m_label(nullptr), + m_progressBar(nullptr), + m_dirSizeJob(nullptr), + m_applyViewPropsJob(nullptr), + m_timer(nullptr) { const QSize minSize = minimumSize(); setMinimumSize(QSize(320, minSize.height())); @@ -96,13 +96,13 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent, ViewPropsProgressInfo::~ViewPropsProgressInfo() { delete m_viewProps; - m_viewProps = 0; + m_viewProps = nullptr; } void ViewPropsProgressInfo::closeEvent(QCloseEvent* event) { m_timer->stop(); - m_applyViewPropsJob = 0; + m_applyViewPropsJob = nullptr; QDialog::closeEvent(event); } @@ -110,12 +110,12 @@ void ViewPropsProgressInfo::reject() { if (m_dirSizeJob) { m_dirSizeJob->kill(); - m_dirSizeJob = 0; + m_dirSizeJob = nullptr; } if (m_applyViewPropsJob) { m_applyViewPropsJob->kill(); - m_applyViewPropsJob = 0; + m_applyViewPropsJob = nullptr; } QDialog::reject(); @@ -144,7 +144,7 @@ void ViewPropsProgressInfo::applyViewProperties() m_label->setText(i18nc("@info:progress", "Folders: %1", subdirs)); m_progressBar->setMaximum(subdirs); - m_dirSizeJob = 0; + m_dirSizeJob = nullptr; m_applyViewPropsJob = new ApplyViewPropsJob(m_dir, *m_viewProps); connect(m_applyViewPropsJob, &ApplyViewPropsJob::result, diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h index cd7aa50ce..e69de2976 100644 --- a/src/settings/viewpropsprogressinfo.h +++ b/src/settings/viewpropsprogressinfo.h @@ -53,13 +53,13 @@ public: const QUrl& dir, const ViewProperties& viewProps); - virtual ~ViewPropsProgressInfo(); + ~ViewPropsProgressInfo() override; protected: - virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent* event) override; public slots: - void reject() Q_DECL_OVERRIDE; + void reject() override; private slots: void updateProgress(); |