diff options
Diffstat (limited to 'src/settings/general')
| -rw-r--r-- | src/settings/general/behaviorsettingspage.cpp | 41 | ||||
| -rw-r--r-- | src/settings/general/behaviorsettingspage.h | 26 | ||||
| -rw-r--r-- | src/settings/general/configurepreviewplugindialog.cpp | 8 | ||||
| -rw-r--r-- | src/settings/general/configurepreviewplugindialog.h | 4 | ||||
| -rw-r--r-- | src/settings/general/confirmationssettingspage.cpp | 65 | ||||
| -rw-r--r-- | src/settings/general/confirmationssettingspage.h | 14 | ||||
| -rw-r--r-- | src/settings/general/generalsettingspage.cpp | 23 | ||||
| -rw-r--r-- | src/settings/general/generalsettingspage.h | 4 | ||||
| -rw-r--r-- | src/settings/general/previewssettingspage.cpp | 64 | ||||
| -rw-r--r-- | src/settings/general/previewssettingspage.h | 11 | ||||
| -rw-r--r-- | src/settings/general/statusbarsettingspage.cpp | 17 | ||||
| -rw-r--r-- | src/settings/general/statusbarsettingspage.h | 8 |
12 files changed, 131 insertions, 154 deletions
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index 4e78447c7..33f65b599 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -17,43 +17,40 @@ #include <QRadioButton> #include <QSpacerItem> -BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : - SettingsPageBase(parent), - m_url(url), - m_localViewProps(nullptr), - m_globalViewProps(nullptr), - m_showToolTips(nullptr), - m_showSelectionToggle(nullptr), - m_naturalSorting(nullptr), - m_caseSensitiveSorting(nullptr), - m_caseInsensitiveSorting(nullptr), - m_renameInline(nullptr), - m_useTabForSplitViewSwitch(nullptr) +BehaviorSettingsPage::BehaviorSettingsPage(const QUrl &url, QWidget *parent) + : SettingsPageBase(parent) + , m_url(url) + , m_localViewProps(nullptr) + , m_globalViewProps(nullptr) + , m_showToolTips(nullptr) + , m_showSelectionToggle(nullptr) + , m_naturalSorting(nullptr) + , m_caseSensitiveSorting(nullptr) + , m_caseInsensitiveSorting(nullptr) + , m_renameInline(nullptr) + , m_useTabForSplitViewSwitch(nullptr) { - QFormLayout* topLayout = new QFormLayout(this); - + QFormLayout *topLayout = new QFormLayout(this); // View properties m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common display style for all folders")); m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember display style for each folder")); m_localViewProps->setToolTip(i18nc("@info", "Dolphin will create a hidden .directory file in each folder you change view properties for.")); - QButtonGroup* viewGroup = new QButtonGroup(this); + QButtonGroup *viewGroup = new QButtonGroup(this); viewGroup->addButton(m_globalViewProps); viewGroup->addButton(m_localViewProps); topLayout->addRow(i18nc("@title:group", "View: "), m_globalViewProps); topLayout->addRow(QString(), m_localViewProps); - topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); - // Sorting properties m_naturalSorting = new QRadioButton(i18nc("option:radio", "Natural")); m_caseInsensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical, case insensitive")); m_caseSensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical, case sensitive")); - QButtonGroup* sortingModeGroup = new QButtonGroup(this); + QButtonGroup *sortingModeGroup = new QButtonGroup(this); sortingModeGroup->addButton(m_naturalSorting); sortingModeGroup->addButton(m_caseInsensitiveSorting); sortingModeGroup->addButton(m_caseSensitiveSorting); @@ -61,10 +58,8 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : topLayout->addRow(QString(), m_caseInsensitiveSorting); topLayout->addRow(QString(), m_caseSensitiveSorting); - topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); - #if HAVE_BALOO // 'Show tooltips' m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips")); @@ -114,8 +109,8 @@ BehaviorSettingsPage::~BehaviorSettingsPage() void BehaviorSettingsPage::applySettings() { - GeneralSettings* settings = GeneralSettings::self(); - ViewProperties props(m_url); // read current view properties + GeneralSettings *settings = GeneralSettings::self(); + ViewProperties props(m_url); // read current view properties const bool useGlobalViewProps = m_globalViewProps->isChecked(); settings->setGlobalViewProps(useGlobalViewProps); @@ -141,7 +136,7 @@ void BehaviorSettingsPage::applySettings() void BehaviorSettingsPage::restoreDefaults() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h index b054e6d35..ba8ce6384 100644 --- a/src/settings/general/behaviorsettingspage.h +++ b/src/settings/general/behaviorsettingspage.h @@ -23,7 +23,7 @@ class BehaviorSettingsPage : public SettingsPageBase Q_OBJECT public: - BehaviorSettingsPage(const QUrl &url, QWidget* parent); + BehaviorSettingsPage(const QUrl &url, QWidget *parent); ~BehaviorSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -34,26 +34,26 @@ public: private: void loadSettings(); - void setSortingChoiceValue(GeneralSettings* settings); + void setSortingChoiceValue(GeneralSettings *settings); void loadSortingChoiceSettings(); private: QUrl m_url; - QRadioButton* m_localViewProps; - QRadioButton* m_globalViewProps; + QRadioButton *m_localViewProps; + QRadioButton *m_globalViewProps; - QCheckBox* m_showToolTips; - QLabel* m_configureToolTips; - QCheckBox* m_showSelectionToggle; + QCheckBox *m_showToolTips; + QLabel *m_configureToolTips; + QCheckBox *m_showSelectionToggle; - QRadioButton* m_naturalSorting; - QRadioButton* m_caseSensitiveSorting; - QRadioButton* m_caseInsensitiveSorting; + QRadioButton *m_naturalSorting; + QRadioButton *m_caseSensitiveSorting; + QRadioButton *m_caseInsensitiveSorting; - QCheckBox* m_renameInline; - QCheckBox* m_useTabForSplitViewSwitch; - QCheckBox* m_closeActiveSplitView; + QCheckBox *m_renameInline; + QCheckBox *m_useTabForSplitViewSwitch; + QCheckBox *m_closeActiveSplitView; }; #endif diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp index 5aa3f9d39..a391812df 100644 --- a/src/settings/general/configurepreviewplugindialog.cpp +++ b/src/settings/general/configurepreviewplugindialog.cpp @@ -21,17 +21,15 @@ #include <QUrl> #include <QVBoxLayout> -ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& pluginName, - const QString& desktopEntryName, - QWidget* parent) : - QDialog(parent) +ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString &pluginName, const QString &desktopEntryName, QWidget *parent) + : QDialog(parent) { QSharedPointer<ThumbCreator> previewPlugin; const QString pluginPath = QPluginLoader(desktopEntryName).fileName(); if (!pluginPath.isEmpty()) { newCreator create = (newCreator)QLibrary::resolve(pluginPath, "new_creator"); if (create) { - previewPlugin.reset(dynamic_cast<ThumbCreator*>(create())); + previewPlugin.reset(dynamic_cast<ThumbCreator *>(create())); } } diff --git a/src/settings/general/configurepreviewplugindialog.h b/src/settings/general/configurepreviewplugindialog.h index 2da7a3afd..66504cce2 100644 --- a/src/settings/general/configurepreviewplugindialog.h +++ b/src/settings/general/configurepreviewplugindialog.h @@ -28,9 +28,7 @@ public: * widget. * @param parent Parent widget. */ - ConfigurePreviewPluginDialog(const QString& pluginName, - const QString& desktopEntryName, - QWidget* parent); + ConfigurePreviewPluginDialog(const QString &pluginName, const QString &desktopEntryName, QWidget *parent); ~ConfigurePreviewPluginDialog() override = default; }; #endif // KIOWIDGETS_BUILD_DEPRECATED_SINCE diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index af4e2877f..106a42058 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -13,61 +13,55 @@ #include <QCheckBox> #include <QComboBox> -#include <QLabel> #include <QHBoxLayout> +#include <QLabel> #include <QVBoxLayout> -namespace { - enum ScriptExecution - { - AlwaysAsk = 0, - Open = 1, - Execute = 2 - }; +namespace +{ +enum ScriptExecution { AlwaysAsk = 0, Open = 1, Execute = 2 }; - const bool ConfirmEmptyTrash = true; - const bool ConfirmTrash = false; - const bool ConfirmDelete = true; - const int ConfirmScriptExecution = ScriptExecution::AlwaysAsk; +const bool ConfirmEmptyTrash = true; +const bool ConfirmTrash = false; +const bool ConfirmDelete = true; +const int ConfirmScriptExecution = ScriptExecution::AlwaysAsk; } -ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) : - SettingsPageBase(parent), - m_confirmMoveToTrash(nullptr), - m_confirmEmptyTrash(nullptr), - m_confirmDelete(nullptr), +ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget *parent) + : SettingsPageBase(parent) + , m_confirmMoveToTrash(nullptr) + , m_confirmEmptyTrash(nullptr) + , m_confirmDelete(nullptr) + , #if HAVE_TERMINAL - m_confirmClosingTerminalRunningProgram(nullptr), + m_confirmClosingTerminalRunningProgram(nullptr) + , #endif m_confirmClosingMultipleTabs(nullptr) { - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); - QLabel* confirmLabelKde = new QLabel(i18nc("@title:group", "Ask for confirmation in all KDE applications when:"), this); + QLabel *confirmLabelKde = new QLabel(i18nc("@title:group", "Ask for confirmation in all KDE applications when:"), this); confirmLabelKde->setWordWrap(true); - m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for confirmation when", - "Moving files or folders to trash"), this); - m_confirmEmptyTrash = new QCheckBox(i18nc("@option:check Ask for confirmation when", - "Emptying trash"), this); - m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for confirmation when", - "Deleting files or folders"), this); + m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for confirmation when", "Moving files or folders to trash"), this); + m_confirmEmptyTrash = new QCheckBox(i18nc("@option:check Ask for confirmation when", "Emptying trash"), this); + m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for confirmation when", "Deleting files or folders"), this); - QLabel* confirmLabelDolphin = new QLabel(i18nc("@title:group", "Ask for confirmation in Dolphin when:"), this); + QLabel *confirmLabelDolphin = new QLabel(i18nc("@title:group", "Ask for confirmation in Dolphin when:"), this); confirmLabelDolphin->setWordWrap(true); - m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation in Dolphin when", - "Closing windows with multiple tabs"), this); + m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation in Dolphin when", "Closing windows with multiple tabs"), this); #if HAVE_TERMINAL - m_confirmClosingTerminalRunningProgram = new QCheckBox(i18nc("@option:check Ask for confirmation when", - "Closing windows with a program running in the Terminal panel"), this); + m_confirmClosingTerminalRunningProgram = + new QCheckBox(i18nc("@option:check Ask for confirmation when", "Closing windows with a program running in the Terminal panel"), this); #endif - QHBoxLayout* executableScriptLayout = new QHBoxLayout(); - QLabel* executableScriptLabel = new QLabel(i18nc("@title:group", "When opening an executable file:"), this); + QHBoxLayout *executableScriptLayout = new QHBoxLayout(); + QLabel *executableScriptLabel = new QLabel(i18nc("@title:group", "When opening an executable file:"), this); confirmLabelKde->setWordWrap(true); executableScriptLayout->addWidget(executableScriptLabel); @@ -132,7 +126,7 @@ void ConfirmationsSettingsPage::applySettings() } kioConfig->sync(); - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked()); #if HAVE_TERMINAL @@ -144,7 +138,7 @@ void ConfirmationsSettingsPage::applySettings() void ConfirmationsSettingsPage::restoreDefaults() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); @@ -179,4 +173,3 @@ void ConfirmationsSettingsPage::loadSettings() m_confirmClosingTerminalRunningProgram->setChecked(GeneralSettings::confirmClosingTerminalRunningProgram()); #endif } - diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h index 09ba56886..56dd1a78c 100644 --- a/src/settings/general/confirmationssettingspage.h +++ b/src/settings/general/confirmationssettingspage.h @@ -20,7 +20,7 @@ class ConfirmationsSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit ConfirmationsSettingsPage(QWidget* parent); + explicit ConfirmationsSettingsPage(QWidget *parent); ~ConfirmationsSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -33,16 +33,16 @@ private: void loadSettings(); private: - QCheckBox* m_confirmMoveToTrash; - QCheckBox* m_confirmEmptyTrash; - QCheckBox* m_confirmDelete; + QCheckBox *m_confirmMoveToTrash; + QCheckBox *m_confirmEmptyTrash; + QCheckBox *m_confirmDelete; #if HAVE_TERMINAL - QCheckBox* m_confirmClosingTerminalRunningProgram; + QCheckBox *m_confirmClosingTerminalRunningProgram; #endif - QCheckBox* m_confirmClosingMultipleTabs; - QComboBox* m_confirmScriptExecution; + QCheckBox *m_confirmClosingMultipleTabs; + QComboBox *m_confirmScriptExecution; }; #endif diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp index 16650ff9e..c40e45274 100644 --- a/src/settings/general/generalsettingspage.cpp +++ b/src/settings/general/generalsettingspage.cpp @@ -16,32 +16,32 @@ #include <QTabWidget> #include <QVBoxLayout> -GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) : - SettingsPageBase(parent), - m_pages() +GeneralSettingsPage::GeneralSettingsPage(const QUrl &url, QWidget *parent) + : SettingsPageBase(parent) + , m_pages() { - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); topLayout->setContentsMargins(0, 0, 0, 0); - QTabWidget* tabWidget = new QTabWidget(this); + QTabWidget *tabWidget = new QTabWidget(this); // initialize 'Behavior' tab - BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(url, tabWidget); + BehaviorSettingsPage *behaviorPage = new BehaviorSettingsPage(url, tabWidget); tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior")); connect(behaviorPage, &BehaviorSettingsPage::changed, this, &GeneralSettingsPage::changed); // initialize 'Previews' tab - PreviewsSettingsPage* previewsPage = new PreviewsSettingsPage(tabWidget); + PreviewsSettingsPage *previewsPage = new PreviewsSettingsPage(tabWidget); tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews")); connect(previewsPage, &PreviewsSettingsPage::changed, this, &GeneralSettingsPage::changed); // initialize 'Context Menu' tab - ConfirmationsSettingsPage* confirmationsPage = new ConfirmationsSettingsPage(tabWidget); + ConfirmationsSettingsPage *confirmationsPage = new ConfirmationsSettingsPage(tabWidget); tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations")); connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, &GeneralSettingsPage::changed); // initialize 'Status Bar' tab - StatusBarSettingsPage* statusBarPage = new StatusBarSettingsPage(tabWidget); + StatusBarSettingsPage *statusBarPage = new StatusBarSettingsPage(tabWidget); tabWidget->addTab(statusBarPage, i18nc("@title:tab Status Bar settings", "Status Bar")); connect(statusBarPage, &StatusBarSettingsPage::changed, this, &GeneralSettingsPage::changed); @@ -59,15 +59,14 @@ GeneralSettingsPage::~GeneralSettingsPage() void GeneralSettingsPage::applySettings() { - for (SettingsPageBase* page : qAsConst(m_pages)) { + for (SettingsPageBase *page : qAsConst(m_pages)) { page->applySettings(); } } void GeneralSettingsPage::restoreDefaults() { - for (SettingsPageBase* page : qAsConst(m_pages)) { + for (SettingsPageBase *page : qAsConst(m_pages)) { page->restoreDefaults(); } } - diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h index 5e79216d5..bb9099af0 100644 --- a/src/settings/general/generalsettingspage.h +++ b/src/settings/general/generalsettingspage.h @@ -27,7 +27,7 @@ class GeneralSettingsPage : public SettingsPageBase Q_OBJECT public: - GeneralSettingsPage(const QUrl& url, QWidget* parent); + GeneralSettingsPage(const QUrl &url, QWidget *parent); ~GeneralSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -37,7 +37,7 @@ public: void restoreDefaults() override; private: - QList<SettingsPageBase*> m_pages; + QList<SettingsPageBase *> m_pages; }; #endif diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp index b30d1940a..358798f58 100644 --- a/src/settings/general/previewssettingspage.cpp +++ b/src/settings/general/previewssettingspage.cpp @@ -6,8 +6,8 @@ #include "previewssettingspage.h" -#include "dolphin_generalsettings.h" #include "configurepreviewplugindialog.h" +#include "dolphin_generalsettings.h" #include "settings/serviceitemdelegate.h" #include "settings/servicemodel.h" @@ -24,35 +24,35 @@ #include <QSpinBox> // default settings -namespace { - const int DefaultMaxLocalPreviewSize = 0; // 0 MB - const int DefaultMaxRemotePreviewSize = 0; // 0 MB +namespace +{ +const int DefaultMaxLocalPreviewSize = 0; // 0 MB +const int DefaultMaxRemotePreviewSize = 0; // 0 MB } -PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : - SettingsPageBase(parent), - m_initialized(false), - m_listView(nullptr), - m_enabledPreviewPlugins(), - m_localFileSizeBox(nullptr), - m_remoteFileSizeBox(nullptr) +PreviewsSettingsPage::PreviewsSettingsPage(QWidget *parent) + : SettingsPageBase(parent) + , m_initialized(false) + , m_listView(nullptr) + , m_enabledPreviewPlugins() + , m_localFileSizeBox(nullptr) + , m_remoteFileSizeBox(nullptr) { - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); - QLabel* showPreviewsLabel = new QLabel(i18nc("@title:group", "Show previews in the view for:"), this); + QLabel *showPreviewsLabel = new QLabel(i18nc("@title:group", "Show previews in the view for:"), this); m_listView = new QListView(this); QScroller::grabGesture(m_listView->viewport(), QScroller::TouchGesture); #if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) - ServiceItemDelegate* delegate = new ServiceItemDelegate(m_listView, m_listView); - connect(delegate, &ServiceItemDelegate::requestServiceConfiguration, - this, &PreviewsSettingsPage::configureService); + ServiceItemDelegate *delegate = new ServiceItemDelegate(m_listView, m_listView); + connect(delegate, &ServiceItemDelegate::requestServiceConfiguration, this, &PreviewsSettingsPage::configureService); m_listView->setItemDelegate(delegate); #endif - ServiceModel* serviceModel = new ServiceModel(this); - QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(this); + ServiceModel *serviceModel = new ServiceModel(this); + QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this); proxyModel->setSourceModel(serviceModel); proxyModel->setSortRole(Qt::DisplayRole); proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); @@ -61,7 +61,7 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : m_listView->setVerticalScrollMode(QListView::ScrollPerPixel); m_listView->setUniformItemSizes(true); - QLabel* localFileSizeLabel = new QLabel(i18n("Skip previews for local files above:"), this); + QLabel *localFileSizeLabel = new QLabel(i18n("Skip previews for local files above:"), this); m_localFileSizeBox = new QSpinBox(this); m_localFileSizeBox->setSingleStep(1); @@ -69,12 +69,12 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : m_localFileSizeBox->setRange(0, 9999999); /* MB */ m_localFileSizeBox->setSpecialValueText(i18n("No limit")); - QHBoxLayout* localFileSizeBoxLayout = new QHBoxLayout(); + QHBoxLayout *localFileSizeBoxLayout = new QHBoxLayout(); localFileSizeBoxLayout->addWidget(localFileSizeLabel); localFileSizeBoxLayout->addStretch(0); localFileSizeBoxLayout->addWidget(m_localFileSizeBox); - QLabel* remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this); + QLabel *remoteFileSizeLabel = new QLabel(i18nc("@label", "Skip previews for remote files above:"), this); m_remoteFileSizeBox = new QSpinBox(this); m_remoteFileSizeBox->setSingleStep(1); @@ -82,7 +82,7 @@ PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : m_remoteFileSizeBox->setRange(0, 9999999); /* MB */ m_remoteFileSizeBox->setSpecialValueText(i18n("No previews")); - QHBoxLayout* remoteFileSizeBoxLayout = new QHBoxLayout(); + QHBoxLayout *remoteFileSizeBoxLayout = new QHBoxLayout(); remoteFileSizeBoxLayout->addWidget(remoteFileSizeLabel); remoteFileSizeBoxLayout->addStretch(0); remoteFileSizeBoxLayout->addWidget(m_remoteFileSizeBox); @@ -105,7 +105,7 @@ PreviewsSettingsPage::~PreviewsSettingsPage() void PreviewsSettingsPage::applySettings() { - const QAbstractItemModel* model = m_listView->model(); + const QAbstractItemModel *model = m_listView->model(); const int rowCount = model->rowCount(); if (rowCount > 0) { m_enabledPreviewPlugins.clear(); @@ -126,15 +126,11 @@ void PreviewsSettingsPage::applySettings() globalConfig.deleteEntry("MaximumSize", KConfigBase::Normal | KConfigBase::Global); } else { const qulonglong maximumLocalSize = static_cast<qulonglong>(m_localFileSizeBox->value()) * 1024 * 1024; - globalConfig.writeEntry("MaximumSize", - maximumLocalSize, - KConfigBase::Normal | KConfigBase::Global); + globalConfig.writeEntry("MaximumSize", maximumLocalSize, KConfigBase::Normal | KConfigBase::Global); } const qulonglong maximumRemoteSize = static_cast<qulonglong>(m_remoteFileSizeBox->value()) * 1024 * 1024; - globalConfig.writeEntry("MaximumRemoteSize", - maximumRemoteSize, - KConfigBase::Normal | KConfigBase::Global); + globalConfig.writeEntry("MaximumRemoteSize", maximumRemoteSize, KConfigBase::Normal | KConfigBase::Global); globalConfig.sync(); } @@ -145,7 +141,7 @@ void PreviewsSettingsPage::restoreDefaults() m_remoteFileSizeBox->setValue(DefaultMaxRemotePreviewSize); } -void PreviewsSettingsPage::showEvent(QShowEvent* event) +void PreviewsSettingsPage::showEvent(QShowEvent *event) { if (!event->spontaneous() && !m_initialized) { loadPreviewPlugins(); @@ -155,13 +151,13 @@ void PreviewsSettingsPage::showEvent(QShowEvent* event) } #if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) -void PreviewsSettingsPage::configureService(const QModelIndex& index) +void PreviewsSettingsPage::configureService(const QModelIndex &index) { - const QAbstractItemModel* model = index.model(); + const QAbstractItemModel *model = index.model(); const QString pluginName = model->data(index).toString(); const QString desktopEntryName = model->data(index, ServiceModel::DesktopEntryNameRole).toString(); - ConfigurePreviewPluginDialog* dialog = new ConfigurePreviewPluginDialog(pluginName, desktopEntryName, this); + ConfigurePreviewPluginDialog *dialog = new ConfigurePreviewPluginDialog(pluginName, desktopEntryName, this); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->show(); } @@ -169,7 +165,7 @@ void PreviewsSettingsPage::configureService(const QModelIndex& index) void PreviewsSettingsPage::loadPreviewPlugins() { - QAbstractItemModel* model = m_listView->model(); + QAbstractItemModel *model = m_listView->model(); const QVector<KPluginMetaData> plugins = KIO::PreviewJob::availableThumbnailerPlugins(); for (const KPluginMetaData &plugin : plugins) { diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h index 4dee27ada..2c3e4dfef 100644 --- a/src/settings/general/previewssettingspage.h +++ b/src/settings/general/previewssettingspage.h @@ -7,7 +7,6 @@ #ifndef PREVIEWSSETTINGSPAGE_H #define PREVIEWSSETTINGSPAGE_H - #include <kiowidgets_export.h> #include "settings/settingspagebase.h" @@ -24,7 +23,7 @@ class PreviewsSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit PreviewsSettingsPage(QWidget* parent); + explicit PreviewsSettingsPage(QWidget *parent); ~PreviewsSettingsPage() override; /** @@ -38,11 +37,11 @@ public: void restoreDefaults() override; protected: - void showEvent(QShowEvent* event) override; + void showEvent(QShowEvent *event) override; private Q_SLOTS: #if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) - void configureService(const QModelIndex& index); + void configureService(const QModelIndex &index); #endif private: @@ -53,8 +52,8 @@ private: bool m_initialized; QListView *m_listView; QStringList m_enabledPreviewPlugins; - QSpinBox* m_localFileSizeBox; - QSpinBox* m_remoteFileSizeBox; + QSpinBox *m_localFileSizeBox; + QSpinBox *m_remoteFileSizeBox; }; #endif diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp index 9d90a64fd..0d5be04bf 100644 --- a/src/settings/general/statusbarsettingspage.cpp +++ b/src/settings/general/statusbarsettingspage.cpp @@ -13,17 +13,17 @@ #include <QCheckBox> #include <QVBoxLayout> -StatusBarSettingsPage::StatusBarSettingsPage(QWidget* parent) : - SettingsPageBase(parent), - m_showStatusBar(nullptr), - m_showZoomSlider(nullptr), - m_showSpaceInfo(nullptr) +StatusBarSettingsPage::StatusBarSettingsPage(QWidget *parent) + : SettingsPageBase(parent) + , m_showStatusBar(nullptr) + , m_showZoomSlider(nullptr) + , m_showSpaceInfo(nullptr) { m_showStatusBar = new QCheckBox(i18nc("@option:check", "Show status bar"), this); m_showZoomSlider = new QCheckBox(i18nc("@option:check", "Show zoom slider"), this); m_showSpaceInfo = new QCheckBox(i18nc("@option:check", "Show space information"), this); - QVBoxLayout* topLayout = new QVBoxLayout(this); + QVBoxLayout *topLayout = new QVBoxLayout(this); topLayout->addWidget(m_showStatusBar); topLayout->addWidget(m_showZoomSlider); topLayout->addWidget(m_showSpaceInfo); @@ -50,7 +50,7 @@ void StatusBarSettingsPage::onShowStatusBarToggled() void StatusBarSettingsPage::applySettings() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->setShowStatusBar(m_showStatusBar->isChecked()); settings->setShowZoomSlider(m_showZoomSlider->isChecked()); settings->setShowSpaceInfo(m_showSpaceInfo->isChecked()); @@ -59,7 +59,7 @@ void StatusBarSettingsPage::applySettings() void StatusBarSettingsPage::restoreDefaults() { - GeneralSettings* settings = GeneralSettings::self(); + GeneralSettings *settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); @@ -73,4 +73,3 @@ void StatusBarSettingsPage::loadSettings() onShowStatusBarToggled(); } - diff --git a/src/settings/general/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h index af8e06164..adff05dc1 100644 --- a/src/settings/general/statusbarsettingspage.h +++ b/src/settings/general/statusbarsettingspage.h @@ -18,7 +18,7 @@ class StatusBarSettingsPage : public SettingsPageBase Q_OBJECT public: - explicit StatusBarSettingsPage(QWidget* parent); + explicit StatusBarSettingsPage(QWidget *parent); ~StatusBarSettingsPage() override; /** @see SettingsPageBase::applySettings() */ @@ -32,9 +32,9 @@ private: void onShowStatusBarToggled(); private: - QCheckBox* m_showStatusBar; - QCheckBox* m_showZoomSlider; - QCheckBox* m_showSpaceInfo; + QCheckBox *m_showStatusBar; + QCheckBox *m_showZoomSlider; + QCheckBox *m_showSpaceInfo; }; #endif |