diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:22:32 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:33:30 +0300 |
commit | 30ae83c268125383866d47a7ee3e4a5dfcf59f71 (patch) | |
tree | ab52f8ecd7ed9517d70e13b22843b7948f20c9e9 /include/vcl/event.hxx | |
parent | 02f6c270e79879188b2be670c6db4feb56bb064e (diff) |
fdo#82577: Handle KeyCode
Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11
KeyCode typedef.
Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028
Diffstat (limited to 'include/vcl/event.hxx')
-rw-r--r-- | include/vcl/event.hxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index e43c1b1aa138..9f7ab05f8ecf 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -42,23 +42,20 @@ enum TextDirectionality { TextDirectionality_TopToBottom_RightToLeft }; - -// - KeyEvent - - class VCL_DLLPUBLIC KeyEvent { private: - KeyCode maKeyCode; - sal_uInt16 mnRepeat; + vcl::KeyCode maKeyCode; + sal_uInt16 mnRepeat; sal_Unicode mnCharCode; public: KeyEvent(); - KeyEvent( sal_Unicode nChar, const KeyCode& rKeyCode, + KeyEvent( sal_Unicode nChar, const vcl::KeyCode& rKeyCode, sal_uInt16 nRepeat = 0 ); - sal_Unicode GetCharCode() const { return mnCharCode; } - const KeyCode& GetKeyCode() const { return maKeyCode; } + sal_Unicode GetCharCode() const { return mnCharCode; } + const vcl::KeyCode& GetKeyCode() const { return maKeyCode; } sal_uInt16 GetRepeat() const { return mnRepeat; } KeyEvent LogicalTextDirectionality (TextDirectionality eMode) const; @@ -72,7 +69,7 @@ inline KeyEvent::KeyEvent() mnRepeat = 0; } -inline KeyEvent::KeyEvent( sal_Unicode nChar, const KeyCode& rKeyCode, +inline KeyEvent::KeyEvent( sal_Unicode nChar, const vcl::KeyCode& rKeyCode, sal_uInt16 nRepeat ) : maKeyCode( rKeyCode ) |