From c13121edbd9cbcc4be0244363bbc00654eb6aa25 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Tue, 2 Oct 2018 09:34:21 +0200 Subject: [PATCH] Fix PropertyIndex for CKeyboardKey and CJoystickButton --- src/blackmisc/input/joystickbutton.h | 2 +- src/blackmisc/input/keyboardkey.h | 2 +- src/blackmisc/propertyindex.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/blackmisc/input/joystickbutton.h b/src/blackmisc/input/joystickbutton.h index 0030ba338..5d9d877ed 100644 --- a/src/blackmisc/input/joystickbutton.h +++ b/src/blackmisc/input/joystickbutton.h @@ -33,7 +33,7 @@ namespace BlackMisc //! Properties by index enum ColumnIndex { - IndexDeviceName = 0, + IndexDeviceName = CPropertyIndex::GlobalIndexCJoystickButton, IndexButton, IndexButtonAsString, IndeButtonObject, // just for updates diff --git a/src/blackmisc/input/keyboardkey.h b/src/blackmisc/input/keyboardkey.h index 155ec82cc..df90ef89d 100644 --- a/src/blackmisc/input/keyboardkey.h +++ b/src/blackmisc/input/keyboardkey.h @@ -34,7 +34,7 @@ namespace BlackMisc //! Properties by index enum ColumnIndex { - IndexKey = 0, + IndexKey = CPropertyIndex::GlobalIndexCKeyboardKey, IndexKeyAsString, IndexKeyObject, // just for updates }; diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index 423c3691e..3d8609a98 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -144,6 +144,8 @@ namespace BlackMisc GlobalIndexCVPilotModelRule = 9000, GlobalIndexCVoiceRoom = 10000, GlobalIndexCSettingKeyboardHotkey = 11000, + GlobalIndexCKeyboardKey = 11100, + GlobalIndexCJoystickButton = 11200, GlobalIndexIDatastoreInteger = 12000, GlobalIndexIDatastoreString = 12100, GlobalIndexCDbInfo = 12200,