refs #697 BlackCore settings renamed and reorganized.

This commit is contained in:
Mathew Sutcliffe
2016-08-03 02:13:57 +01:00
parent 8275b0d9bf
commit 7a34cc6d9a
43 changed files with 312 additions and 367 deletions

View File

@@ -13,7 +13,7 @@
#define BLACKCORE_INPUTMANAGER_H
#include "blackcore/blackcoreexport.h"
#include "blackcore/settings/application.h"
#include "blackcore/application/applicationsettings.h"
#include "blackinput/joystick.h"
#include "blackinput/keyboard.h"
#include "blackmisc/input/hotkeycombination.h"
@@ -141,7 +141,7 @@ namespace BlackCore
BlackMisc::Input::CHotkeyCombination m_lastCombination;
BlackMisc::Input::CHotkeyCombination m_capturedCombination;
BlackMisc::CSetting<BlackCore::Settings::Application::ActionHotkeys> m_actionHotkeys { this, &CInputManager::ps_changeHotkeySettings };
BlackMisc::CSetting<BlackCore::Application::TActionHotkeys> m_actionHotkeys { this, &CInputManager::ps_changeHotkeySettings };
};
}