From 4c9f3f02c0e1a9be5567649f5c97d6638033f74f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 24 Nov 2023 10:55:57 +0900 Subject: Replaced various '#define' with actual strings - part 3 Signed-off-by: Michele Calgaro (cherry picked from commit 8d79c40791fa0bcac4d4ce1dc7385b19e523ba08) --- tdestyles/highcontrast/highcontrast.cpp | 14 +++++++------- tdestyles/highcontrast/highcontrast.h | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tdestyles/highcontrast') diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp index 7631a5376..5ef1f36d6 100644 --- a/tdestyles/highcontrast/highcontrast.cpp +++ b/tdestyles/highcontrast/highcontrast.cpp @@ -784,7 +784,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, } -void HighContrastStyle::drawControl (TQ_ControlElement element, +void HighContrastStyle::drawControl (ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1162,7 +1162,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element, } } -void HighContrastStyle::drawControlMask (TQ_ControlElement element, +void HighContrastStyle::drawControlMask (ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1207,7 +1207,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item) return sibling; } -void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, +void HighContrastStyle::drawComplexControl (ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1262,12 +1262,12 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, setColorsButton (p, cg, flags); // Draw arrows if required if (controls & SC_SpinWidgetDown) { - TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags); + TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags); drawRoundRect (p, r2); drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth); } if (controls & SC_SpinWidgetUp) { - TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags); + TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags); drawRoundRect (p, r2); drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth); } @@ -1490,7 +1490,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, } } -void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c, +void HighContrastStyle::drawComplexControlMask(ComplexControl c, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -1535,7 +1535,7 @@ void HighContrastStyle::drawItem( TQPainter *p, p->restore(); } -TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control, +TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, diff --git a/tdestyles/highcontrast/highcontrast.h b/tdestyles/highcontrast/highcontrast.h index 20469a064..688742fb6 100644 --- a/tdestyles/highcontrast/highcontrast.h +++ b/tdestyles/highcontrast/highcontrast.h @@ -78,7 +78,7 @@ class HighContrastStyle : public TDEStyle 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, @@ -88,7 +88,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawControlMask( TQ_ControlElement element, + void drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -96,7 +96,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControl( TQ_ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -108,7 +108,7 @@ class HighContrastStyle : public TDEStyle 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, @@ -116,7 +116,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - TQRect querySubControlMetrics( TQ_ComplexControl control, + TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, -- cgit v1.2.1