X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5cbe6b530249ab5f5b1b9f57cf794a2b7faec269..38c34eeca:/src/settings/viewmodes/viewmodesettings.cpp diff --git a/src/settings/viewmodes/viewmodesettings.cpp b/src/settings/viewmodes/viewmodesettings.cpp index 37675df29..0cfc0634d 100644 --- a/src/settings/viewmodes/viewmodesettings.cpp +++ b/src/settings/viewmodes/viewmodesettings.cpp @@ -34,7 +34,8 @@ ViewModeSettings::ViewModeSettings() QFont font; font.setFamily(family); - font.setWeight(group.readEntry("FontWeight", QFont::Normal)); + const int weight = group.readEntry("FontWeight", QFont::Normal); + font.setWeight(static_cast(weight)); font.setItalic(group.readEntry("ItalicFont", false)); removeEntries(group); @@ -50,9 +51,15 @@ ViewModeSettings::ViewModeSettings(DolphinView::Mode mode) : ViewModeSettings() { switch (mode) { - case DolphinView::IconsView: m_viewModeSettingsVariant = IconsModeSettings::self(); return; - case DolphinView::CompactView: m_viewModeSettingsVariant = CompactModeSettings::self(); return; - case DolphinView::DetailsView: m_viewModeSettingsVariant = DetailsModeSettings::self(); return; + case DolphinView::IconsView: + m_viewModeSettingsVariant = IconsModeSettings::self(); + return; + case DolphinView::CompactView: + m_viewModeSettingsVariant = CompactModeSettings::self(); + return; + case DolphinView::DetailsView: + m_viewModeSettingsVariant = DetailsModeSettings::self(); + return; default: Q_UNREACHABLE(); } @@ -62,9 +69,15 @@ ViewModeSettings::ViewModeSettings(ViewSettingsTab::Mode mode) : ViewModeSettings() { switch (mode) { - case ViewSettingsTab::IconsMode: m_viewModeSettingsVariant = IconsModeSettings::self(); return; - case ViewSettingsTab::CompactMode: m_viewModeSettingsVariant = CompactModeSettings::self(); return; - case ViewSettingsTab::DetailsMode: m_viewModeSettingsVariant = DetailsModeSettings::self(); return; + case ViewSettingsTab::IconsMode: + m_viewModeSettingsVariant = IconsModeSettings::self(); + return; + case ViewSettingsTab::CompactMode: + m_viewModeSettingsVariant = CompactModeSettings::self(); + return; + case ViewSettingsTab::DetailsMode: + m_viewModeSettingsVariant = DetailsModeSettings::self(); + return; default: Q_UNREACHABLE(); } @@ -74,9 +87,15 @@ ViewModeSettings::ViewModeSettings(KStandardItemListView::ItemLayout itemLayout) : ViewModeSettings() { switch (itemLayout) { - case KStandardItemListView::IconsLayout: m_viewModeSettingsVariant = IconsModeSettings::self(); return; - case KStandardItemListView::CompactLayout: m_viewModeSettingsVariant = CompactModeSettings::self(); return; - case KStandardItemListView::DetailsLayout: m_viewModeSettingsVariant = DetailsModeSettings::self(); return; + case KStandardItemListView::IconsLayout: + m_viewModeSettingsVariant = IconsModeSettings::self(); + return; + case KStandardItemListView::CompactLayout: + m_viewModeSettingsVariant = CompactModeSettings::self(); + return; + case KStandardItemListView::DetailsLayout: + m_viewModeSettingsVariant = DetailsModeSettings::self(); + return; default: Q_UNREACHABLE(); } @@ -84,77 +103,99 @@ ViewModeSettings::ViewModeSettings(KStandardItemListView::ItemLayout itemLayout) void ViewModeSettings::setIconSize(int iconSize) { - std::visit([iconSize](auto &&v) { - v->setIconSize(iconSize); - }, m_viewModeSettingsVariant); + std::visit( + [iconSize](auto &&v) { + v->setIconSize(iconSize); + }, + m_viewModeSettingsVariant); } int ViewModeSettings::iconSize() const { - return std::visit([](auto &&v) { - return v->iconSize(); - }, m_viewModeSettingsVariant); + return std::visit( + [](auto &&v) { + return v->iconSize(); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::setPreviewSize(int previewSize) { - std::visit([previewSize](auto &&v) { - v->setPreviewSize(previewSize); - }, m_viewModeSettingsVariant); + std::visit( + [previewSize](auto &&v) { + v->setPreviewSize(previewSize); + }, + m_viewModeSettingsVariant); } int ViewModeSettings::previewSize() const { - return std::visit([](auto &&v) { - return v->previewSize(); - }, m_viewModeSettingsVariant); + return std::visit( + [](auto &&v) { + return v->previewSize(); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::setUseSystemFont(bool useSystemFont) { - std::visit([useSystemFont](auto &&v) { - v->setUseSystemFont(useSystemFont); - }, m_viewModeSettingsVariant); + std::visit( + [useSystemFont](auto &&v) { + v->setUseSystemFont(useSystemFont); + }, + m_viewModeSettingsVariant); } bool ViewModeSettings::useSystemFont() const { - return std::visit([](auto &&v) { - return v->useSystemFont(); - }, m_viewModeSettingsVariant); + return std::visit( + [](auto &&v) { + return v->useSystemFont(); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::setViewFont(const QFont &font) { - std::visit([&font](auto &&v) { - v->setViewFont(font); - }, m_viewModeSettingsVariant); + std::visit( + [&font](auto &&v) { + v->setViewFont(font); + }, + m_viewModeSettingsVariant); } QFont ViewModeSettings::viewFont() const { - return std::visit([](auto &&v) { - return v->viewFont(); - }, m_viewModeSettingsVariant); + return std::visit( + [](auto &&v) { + return v->viewFont(); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::useDefaults(bool useDefaults) { - std::visit([useDefaults](auto &&v) { - v->useDefaults(useDefaults); - }, m_viewModeSettingsVariant); + std::visit( + [useDefaults](auto &&v) { + v->useDefaults(useDefaults); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::readConfig() { - std::visit([](auto &&v) { - v->load(); - }, m_viewModeSettingsVariant); + std::visit( + [](auto &&v) { + v->load(); + }, + m_viewModeSettingsVariant); } void ViewModeSettings::save() { - std::visit([](auto &&v) { - return v->save(); - }, m_viewModeSettingsVariant); + std::visit( + [](auto &&v) { + return v->save(); + }, + m_viewModeSettingsVariant); }