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>

4 files changed, 18 insertions, 18 deletions

diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 62ab80da5de0..e3badbc2205c 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -1844,7 +1844,7 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
 {
     GtkStateType    stateType;
     GtkShadowType    shadowType;
-    bool            isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON);
+    bool            isChecked = (aValue.getTristateVal()==ButtonValue::On);
     gint            x, y;
     GdkRectangle    clipRect;
 
@@ -1900,8 +1900,8 @@ bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
 {
     GtkStateType    stateType;
     GtkShadowType    shadowType;
-    bool            isChecked = (aValue.getTristateVal() == BUTTONVALUE_ON);
-    bool            isInconsistent = (aValue.getTristateVal() == BUTTONVALUE_MIXED);
+    bool            isChecked = (aValue.getTristateVal() == ButtonValue::On);
+    bool            isInconsistent = (aValue.getTristateVal() == ButtonValue::Mixed);
     GdkRectangle    clipRect;
     gint            x,y;
 
@@ -3081,7 +3081,7 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
     {
         bool bPaintButton = (nState & ControlState::PRESSED)
             || (nState & ControlState::ROLLOVER);
-        if( aValue.getTristateVal() == BUTTONVALUE_ON )
+        if( aValue.getTristateVal() == ButtonValue::On )
         {
             gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pButtonWidget),TRUE);
             bPaintButton = true;
@@ -3514,8 +3514,8 @@ bool GtkSalGraphics::NWPaintGTKListNode(
 
     switch( aButtonValue )
     {
-        case BUTTONVALUE_ON: eStyle = GTK_EXPANDER_EXPANDED;break;
-        case BUTTONVALUE_OFF: eStyle = GTK_EXPANDER_COLLAPSED; break;
+        case ButtonValue::On: eStyle = GTK_EXPANDER_EXPANDED;break;
+        case ButtonValue::Off: eStyle = GTK_EXPANDER_COLLAPSED; break;
         default:
             break;
     }
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 8f8ee83fdd26..74dffc921e21 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -1298,7 +1298,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
         case PART_BUTTON:
             /* For all checkbuttons in the toolbars */
             flags = (GtkStateFlags)(flags |
-                    ( (rValue.getTristateVal() == BUTTONVALUE_ON) ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL));
+                    ( (rValue.getTristateVal() == ButtonValue::On) ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL));
             context = mpToolButtonStyle;
             break;
         case PART_SEPARATOR_VERT:
@@ -1311,14 +1311,14 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
         break;
     case ControlType::Radiobutton:
         flags = (GtkStateFlags)(flags |
-                ( (rValue.getTristateVal() == BUTTONVALUE_ON) ? CHECKED : GTK_STATE_FLAG_NORMAL));
+                ( (rValue.getTristateVal() == ButtonValue::On) ? CHECKED : GTK_STATE_FLAG_NORMAL));
         context = mpRadioButtonStyle;
         renderType = nPart == PART_FOCUS ? RENDER_FOCUS : RENDER_RADIO;
         break;
     case ControlType::Checkbox:
         flags = (GtkStateFlags)(flags |
-                ( (rValue.getTristateVal() == BUTTONVALUE_ON) ? CHECKED :
-                  (rValue.getTristateVal() == BUTTONVALUE_MIXED) ? GTK_STATE_FLAG_INCONSISTENT :
+                ( (rValue.getTristateVal() == ButtonValue::On) ? CHECKED :
+                  (rValue.getTristateVal() == ButtonValue::Mixed) ? GTK_STATE_FLAG_INCONSISTENT :
                   GTK_STATE_FLAG_NORMAL));
         context = mpCheckButtonStyle;
         renderType = nPart == PART_FOCUS ? RENDER_FOCUS : RENDER_CHECK;
@@ -1389,7 +1389,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
     {
         context = mpTreeHeaderButtonStyle;
         ButtonValue aButtonValue = rValue.getTristateVal();
-        if (aButtonValue == BUTTONVALUE_ON)
+        if (aButtonValue == ButtonValue::On)
             flags = (GtkStateFlags) (flags | CHECKED);
         renderType = RENDER_EXPANDER;
         break;
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 512a5d1fda60..624c9652876d 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -109,9 +109,9 @@ QStyle::SFlags vclStateValue2SFlags( ControlState nState,
 
     switch ( aValue.getTristateVal() )
     {
-    case BUTTONVALUE_ON:    nStyle |= QStyle::Style_On;       break;
-    case BUTTONVALUE_OFF:   nStyle |= QStyle::Style_Off;      break;
-    case BUTTONVALUE_MIXED: nStyle |= QStyle::Style_NoChange; break;
+    case ButtonValue::On:    nStyle |= QStyle::Style_On;       break;
+    case ButtonValue::Off:   nStyle |= QStyle::Style_Off;      break;
+    case ButtonValue::Mixed: nStyle |= QStyle::Style_NoChange; break;
     default: break;
     }
 
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 434b259fa7e3..cdf12925b24c 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -54,9 +54,9 @@ QStyle::State vclStateValue2StateFlag( ControlState nControlState,
 
     switch ( aValue.getTristateVal() )
     {
-        case BUTTONVALUE_ON:    nState |= QStyle::State_On;       break;
-        case BUTTONVALUE_OFF:   nState |= QStyle::State_Off;      break;
-        case BUTTONVALUE_MIXED: nState |= QStyle::State_NoChange; break;
+        case ButtonValue::On:    nState |= QStyle::State_On;       break;
+        case ButtonValue::Off:   nState |= QStyle::State_Off;      break;
+        case ButtonValue::Mixed: nState |= QStyle::State_NoChange; break;
         default: break;
     }
 
@@ -411,7 +411,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         QStyleOption option;
         option.state = QStyle::State_Item | QStyle::State_Children;
 
-        if (value.getTristateVal() == BUTTONVALUE_ON)
+        if (value.getTristateVal() == ButtonValue::On)
             option.state |= QStyle::State_Open;
 
         draw( QStyle::PE_IndicatorBranch, &option, m_image.get(),