diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-09-11 20:13:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-09-11 20:13:34 +0300 |
| commit | 750195bc4f8cc950830b2921f2432e4e23ba80ab (patch) | |
| tree | 627efc70ac38086059a4189a418fdbdbc0525ac9 | |
| parent | bc19569a8ae96ade6669d12502219800d5bbc1f1 (diff) | |
| download | manaverse-750195bc4f8cc950830b2921f2432e4e23ba80ab.tar.gz manaverse-750195bc4f8cc950830b2921f2432e4e23ba80ab.tar.bz2 manaverse-750195bc4f8cc950830b2921f2432e4e23ba80ab.tar.xz manaverse-750195bc4f8cc950830b2921f2432e4e23ba80ab.zip | |
Remove support for legacy configuration in ShortcutBase.s20160911
| -rw-r--r-- | src/gui/shortcut/shortcutbase.cpp | 8 | ||||
| -rw-r--r-- | src/gui/shortcut/shortcutbase.h | 2 |
2 files changed, 3 insertions, 7 deletions
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. |