From 750195bc4f8cc950830b2921f2432e4e23ba80ab Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 11 Sep 2016 20:13:34 +0300
Subject: Remove support for legacy configuration in ShortcutBase.

---
 src/gui/shortcut/shortcutbase.cpp | 8 ++------
 src/gui/shortcut/shortcutbase.h   | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/shortcut/shortcutbase.cpp b/src/gui/shortcut/shortcutbase.cpp
index 1eb62bc8c..e8c5ea65e 100644
--- a/src/gui/shortcut/shortcutbase.cpp
+++ b/src/gui/shortcut/shortcutbase.cpp
@@ -51,13 +51,9 @@ ShortcutBase::~ShortcutBase()
     mItemColors = nullptr;
 }
 
-void ShortcutBase::load(const bool oldConfig)
+void ShortcutBase::load()
 {
-    const Configuration *cfg;
-    if (oldConfig)
-        cfg = &config;
-    else
-        cfg = &serverConfig;
+    const Configuration *cfg = &serverConfig;
 
     for (int i = 0; i < mMaxSize; i++)
     {
diff --git a/src/gui/shortcut/shortcutbase.h b/src/gui/shortcut/shortcutbase.h
index 50e2948e3..8f68d5a69 100644
--- a/src/gui/shortcut/shortcutbase.h
+++ b/src/gui/shortcut/shortcutbase.h
@@ -54,7 +54,7 @@ class ShortcutBase notfinal
         /**
          * Load the configuration information.
          */
-        void load(const bool oldConfig = false);
+        void load();
 
         /**
          * Save the configuration information.
-- 
cgit v1.2.3-70-g09d2