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/unx | |
| 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/unx')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index dc195371d033..5de927c52c15 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -691,7 +691,7 @@ OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const // return an empty string for keysyms that are not bound to // any key code - XLIB_KeyCode aKeyCode = XKeysymToKeycode( GetDisplay(), nKeySym ); + KeyCode aKeyCode = XKeysymToKeycode( GetDisplay(), nKeySym ); if( aKeyCode != 0 && aKeyCode != NoSymbol ) { if( !nKeySym ) @@ -733,7 +733,7 @@ void SalDisplay::ModifierMapping() // on Sun and SCO servers XLookupString does not account for NumLock if( GetServerVendor() == vendor_sun ) { - XLIB_KeyCode aNumLock = XKeysymToKeycode( pDisp_, XK_Num_Lock ); + KeyCode aNumLock = XKeysymToKeycode( pDisp_, XK_Num_Lock ); if( aNumLock ) for( int i = ShiftMapIndex; i <= Mod5MapIndex; i++ ) { diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index f1ebc2ffc656..dcfae9d95a04 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2513,7 +2513,7 @@ OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) return GetDisplay()->GetKeyName( nKeyCode ); } -bool X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +bool X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , vcl::KeyCode& ) { // not supported yet return false; diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 5f4fa94131fd..004c5a8b09c7 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -2870,7 +2870,7 @@ void GtkSalFrame::EndExtTextInput( sal_uInt16 nFlags ) m_pIMHandler->endExtTextInput( nFlags ); } -bool GtkSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +bool GtkSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , vcl::KeyCode& ) { // not supported yet return false; |