summaryrefslogtreecommitdiff
path: root/vcl/inc/accmgr.hxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-08-23 22:22:32 +0300
committerTor Lillqvist <tml@collabora.com>2014-08-23 22:33:30 +0300
commit30ae83c268125383866d47a7ee3e4a5dfcf59f71 (patch)
treeab52f8ecd7ed9517d70e13b22843b7948f20c9e9 /vcl/inc/accmgr.hxx
parent02f6c270e79879188b2be670c6db4feb56bb064e (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/inc/accmgr.hxx')
-rw-r--r--vcl/inc/accmgr.hxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx
index 4645cb27abc2..671c34715ff9 100644
--- a/vcl/inc/accmgr.hxx
+++ b/vcl/inc/accmgr.hxx
@@ -22,8 +22,9 @@
#include <vector>
+#include <vcl/keycod.hxx>
+
class Accelerator;
-class KeyCode;
typedef ::std::vector< Accelerator* > ImplAccelList;
@@ -47,7 +48,7 @@ public:
void EndSequence( bool bCancel = false );
void FlushAccel() { EndSequence( true ); }
- bool IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat );
+ bool IsAccelKey( const vcl::KeyCode& rKeyCode, sal_uInt16 nRepeat );
};
#endif // INCLUDED_VCL_INC_ACCMGR_HXX