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 /accessibility | |
| 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 'accessibility')
4 files changed, 5 insertions, 5 deletions
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index ba057d5cddcc..e26e41b9558a 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -231,7 +231,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB if ( pWindow ) { KeyEvent aKeyEvent = pWindow->GetActivationKey(); - KeyCode aKeyCode = aKeyEvent.GetKeyCode(); + vcl::KeyCode aKeyCode = aKeyEvent.GetKeyCode(); if ( aKeyCode.GetCode() != 0 ) { awt::KeyStroke aKeyStroke; diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index 2ce86d579b22..f5655989d0ef 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -252,7 +252,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe if ( pWindow ) { KeyEvent aKeyEvent = pWindow->GetActivationKey(); - KeyCode aKeyCode = aKeyEvent.GetKeyCode(); + vcl::KeyCode aKeyCode = aKeyEvent.GetKeyCode(); if ( aKeyCode.GetCode() != 0 ) { awt::KeyStroke aKeyStroke; diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 6daadb440ee5..2d69dc10f859 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -478,7 +478,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe // activation key KeyEvent aKeyEvent = m_pParent->GetActivationKey( m_pParent->GetItemId( m_nItemPos ) ); - KeyCode aKeyCode = aKeyEvent.GetKeyCode(); + vcl::KeyCode aKeyCode = aKeyEvent.GetKeyCode(); Sequence< awt::KeyStroke > aSeq1(1); aSeq1[0].Modifiers = 0; Reference< XAccessible > xParent( getAccessibleParent() ); @@ -513,7 +513,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe pKeyBindingHelper->AddKeyBinding( aSeq2 ); // accelerator key - KeyCode aAccelKeyCode = m_pParent->GetAccelKey( m_pParent->GetItemId( m_nItemPos ) ); + vcl::KeyCode aAccelKeyCode = m_pParent->GetAccelKey( m_pParent->GetItemId( m_nItemPos ) ); if ( aAccelKeyCode.GetCode() != 0 ) { Sequence< awt::KeyStroke > aSeq3(1); diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index 331075bb4e6e..1f629fdb7934 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -208,7 +208,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio if ( pWindow ) { KeyEvent aKeyEvent = pWindow->GetActivationKey(); - KeyCode aKeyCode = aKeyEvent.GetKeyCode(); + vcl::KeyCode aKeyCode = aKeyEvent.GetKeyCode(); if ( aKeyCode.GetCode() != 0 ) { awt::KeyStroke aKeyStroke; |