diff options
Diffstat (limited to 'tdestyles/keramik')
| -rw-r--r-- | tdestyles/keramik/keramik.cpp | 16 | ||||
| -rw-r--r-- | tdestyles/keramik/keramik.h | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp index 346a5a2c3..508848b33 100644 --- a/tdestyles/keramik/keramik.cpp +++ b/tdestyles/keramik/keramik.cpp @@ -1380,7 +1380,7 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C return false; } -void KeramikStyle::drawControl( TQ_ControlElement element, +void KeramikStyle::drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1603,7 +1603,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, tb->orientation() == TQt::Horizontal); } else - TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, + TDEStyle::drawControl( (ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, r, cg, flags, opt, widget ); break; } @@ -1963,7 +1963,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, } } -void KeramikStyle::drawControlMask( TQ_ControlElement element, +void KeramikStyle::drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1995,7 +1995,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData &ceDat } } -void KeramikStyle::drawComplexControl( TQ_ComplexControl control, +void KeramikStyle::drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2164,7 +2164,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, case CC_SpinWidget: { const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget ); - TQRect br = visualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags ); + TQRect br = visualRect( querySubControlMetrics( (ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags ); if ( controls & SC_SpinWidgetButtonField ) { Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() ); @@ -2361,7 +2361,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, } } -void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control, +void KeramikStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -2574,7 +2574,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, } -TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, +TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint& point, @@ -2594,7 +2594,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, return result; } -TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, +TQRect KeramikStyle::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, diff --git a/tdestyles/keramik/keramik.h b/tdestyles/keramik/keramik.h index ba7139c63..23cc0d044 100644 --- a/tdestyles/keramik/keramik.h +++ b/tdestyles/keramik/keramik.h @@ -74,7 +74,7 @@ public: SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( TQ_ControlElement element, + void drawControl( ControlElement element, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -84,7 +84,7 @@ public: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawControlMask( TQ_ControlElement element, + void drawControlMask( ControlElement element, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -92,7 +92,7 @@ public: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawComplexControl( TQ_ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -104,7 +104,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawComplexControlMask( TQ_ComplexControl control, + void drawComplexControlMask( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -121,14 +121,14 @@ public: const TQStyleOption& opt, const TQWidget* widget = 0 ) const; - SubControl querySubControl( TQ_ComplexControl control, + SubControl querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint& point, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - TQRect querySubControlMetrics( TQ_ComplexControl control, + TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, |