diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-26 13:01:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-27 08:09:35 +0000 |
| commit | 7ef698355ad59c6fa263daa4ded124cf512e8926 (patch) | |
| tree | c929c4d25b985116192045f213b6beacf43989c2 /include | |
| parent | 608396721edcdfce8a325026844fd2fab72bbb73 (diff) | |
fdo#84938: replace KEYTYPE_ constants with enum
Change-Id: I563cf96f8ca815d6c8ad9f5fe365fc7ce7a2a328
Reviewed-on: https://gerrit.libreoffice.org/12104
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/rsc/rsc-vcl-shared-types.hxx | 11 | ||||
| -rw-r--r-- | include/vcl/keycod.hxx | 14 |
2 files changed, 12 insertions, 13 deletions
diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx index 5cda3c5622c3..203fa7318696 100644 --- a/include/rsc/rsc-vcl-shared-types.hxx +++ b/include/rsc/rsc-vcl-shared-types.hxx @@ -25,12 +25,11 @@ enum TimeFieldFormat {TIMEF_NONE, TIMEF_SEC, TIMEF_100TH_SEC, TIMEF_SEC_CS, TimeFieldFormat_FORCE_EQUAL_SIZE=SAL_MAX_ENUM }; -enum KeyFuncType { KEYFUNC_DONTKNOW, KEYFUNC_NEW, KEYFUNC_OPEN, KEYFUNC_SAVE, - KEYFUNC_SAVEAS, KEYFUNC_PRINT, KEYFUNC_CLOSE, KEYFUNC_QUIT, - KEYFUNC_CUT, KEYFUNC_COPY, KEYFUNC_PASTE, KEYFUNC_UNDO, - KEYFUNC_REDO, KEYFUNC_DELETE, KEYFUNC_REPEAT, KEYFUNC_FIND, - KEYFUNC_FINDBACKWARD, KEYFUNC_PROPERTIES, KEYFUNC_FRONT, - KeyFuncType_FORCE_EQUAL_SIZE=SAL_MAX_ENUM }; +enum class KeyFuncType : sal_Int32 { DONTKNOW, NEW, OPEN, SAVE, + SAVEAS, PRINT, CLOSE, QUIT, + CUT, COPY, PASTE, UNDO, + REDO, DELETE, REPEAT, FIND, + FINDBACKWARD, PROPERTIES, FRONT }; enum class MenuItemType { DONTKNOW, STRING, IMAGE, STRINGIMAGE, SEPARATOR }; diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index 1c8a2661d557..cfa60fe8b98a 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -38,10 +38,10 @@ private: KeyFuncType eFunc; public: - KeyCode() { nCode = 0; eFunc = KEYFUNC_DONTKNOW; } + KeyCode() { nCode = 0; eFunc = KeyFuncType::DONTKNOW; } KeyCode( const ResId& rResId ); KeyCode( sal_uInt16 nKey, sal_uInt16 nModifier = 0 ) - { nCode = nKey | nModifier; eFunc = KEYFUNC_DONTKNOW; } + { nCode = nKey | nModifier; eFunc = KeyFuncType::DONTKNOW; } KeyCode( sal_uInt16 nKey, bool bShift, bool bMod1, bool bMod2, bool bMod3 ); KeyCode( KeyFuncType eFunction ); @@ -70,7 +70,7 @@ public: OUString GetName( vcl::Window* pWindow = NULL ) const; bool IsFunction() const - { return (eFunc != KEYFUNC_DONTKNOW); } + { return (eFunc != KeyFuncType::DONTKNOW); } KeyFuncType GetFunction() const; @@ -92,12 +92,12 @@ inline vcl::KeyCode::KeyCode( sal_uInt16 nKey, bool bShift, bool bMod1, bool bMo nCode |= KEY_MOD2; if( bMod3 ) nCode |= KEY_MOD3; - eFunc = KEYFUNC_DONTKNOW; + eFunc = KeyFuncType::DONTKNOW; } inline bool vcl::KeyCode::operator ==( const vcl::KeyCode& rKeyCode ) const { - if ( (eFunc == KEYFUNC_DONTKNOW) && (rKeyCode.eFunc == KEYFUNC_DONTKNOW) ) + if ( (eFunc == KeyFuncType::DONTKNOW) && (rKeyCode.eFunc == KeyFuncType::DONTKNOW) ) return (nCode == rKeyCode.nCode); else return (GetFunction() == rKeyCode.GetFunction()); @@ -105,7 +105,7 @@ inline bool vcl::KeyCode::operator ==( const vcl::KeyCode& rKeyCode ) const inline bool vcl::KeyCode::operator !=( const vcl::KeyCode& rKeyCode ) const { - if ( (eFunc == KEYFUNC_DONTKNOW) && (rKeyCode.eFunc == KEYFUNC_DONTKNOW) ) + if ( (eFunc == KeyFuncType::DONTKNOW) && (rKeyCode.eFunc == KeyFuncType::DONTKNOW) ) return (nCode != rKeyCode.nCode); else return (GetFunction() != rKeyCode.GetFunction()); @@ -113,7 +113,7 @@ inline bool vcl::KeyCode::operator !=( const vcl::KeyCode& rKeyCode ) const inline bool vcl::KeyCode::IsDefinedKeyCodeEqual( const vcl::KeyCode& rKeyCode ) const { - if ( (eFunc == KEYFUNC_DONTKNOW) && (rKeyCode.eFunc == KEYFUNC_DONTKNOW) ) + if ( (eFunc == KeyFuncType::DONTKNOW) && (rKeyCode.eFunc == KeyFuncType::DONTKNOW) ) return (GetFullCode() == rKeyCode.GetFullCode()); return (GetFunction() == rKeyCode.GetFunction()); } |