diff options
-rw-r--r-- | include/input/Input.h | 2 | ||||
-rw-r--r-- | include/input/InputEventLabels.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/input/Input.h b/include/input/Input.h index 55787e7c75..cfcafabebf 100644 --- a/include/input/Input.h +++ b/include/input/Input.h @@ -398,7 +398,7 @@ public: inline int32_t getButtonState() const { return mButtonState; } - inline int32_t setButtonState(int32_t buttonState) { mButtonState = buttonState; } + inline void setButtonState(int32_t buttonState) { mButtonState = buttonState; } inline int32_t getActionButton() const { return mActionButton; } diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h index b7012eb32b..b59728ac39 100644 --- a/include/input/InputEventLabels.h +++ b/include/input/InputEventLabels.h @@ -421,30 +421,30 @@ static const char* lookupLabelByValue(int value, const InputEventLabel* list) { return NULL; } -static int32_t getKeyCodeByLabel(const char* label) { +static inline int32_t getKeyCodeByLabel(const char* label) { return int32_t(lookupValueByLabel(label, KEYCODES)); } -static const char* getLabelByKeyCode(int32_t keyCode) { - if (keyCode >= 0 && keyCode < size(KEYCODES)) { +static inline const char* getLabelByKeyCode(int32_t keyCode) { + if (keyCode >= 0 && keyCode < static_cast<int32_t>(size(KEYCODES))) { return KEYCODES[keyCode].literal; } return NULL; } -static uint32_t getKeyFlagByLabel(const char* label) { +static inline uint32_t getKeyFlagByLabel(const char* label) { return uint32_t(lookupValueByLabel(label, FLAGS)); } -static int32_t getAxisByLabel(const char* label) { +static inline int32_t getAxisByLabel(const char* label) { return int32_t(lookupValueByLabel(label, AXES)); } -static const char* getAxisLabel(int32_t axisId) { +static inline const char* getAxisLabel(int32_t axisId) { return lookupLabelByValue(axisId, AXES); } -static int32_t getLedByLabel(const char* label) { +static inline int32_t getLedByLabel(const char* label) { return int32_t(lookupValueByLabel(label, LEDS)); } |