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/inc/svdata.hxx | |
| 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/inc/svdata.hxx')
| -rw-r--r-- | vcl/inc/svdata.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index b8df3e711ca8..44b229bf2727 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -29,12 +29,12 @@ #include "tools/fldunit.hxx" #include "tools/color.hxx" #include "tools/debug.hxx" - -#include "vcl/vclevent.hxx" -#include "vcl/bitmapex.hxx" #include "tools/solar.h" -#include "vcl/svapp.hxx" +#include "vcl/bitmapex.hxx" #include "vcl/dllapi.h" +#include "vcl/keycod.hxx" +#include "vcl/svapp.hxx" +#include "vcl/vclevent.hxx" #include "unotools/options.hxx" @@ -62,7 +62,6 @@ class ImplTBDragMgr; class ImplIdleMgr; class FloatingWindow; class AllSettings; -class KeyCode; class NotifyEvent; class Timer; class AutoTimer; @@ -353,7 +352,7 @@ void ImplWindowAutoMnemonic( Window* pWindow ); void ImplUpdateSystemProcessWindow(); Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); -bool ImplCallHotKey( const KeyCode& rKeyCode ); +bool ImplCallHotKey( const vcl::KeyCode& rKeyCode ); void ImplFreeHotKeyData(); void ImplFreeEventHookData(); |