diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-07 19:57:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-08 06:39:48 +0000 |
| commit | 7fb70ff650ce3a1e4a39bd1b936f511d6be8986c (patch) | |
| tree | 9e5cbb12d215ca22bd1d1500a0d378b197dcdf04 /include | |
| parent | c941b5a103b5f2105106834c74842a3909216f9a (diff) | |
Convert ButtonValue to scoped enum
Change-Id: Ia882914fb99844f21ce89d7218321933ef084b22
Reviewed-on: https://gerrit.libreoffice.org/26036
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/salnativewidgets.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 7c2ce42cde22..37487f4923d7 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -288,11 +288,11 @@ public: * that buttons allow */ -enum ButtonValue { - BUTTONVALUE_DONTKNOW, - BUTTONVALUE_ON, - BUTTONVALUE_OFF, - BUTTONVALUE_MIXED +enum class ButtonValue { + DontKnow, + On, + Off, + Mixed }; /* ImplControlValue: @@ -311,7 +311,7 @@ class VCL_DLLPUBLIC ImplControlValue protected: ImplControlValue( ControlType i_eType, long i_nNumber ) : mType( i_eType ) - , mTristate( BUTTONVALUE_DONTKNOW ) + , mTristate( ButtonValue::DontKnow ) , mNumber( i_nNumber ) {} @@ -319,9 +319,9 @@ class VCL_DLLPUBLIC ImplControlValue explicit ImplControlValue( ButtonValue nTristate ) : mType( ControlType::Generic ), mTristate(nTristate), mNumber(0) {} explicit ImplControlValue( long nNumeric ) - : mType( ControlType::Generic ), mTristate(BUTTONVALUE_DONTKNOW), mNumber( nNumeric) {} - inline ImplControlValue() - : mType( ControlType::Generic ), mTristate(BUTTONVALUE_DONTKNOW), mNumber(0) {} + : mType( ControlType::Generic ), mTristate(ButtonValue::DontKnow), mNumber( nNumeric) {} + ImplControlValue() + : mType( ControlType::Generic ), mTristate(ButtonValue::DontKnow), mNumber(0) {} virtual ~ImplControlValue(); @@ -329,11 +329,11 @@ class VCL_DLLPUBLIC ImplControlValue ControlType getType() const { return mType; } - inline ButtonValue getTristateVal() const { return mTristate; } - inline void setTristateVal( ButtonValue nTristate ) { mTristate = nTristate; } + ButtonValue getTristateVal() const { return mTristate; } + void setTristateVal( ButtonValue nTristate ) { mTristate = nTristate; } - inline long getNumericVal() const { return mNumber; } - inline void setNumericVal( long nNumeric ) { mNumber = nNumeric; } + long getNumericVal() const { return mNumber; } + void setNumericVal( long nNumeric ) { mNumber = nNumeric; } }; /* ScrollbarValue: |