diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-09-11 20:08:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-09-11 20:08:01 +0300 |
| commit | bc19569a8ae96ade6669d12502219800d5bbc1f1 (patch) | |
| tree | 330cce29126a3501671597bc65ad980a465a3de7 /src | |
| parent | 4808eeb101fda08e9cea5d0eff1e2387db9f1270 (diff) | |
| download | manaplus-bc19569a8ae96ade6669d12502219800d5bbc1f1.tar.gz manaplus-bc19569a8ae96ade6669d12502219800d5bbc1f1.tar.bz2 manaplus-bc19569a8ae96ade6669d12502219800d5bbc1f1.tar.xz manaplus-bc19569a8ae96ade6669d12502219800d5bbc1f1.zip | |
Remove support for legacy configuration in ItemShortcut.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/shortcut/itemshortcut.cpp | 8 | ||||
| -rw-r--r-- | src/gui/shortcut/itemshortcut.h | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/shortcut/itemshortcut.cpp b/src/gui/shortcut/itemshortcut.cpp index 2fb10a3d4..1b27a08a9 100644 --- a/src/gui/shortcut/itemshortcut.cpp +++ b/src/gui/shortcut/itemshortcut.cpp @@ -57,16 +57,12 @@ ItemShortcut::~ItemShortcut() logger->log1("ItemShortcut::~ItemShortcut"); } -void ItemShortcut::load(const bool oldConfig) +void ItemShortcut::load() { std::string name; std::string color; std::string data; - const Configuration *cfg; - if (oldConfig) - cfg = &config; - else - cfg = &serverConfig; + const Configuration *cfg = &serverConfig; if (mNumber) { diff --git a/src/gui/shortcut/itemshortcut.h b/src/gui/shortcut/itemshortcut.h index 2f1b10569..4d7933b9f 100644 --- a/src/gui/shortcut/itemshortcut.h +++ b/src/gui/shortcut/itemshortcut.h @@ -55,7 +55,7 @@ class ItemShortcut final /** * Load the configuration information. */ - void load(const bool oldConfig = false); + void load(); /** * Save the configuration information. |