diff --git a/kstyle/breeze.h b/kstyle/breeze.h index 6b9b4315..1d1ff960 100644 --- a/kstyle/breeze.h +++ b/kstyle/breeze.h @@ -169,6 +169,14 @@ namespace Breeze Q_DECLARE_FLAGS( Corners, Corner ); + //! checkbox state (used for checkboxes _and_ radio buttons) + enum CheckBoxState + { + CheckOff, + CheckPartial, + CheckOn + }; + //! arrow orientation enum ArrowOrientation { diff --git a/kstyle/breezehelper.h b/kstyle/breezehelper.h index fd6a336a..db57e975 100644 --- a/kstyle/breezehelper.h +++ b/kstyle/breezehelper.h @@ -146,14 +146,6 @@ namespace Breeze //! separator void renderSeparator( QPainter*, const QRect&, const QColor&, bool vertical = false ) const; - //! checkbox state (used for checkboxes _and_ radio buttons) - enum CheckBoxState - { - CheckOff = 0, - CheckPartial = 1, - CheckOn = 2 - }; - //! checkbox void renderCheckBox( QPainter*, const QRect&, const QColor& color, const QColor& shadow, bool sunken, CheckBoxState state ) const; @@ -196,7 +188,6 @@ namespace Breeze //! tabbar tab void renderTabBarTab( QPainter*, const QRect&, const QColor& color, const QColor& outline, Corners ) const; - //! generic arrow void renderArrow( QPainter*, const QRect&, const QColor&, ArrowOrientation ) const; diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp index 26f632c1..bca41304 100644 --- a/kstyle/breezestyle.cpp +++ b/kstyle/breezestyle.cpp @@ -2905,9 +2905,9 @@ namespace Breeze const bool active( ( state & (State_On|State_NoChange) ) ); // checkbox state - Helper::CheckBoxState checkBoxState( Helper::CheckOff ); - if( state & State_NoChange ) checkBoxState = Helper::CheckPartial; - else if( state & State_On ) checkBoxState = Helper::CheckOn; + CheckBoxState checkBoxState( CheckOff ); + if( state & State_NoChange ) checkBoxState = CheckPartial; + else if( state & State_On ) checkBoxState = CheckOn; // animation state _animations->widgetStateEngine().updateState( widget, AnimationHover, mouseOver ); @@ -3487,7 +3487,7 @@ namespace Breeze checkBoxRect = handleRTL( option, checkBoxRect ); // checkbox state - Helper::CheckBoxState state( menuItemOption->checked ? Helper::CheckOn : Helper::CheckOff ); + CheckBoxState state( menuItemOption->checked ? CheckOn : CheckOff ); const bool active( menuItemOption->checked ); const QColor color( _helper->checkBoxIndicatorColor( palette, enabled && selected, enabled && active ) ); const QColor shadow( _helper->shadowColor( palette ) );