Merge branch 'Applications/17.12'

diff --combined src/settings/viewmodes/viewsettingstab.cpp
index bfa3aa16ef539183cc809764ca0aef834d3441bd,ae751f9aaf4652b6e34520538ed1bf3d90b7b18e..98f818c96e583bbd84eab78474b14a1d74a4308d
--- 1/src/settings/viewmodes/viewsettingstab.cpp
--- 2/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));