From 81c32c18a5ea52c026ab8566b299601e48efa0b5 Mon Sep 17 00:00:00 2001 From: Felix Ernst Date: Sat, 7 Aug 2021 15:48:02 +0200 Subject: Port ViewModeSettings from macros to std::variant Macros should be avoided if possible. Instead this commit replaces the usage of macros with an std::variant of the ViewModeSettings. As part of this cleanup, code that belongs to the VideModeSettings class is moved there. Some parameters are also renamed to be more in line with typical naming conventions. --- src/views/dolphinview.cpp | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) (limited to 'src/views/dolphinview.cpp') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 01c97a8f7..9a063d857 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -7,9 +7,6 @@ #include "dolphinview.h" -#include "dolphin_compactmodesettings.h" -#include "dolphin_detailsmodesettings.h" -#include "dolphin_iconsmodesettings.h" #include "dolphin_generalsettings.h" #include "dolphinitemlistview.h" #include "dolphinnewfilemenuobserver.h" @@ -21,6 +18,7 @@ #include "kitemviews/kitemlistheader.h" #include "kitemviews/kitemlistselectionmanager.h" #include "kitemviews/private/kitemlistroleeditor.h" +#include "settings/viewmodes/viewmodesettings.h" #include "versioncontrol/versioncontrolobserver.h" #include "viewproperties.h" #include "views/tooltips/tooltipmanager.h" @@ -1532,28 +1530,10 @@ QUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseTh void DolphinView::resetZoomLevel() { - // TODO : Switch to using ViewModeSettings after MR #256 is merged - int defaultIconSize = KIconLoader::SizeSmall; - switch (m_mode) { - case IconsView: - IconsModeSettings::self()->useDefaults(true); - defaultIconSize = IconsModeSettings::iconSize(); - IconsModeSettings::self()->useDefaults(false); - break; - case DetailsView: - DetailsModeSettings::self()->useDefaults(true); - defaultIconSize = DetailsModeSettings::iconSize(); - DetailsModeSettings::self()->useDefaults(false); - break; - case CompactView: - CompactModeSettings::self()->useDefaults(true); - defaultIconSize = CompactModeSettings::iconSize(); - CompactModeSettings::self()->useDefaults(false); - break; - default: - Q_ASSERT(false); - break; - } + ViewModeSettings settings{m_mode}; + settings.useDefaults(true); + const int defaultIconSize = settings.iconSize(); + settings.useDefaults(false); setZoomLevel(ZoomLevelInfo::zoomLevelForIconSize(QSize(defaultIconSize, defaultIconSize))); } -- cgit v1.3