diff options
| author | renniej <renniej@svn> | 2010-07-21 09:36:58 +0000 |
|---|---|---|
| committer | renniej <renniej@svn> | 2010-07-21 09:36:58 +0000 |
| commit | bb937c11060387bdcfc8c17addc419ec6d3113fc (patch) | |
| tree | 529b3ee8b81e9950e8e9ad5d7bbb072c021fd49f /guilib | |
| parent | c813898023866674a936bf5715eb5f3151900550 (diff) | |
See http://trac.xbmc.org/ticket/9665#comment:7
CKeyboardStat::GetKey now returns a const CKey and CKey::SetKeystroke has been removed.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@32028 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
| -rw-r--r-- | guilib/Key.cpp | 10 | ||||
| -rw-r--r-- | guilib/Key.h | 11 |
2 files changed, 5 insertions, 16 deletions
diff --git a/guilib/Key.cpp b/guilib/Key.cpp index 9add9f6513..e66dde0b0f 100644 --- a/guilib/Key.cpp +++ b/guilib/Key.cpp @@ -170,16 +170,6 @@ void CKey::SetFromHttpApi(bool bFromHttpApi) m_fromHttpApi = bFromHttpApi; } -void CKey::SetKeystroke(uint32_t buttonCode, uint8_t vkey, wchar_t unicode, char ascii, uint32_t modifiers, unsigned int held) -{ - m_buttonCode = buttonCode; - m_VKey = vkey; - m_wUnicode = unicode; - m_cAscii = ascii; - m_Modifiers = modifiers; - m_held = held; -} - CAction::CAction(int actionID, float amount1 /* = 1.0f */, float amount2 /* = 0.0f */, const CStdString &name /* = "" */) { m_id = actionID; diff --git a/guilib/Key.h b/guilib/Key.h index 8f82adc19e..3916f5629c 100644 --- a/guilib/Key.h +++ b/guilib/Key.h @@ -521,17 +521,16 @@ public: bool GetFromHttpApi() const; void Reset(); - void SetKeystroke(uint32_t buttonCode, uint8_t vkey = 0, wchar_t unicode = 0, char ascii = 0, uint32_t modifiers = 0, unsigned int held = 0); inline uint32_t GetButtonCode() const { return m_buttonCode;}; inline uint8_t GetVKey() const { return m_VKey;}; inline wchar_t GetUnicode() const { return m_wUnicode;}; inline char GetAscii() const { return m_cAscii;}; - inline bool GetCtrl() const { return m_Modifiers & MODIFIER_CTRL ? 1 : 0; }; - inline bool GetShift() const { return m_Modifiers & MODIFIER_SHIFT ? 1 : 0; }; - inline bool GetAlt() const { return m_Modifiers & MODIFIER_ALT ? 1 : 0; }; - inline bool GetRAlt() const { return m_Modifiers & MODIFIER_RALT ? 1 : 0; }; - inline bool GetSuper() const { return m_Modifiers & MODIFIER_SUPER ? 1 : 0; }; + inline bool GetCtrl() const { return (m_Modifiers & MODIFIER_CTRL) == MODIFIER_CTRL ? true : false; }; + inline bool GetShift() const { return (m_Modifiers & MODIFIER_SHIFT) == MODIFIER_SHIFT ? true : false; }; + inline bool GetAlt() const { return (m_Modifiers & MODIFIER_ALT) == MODIFIER_ALT ? true : false; }; + inline bool GetRAlt() const { return (m_Modifiers & MODIFIER_RALT) == MODIFIER_RALT ? true : false; }; + inline bool GetSuper() const { return (m_Modifiers & MODIFIER_SUPER) == MODIFIER_SUPER ? true : false; }; inline unsigned int GetHeld() const { return m_held; }; enum Modifier { |