From 102936ef2b2e2c0c7c782f461b48f12dfc9464eb Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Wed, 4 Nov 2020 03:44:27 +0000 Subject: Move KeyCharacterMap to enum class Bug: 160010896 Test: compiles Change-Id: Ia8c0d976665acf817f083726dcac10db0cd91048 --- libs/input/Keyboard.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/input/Keyboard.cpp') diff --git a/libs/input/Keyboard.cpp b/libs/input/Keyboard.cpp index 38a68b3884..14dc9e59fb 100644 --- a/libs/input/Keyboard.cpp +++ b/libs/input/Keyboard.cpp @@ -128,7 +128,7 @@ status_t KeyMap::loadKeyCharacterMap(const InputDeviceIdentifier& deviceIdentifi } base::Result> ret = - KeyCharacterMap::load(path, KeyCharacterMap::FORMAT_BASE); + KeyCharacterMap::load(path, KeyCharacterMap::Format::BASE); if (!ret) { return ret.error().code(); } @@ -159,9 +159,9 @@ bool isKeyboardSpecialFunction(const PropertyMap* config) { bool isEligibleBuiltInKeyboard(const InputDeviceIdentifier& deviceIdentifier, const PropertyMap* deviceConfiguration, const KeyMap* keyMap) { // TODO: remove the third OR statement (SPECIAL_FUNCTION) in Q - if (!keyMap->haveKeyCharacterMap() || isKeyboardSpecialFunction(deviceConfiguration) - || keyMap->keyCharacterMap->getKeyboardType() - == KeyCharacterMap::KEYBOARD_TYPE_SPECIAL_FUNCTION) { + if (!keyMap->haveKeyCharacterMap() || isKeyboardSpecialFunction(deviceConfiguration) || + keyMap->keyCharacterMap->getKeyboardType() == + KeyCharacterMap::KeyboardType::SPECIAL_FUNCTION) { return false; } -- cgit v1.2.3-59-g8ed1b