From bc19569a8ae96ade6669d12502219800d5bbc1f1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 11 Sep 2016 20:08:01 +0300 Subject: Remove support for legacy configuration in ItemShortcut. --- src/gui/shortcut/itemshortcut.cpp | 8 ++------ src/gui/shortcut/itemshortcut.h | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/gui/shortcut') 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. -- cgit v1.2.3-70-g09d2