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 /include/vcl/accel.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 'include/vcl/accel.hxx')
| -rw-r--r-- | include/vcl/accel.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index 362d2c788f3b..2e6e26d3e9d1 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -41,7 +41,7 @@ private: Link maSelectHdl; // Will be set by AcceleratorManager - KeyCode maCurKeyCode; + vcl::KeyCode maCurKeyCode; sal_uInt16 mnCurId; sal_uInt16 mnCurRepeat; bool mbIsCancel; @@ -50,10 +50,10 @@ private: SAL_DLLPRIVATE void ImplInit(); SAL_DLLPRIVATE void ImplCopyData( ImplAccelData& rAccelData ); SAL_DLLPRIVATE void ImplDeleteData(); - SAL_DLLPRIVATE void ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, + SAL_DLLPRIVATE void ImplInsertAccel( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode, bool bEnable, Accelerator* pAutoAccel ); - SAL_DLLPRIVATE ImplAccelEntry* ImplGetAccelData( const KeyCode& rKeyCode ) const; + SAL_DLLPRIVATE ImplAccelEntry* ImplGetAccelData( const vcl::KeyCode& rKeyCode ) const; protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -68,17 +68,17 @@ public: virtual void Deactivate(); virtual void Select(); - void InsertItem( sal_uInt16 nItemId, const KeyCode& rKeyCode ); + void InsertItem( sal_uInt16 nItemId, const vcl::KeyCode& rKeyCode ); void InsertItem( const ResId& rResId ); sal_uInt16 GetCurItemId() const { return mnCurId; } - const KeyCode& GetCurKeyCode() const { return maCurKeyCode; } + const vcl::KeyCode& GetCurKeyCode() const { return maCurKeyCode; } sal_uInt16 GetCurRepeat() const { return mnCurRepeat; } bool IsCancel() const { return mbIsCancel; } sal_uInt16 GetItemCount() const; sal_uInt16 GetItemId( sal_uInt16 nPos ) const; - KeyCode GetKeyCode( sal_uInt16 nItemId ) const; + vcl::KeyCode GetKeyCode( sal_uInt16 nItemId ) const; Accelerator* GetAccel( sal_uInt16 nItemId ) const; |