fdo#82577: Handle KeyCode

Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11
KeyCode typedef.

Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028

5 files changed, 5 insertions, 7 deletions

diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 346478b97c87..955f47919f2c 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -216,7 +216,7 @@ bool BibBookContainer::PreNotify( NotifyEvent& rNEvt )
     if( EVENT_KEYINPUT == rNEvt.GetType()  )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
-        const KeyCode aKeyCode = pKEvt->GetKeyCode();
+        const vcl::KeyCode aKeyCode = pKEvt->GetKeyCode();
         sal_uInt16 nKey = aKeyCode.GetCode();
         const sal_uInt16 nModifier = aKeyCode.GetModifier();
 
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 965700a5f385..54a0ef09c30d 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -430,7 +430,7 @@ bool BibToolBar::PreNotify( NotifyEvent& rNEvt )
     sal_uInt16 nSwitch=rNEvt.GetType();
     if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT)
     {
-        const KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode();
+        const vcl::KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode();
         sal_uInt16 nKey = aKeyCode.GetCode();
         if(nKey == KEY_RETURN)
         {
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 4b0a5e6671a6..14ed54750ff9 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -41,7 +41,6 @@
 
 #define Window      XLIB_Window
 #define Font        XLIB_Font
-#define KeyCode     XLIB_KeyCode
 #define Time        XLIB_Time
 #define Region      XLIB_Region
 #define String      XLIB_String
@@ -103,7 +102,6 @@ extern "C" {
 
 #undef Window
 #undef Font
-#undef KeyCode
 #undef Time
 #undef String
 #undef Region
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index 2b4263058802..ae676b764c06 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -130,7 +130,7 @@ namespace pcr
     {
         if (EVENT_KEYINPUT == rNEvt.GetType())
         {
-            const KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
+            const vcl::KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
             sal_uInt16 nKey = aKeyCode.GetCode();
 
             if (nKey == KEY_RETURN && !aKeyCode.IsShift())
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 4039e6f1384e..21ae5674eb40 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -996,7 +996,7 @@ namespace pcr
         sal_uInt16 nSwitch = _rNEvt.GetType();
         if (EVENT_KEYINPUT == nSwitch)
         {
-            const KeyCode& aKeyCode = _rNEvt.GetKeyEvent()->GetKeyCode();
+            const vcl::KeyCode& aKeyCode = _rNEvt.GetKeyEvent()->GetKeyCode();
             sal_uInt16 nKey = aKeyCode.GetCode();
 
             if  (   (   (KEY_RETURN == nKey)
@@ -1101,7 +1101,7 @@ namespace pcr
 
         if (rNEvt.GetType() == EVENT_KEYINPUT)
         {
-            const KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
+            const vcl::KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
             sal_uInt16 nKey = aKeyCode.GetCode();
 
             if ( nKey == KEY_RETURN && !aKeyCode.IsShift() )