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 /vcl/source/window/keycod.cxx | |
| 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 'vcl/source/window/keycod.cxx')
| -rw-r--r-- | vcl/source/window/keycod.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 78f9b863ca10..8cb9909d6a59 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -59,14 +59,14 @@ void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, rCode4 = aImplKeyFuncTab[nIndex+3]; } -KeyCode::KeyCode( KeyFuncType eFunction ) +vcl::KeyCode::KeyCode( KeyFuncType eFunction ) { sal_uInt16 nDummy; ImplGetKeyCode( eFunction, nCode, nDummy, nDummy, nDummy ); eFunc = eFunction; } -KeyCode::KeyCode( const ResId& rResId ) +vcl::KeyCode::KeyCode( const ResId& rResId ) : nCode(0) , eFunc(KEYFUNC_DONTKNOW) { @@ -92,14 +92,14 @@ KeyCode::KeyCode( const ResId& rResId ) } } -OUString KeyCode::GetName( Window* pWindow ) const +OUString vcl::KeyCode::GetName( Window* pWindow ) const { if ( !pWindow ) pWindow = ImplGetDefaultWindow(); return pWindow ? pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ) : ""; } -KeyFuncType KeyCode::GetFunction() const +KeyFuncType vcl::KeyCode::GetFunction() const { if ( eFunc != KEYFUNC_DONTKNOW ) return eFunc; |