include/vcl/keycod.hxx | 50 ++++++++++++++++++-------------------------
vcl/source/app/svapp.cxx | 2 -
vcl/source/window/keycod.cxx | 8 +++---
3 files changed, 26 insertions(+), 34 deletions(-)
New commits:
commit 41538e2ab79dd0ff04c1ac389962ce9df147463c
Author: Noel Grandin <n...@peralex.com>
Date: Fri Oct 31 07:59:33 2014 +0200
drop KeyCode::IsDefinedKeyCodeEqual
because it's implementation is the same as operator==
Change-Id: If9b63abcd13f899735d59d85be3da54406a6e324
diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 0309f12..3c96d45 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -34,36 +34,35 @@ namespace vcl
class VCL_DLLPUBLIC KeyCode
{
private:
- sal_uInt16 nCode;
- KeyFuncType eFunc;
+ sal_uInt16 nKeyCodeAndModifiers;
+ KeyFuncType eFunc;
public:
- KeyCode() { nCode = 0; eFunc = KeyFuncType::DONTKNOW; }
+ KeyCode() { nKeyCodeAndModifiers = 0; eFunc =
KeyFuncType::DONTKNOW; }
KeyCode( const ResId& rResId );
KeyCode( sal_uInt16 nKey, sal_uInt16 nModifier = 0 )
- { nCode = nKey | nModifier; eFunc = KeyFuncType::DONTKNOW;
}
+ { nKeyCodeAndModifiers = nKey | nModifier; eFunc =
KeyFuncType::DONTKNOW; }
KeyCode( sal_uInt16 nKey, bool bShift, bool bMod1, bool bMod2,
bool bMod3 );
KeyCode( KeyFuncType eFunction );
- sal_uInt16 GetFullCode() const { return nCode; }
- KeyFuncType GetFullFunction() const { return eFunc; }
- bool IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const;
+ sal_uInt16 GetFullCode() const { return nKeyCodeAndModifiers; }
+ KeyFuncType GetFullFunction() const { return eFunc; }
sal_uInt16 GetCode() const
- { return (nCode & KEY_CODE); }
+ { return (nKeyCodeAndModifiers & KEY_CODE); }
sal_uInt16 GetModifier() const
- { return (nCode & KEY_MODTYPE); }
+ { return (nKeyCodeAndModifiers & KEY_MODTYPE); }
bool IsShift() const
- { return ((nCode & KEY_SHIFT) != 0); }
+ { return ((nKeyCodeAndModifiers & KEY_SHIFT) != 0); }
bool IsMod1() const
- { return ((nCode & KEY_MOD1) != 0); }
+ { return ((nKeyCodeAndModifiers & KEY_MOD1) != 0); }
bool IsMod2() const
- { return ((nCode & KEY_MOD2) != 0); }
+ { return ((nKeyCodeAndModifiers & KEY_MOD2) != 0); }
bool IsMod3() const
- { return ((nCode & KEY_MOD3) != 0); }
+ { return ((nKeyCodeAndModifiers & KEY_MOD3) != 0); }
sal_uInt16 GetGroup() const
- { return (nCode & KEYGROUP_TYPE); }
+ { return (nKeyCodeAndModifiers & KEYGROUP_TYPE); }
OUString GetName( vcl::Window* pWindow = NULL ) const;
@@ -81,22 +80,22 @@ public:
inline vcl::KeyCode::KeyCode( sal_uInt16 nKey, bool bShift, bool bMod1, bool
bMod2, bool bMod3 )
{
- nCode = nKey;
+ nKeyCodeAndModifiers = nKey;
if( bShift )
- nCode |= KEY_SHIFT;
+ nKeyCodeAndModifiers |= KEY_SHIFT;
if( bMod1 )
- nCode |= KEY_MOD1;
+ nKeyCodeAndModifiers |= KEY_MOD1;
if( bMod2 )
- nCode |= KEY_MOD2;
+ nKeyCodeAndModifiers |= KEY_MOD2;
if( bMod3 )
- nCode |= KEY_MOD3;
+ nKeyCodeAndModifiers |= KEY_MOD3;
eFunc = KeyFuncType::DONTKNOW;
}
inline bool vcl::KeyCode::operator ==( const vcl::KeyCode& rKeyCode ) const
{
if ( (eFunc == KeyFuncType::DONTKNOW) && (rKeyCode.eFunc ==
KeyFuncType::DONTKNOW) )
- return (nCode == rKeyCode.nCode);
+ return (nKeyCodeAndModifiers == rKeyCode.nKeyCodeAndModifiers);
else
return (GetFunction() == rKeyCode.GetFunction());
}
@@ -104,21 +103,14 @@ inline bool vcl::KeyCode::operator ==( const
vcl::KeyCode& rKeyCode ) const
inline bool vcl::KeyCode::operator !=( const vcl::KeyCode& rKeyCode ) const
{
if ( (eFunc == KeyFuncType::DONTKNOW) && (rKeyCode.eFunc ==
KeyFuncType::DONTKNOW) )
- return (nCode != rKeyCode.nCode);
+ return (nKeyCodeAndModifiers != rKeyCode.nKeyCodeAndModifiers);
else
return (GetFunction() != rKeyCode.GetFunction());
}
-inline bool vcl::KeyCode::IsDefinedKeyCodeEqual( const vcl::KeyCode& rKeyCode
) const
-{
- if ( (eFunc == KeyFuncType::DONTKNOW) && (rKeyCode.eFunc ==
KeyFuncType::DONTKNOW) )
- return (GetFullCode() == rKeyCode.GetFullCode());
- return (GetFunction() == rKeyCode.GetFunction());
-}
-
inline vcl::KeyCode& vcl::KeyCode::operator = ( const vcl::KeyCode& rKeyCode )
{
- nCode = rKeyCode.nCode;
+ nKeyCodeAndModifiers = rKeyCode.nKeyCodeAndModifiers;
eFunc = rKeyCode.eFunc;
return *this;
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 0355ec0..743a0ee 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1453,7 +1453,7 @@ bool ImplCallHotKey( const vcl::KeyCode& rKeyCode )
ImplHotKey* pHotKeyData = pSVData->maAppData.mpFirstHotKey;
while ( pHotKeyData )
{
- if ( pHotKeyData->maKeyCode.IsDefinedKeyCodeEqual( rKeyCode ) )
+ if ( pHotKeyData->maKeyCode == rKeyCode )
{
pHotKeyData->maLink.Call( pHotKeyData->mpUserData );
return true;
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index 0c13f81..be3e282 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -71,12 +71,12 @@ bool ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1,
sal_uInt16& rCode2,
vcl::KeyCode::KeyCode( KeyFuncType eFunction )
{
sal_uInt16 nDummy;
- ImplGetKeyCode( eFunction, nCode, nDummy, nDummy, nDummy );
+ ImplGetKeyCode( eFunction, nKeyCodeAndModifiers, nDummy, nDummy, nDummy );
eFunc = eFunction;
}
vcl::KeyCode::KeyCode( const ResId& rResId )
- : nCode(0)
+ : nKeyCodeAndModifiers(0)
, eFunc(KeyFuncType::DONTKNOW)
{
rResId.SetRT( RSC_KEYCODE );
@@ -94,10 +94,10 @@ vcl::KeyCode::KeyCode( const ResId& rResId )
if ( eFunc != KeyFuncType::DONTKNOW )
{
sal_uInt16 nDummy;
- ImplGetKeyCode( eFunc, nCode, nDummy, nDummy, nDummy );
+ ImplGetKeyCode( eFunc, nKeyCodeAndModifiers, nDummy, nDummy,
nDummy );
}
else
- nCode = sal::static_int_cast<sal_uInt16>(nKeyCode | nModifier);
+ nKeyCodeAndModifiers = sal::static_int_cast<sal_uInt16>(nKeyCode |
nModifier);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
