From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Tue, 13 Feb 2018 22:20:49 +0000 (+0100)
Subject: Merge branch 'Applications/17.12'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/5f57256a2f293622c7a10844adae29190907b9eb?hp=-c

Merge branch 'Applications/17.12'
---

5f57256a2f293622c7a10844adae29190907b9eb
diff --combined src/settings/viewmodes/viewsettingstab.cpp
index bfa3aa16e,ae751f9aa..98f818c96
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@@ -40,12 -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 +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;
@@@ -232,8 -232,7 +232,7 @@@ void ViewSettingsTab::loadSettings(
          break;
      }
  
-     ViewModeSettings settings(viewMode());
-     settings.readConfig();
+     const ViewModeSettings settings(viewMode());
  
      const QSize iconSize(settings.iconSize(), settings.iconSize());
      m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize));