diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-12 21:15:32 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-09-12 21:15:32 +0900 |
commit | 0f36f8966371d24decc0740ccf9f8b0cc2c57838 (patch) | |
tree | 13adb17728b88c3e7bdcc83fd2c2a131939f7770 /tdestyles | |
parent | cc5cf548f13ee0c43c41ac60ad056765e7dccb26 (diff) | |
download | tdelibs-0f36f8966371d24decc0740ccf9f8b0cc2c57838.tar.gz tdelibs-0f36f8966371d24decc0740ccf9f8b0cc2c57838.zip |
Replace various tqtinterface's TQ_* defines with actual types
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdestyles')
-rw-r--r-- | tdestyles/asteroid/asteroid.cpp | 4 | ||||
-rw-r--r-- | tdestyles/asteroid/asteroid.h | 4 | ||||
-rw-r--r-- | tdestyles/highcolor/highcolor.cpp | 4 | ||||
-rw-r--r-- | tdestyles/highcolor/highcolor.h | 4 | ||||
-rw-r--r-- | tdestyles/highcontrast/highcontrast.cpp | 8 | ||||
-rw-r--r-- | tdestyles/highcontrast/highcontrast.h | 6 | ||||
-rw-r--r-- | tdestyles/keramik/keramik.cpp | 6 | ||||
-rw-r--r-- | tdestyles/keramik/keramik.h | 4 | ||||
-rw-r--r-- | tdestyles/light/lightstyle-v2.cpp | 12 | ||||
-rw-r--r-- | tdestyles/light/lightstyle-v2.h | 4 | ||||
-rw-r--r-- | tdestyles/light/lightstyle-v3.cpp | 12 | ||||
-rw-r--r-- | tdestyles/light/lightstyle-v3.h | 4 | ||||
-rw-r--r-- | tdestyles/plastik/plastik.cpp | 8 | ||||
-rw-r--r-- | tdestyles/plastik/plastik.h | 4 |
14 files changed, 42 insertions, 42 deletions
diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp index 6034b1c42..bd05125fd 100644 --- a/tdestyles/asteroid/asteroid.cpp +++ b/tdestyles/asteroid/asteroid.cpp @@ -283,7 +283,7 @@ void AsteroidStyle::drawTDEStylePrimitive(TDEStylePrimitive ksp, } } -int AsteroidStyle::styleHint( TQ_StyleHint stylehint, +int AsteroidStyle::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, @@ -313,7 +313,7 @@ int AsteroidStyle::styleHint( TQ_StyleHint stylehint, } } -void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe, +void AsteroidStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, diff --git a/tdestyles/asteroid/asteroid.h b/tdestyles/asteroid/asteroid.h index b5d7e5a6e..9f08a01ff 100644 --- a/tdestyles/asteroid/asteroid.h +++ b/tdestyles/asteroid/asteroid.h @@ -44,12 +44,12 @@ public: const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; - void drawPrimitive(TQ_PrimitiveElement, + void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp index 6f06a18e4..f15c335cb 100644 --- a/tdestyles/highcolor/highcolor.cpp +++ b/tdestyles/highcolor/highcolor.cpp @@ -251,7 +251,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg // This function draws primitive elements as well as their masks. -void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, +void HighColorStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1493,7 +1493,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element, // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags); TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); diff --git a/tdestyles/highcolor/highcolor.h b/tdestyles/highcolor/highcolor.h index 93e2658dd..55b2fce8e 100644 --- a/tdestyles/highcolor/highcolor.h +++ b/tdestyles/highcolor/highcolor.h @@ -81,7 +81,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -158,7 +158,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp index fefdb0d9a..0a7009dfd 100644 --- a/tdestyles/highcontrast/highcontrast.cpp +++ b/tdestyles/highcontrast/highcontrast.cpp @@ -286,7 +286,7 @@ void HighContrastStyle::drawEllipse (TQPainter* p, TQRect r, int offset, bool fi p->drawRoundRect (r, 99, 99); } -void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset) const +void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset) const { p->save(); addOffset (&r, offset); @@ -337,7 +337,7 @@ void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement a } // This function draws primitive elements -void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, +void HighContrastStyle::drawPrimitive (PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -764,7 +764,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, // Probably it would be better to add a KPM_ListViewExpander metric // to the TDEStyle TDEStylePixelMetric enum, and have the TDEStyle // drawComplexControl handle it. - TQ_PrimitiveElement direction; + PrimitiveElement direction; if (flags & Style_On) { // Collapsed = On direction = PE_ArrowRight; @@ -1146,7 +1146,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element, // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags); TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); diff --git a/tdestyles/highcontrast/highcontrast.h b/tdestyles/highcontrast/highcontrast.h index 905a35ea4..20469a064 100644 --- a/tdestyles/highcontrast/highcontrast.h +++ b/tdestyles/highcontrast/highcontrast.h @@ -69,7 +69,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -149,7 +149,7 @@ class HighContrastStyle : public TDEStyle TQRect subRect (SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget * widget) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; @@ -166,7 +166,7 @@ class HighContrastStyle : public TDEStyle void drawRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const; void drawRoundRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const; void drawEllipse (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const; - void drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset = 0) const; + void drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset = 0) const; int basicLineWidth; // Disable copy constructor and = operator diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp index c33644c66..6b1d5fd4d 100644 --- a/tdestyles/keramik/keramik.cpp +++ b/tdestyles/keramik/keramik.cpp @@ -123,7 +123,7 @@ namespace namespace { - void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::TQ_PrimitiveElement pe, bool down, bool enabled) + void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::PrimitiveElement pe, bool down, bool enabled) { TQPointArray a; @@ -543,7 +543,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr } // This function draws primitive elements as well as their masks. -void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, +void KeramikStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1831,7 +1831,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - itemFrame; TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); diff --git a/tdestyles/keramik/keramik.h b/tdestyles/keramik/keramik.h index 6b0cf42ab..ba7139c63 100644 --- a/tdestyles/keramik/keramik.h +++ b/tdestyles/keramik/keramik.h @@ -65,7 +65,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -135,7 +135,7 @@ public: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; diff --git a/tdestyles/light/lightstyle-v2.cpp b/tdestyles/light/lightstyle-v2.cpp index 7e0c39076..1809f3bad 100644 --- a/tdestyles/light/lightstyle-v2.cpp +++ b/tdestyles/light/lightstyle-v2.cpp @@ -129,7 +129,7 @@ static void drawLightBevel(TQPainter *p, const TQRect &r, const TQColorGroup &cg if (fill) p->fillRect(br, *fill); } -void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, +void LightStyleV2::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -447,7 +447,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarSubLine: { TQRect fr = r, ar = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen(cg.dark()); if (flags & Style_Horizontal) { @@ -472,7 +472,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarAddLine: { TQRect fr = r, ar = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen(cg.dark()); if (flags & Style_Horizontal) { @@ -1129,7 +1129,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, &cg.brush(TQColorGroup::Base)); if ((controls & SC_SpinWidgetUp) && up.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetUp; + PrimitiveElement pe = PE_SpinWidgetUp; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetPlus; @@ -1162,7 +1162,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, } if ((controls & SC_SpinWidgetDown) && down.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetDown; + PrimitiveElement pe = PE_SpinWidgetDown; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetMinus; @@ -1625,7 +1625,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents, return ret; } -int LightStyleV2::styleHint( TQ_StyleHint stylehint, +int LightStyleV2::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, diff --git a/tdestyles/light/lightstyle-v2.h b/tdestyles/light/lightstyle-v2.h index 9460d53fb..2c81ae6bc 100644 --- a/tdestyles/light/lightstyle-v2.h +++ b/tdestyles/light/lightstyle-v2.h @@ -44,7 +44,7 @@ public: void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); - void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, + void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; @@ -72,7 +72,7 @@ public: TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; diff --git a/tdestyles/light/lightstyle-v3.cpp b/tdestyles/light/lightstyle-v3.cpp index d7fc2bfd3..38ebe4293 100644 --- a/tdestyles/light/lightstyle-v3.cpp +++ b/tdestyles/light/lightstyle-v3.cpp @@ -212,7 +212,7 @@ static void drawLightBevel( TQPainter *p, p->fillRect( br, *fill ); } -void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, +void LightStyleV3::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -590,7 +590,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarSubLine: { TQRect br = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen( cg.background() ); if (flags & Style_Horizontal) { @@ -624,7 +624,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarAddLine: { TQRect br = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen( cg.background() ); if (flags & Style_Horizontal) { @@ -1257,7 +1257,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, drawPrimitive( PE_Panel, p, ceData, elementFlags, frame, cg, flags | Style_Sunken ); if ((controls & SC_SpinWidgetUp) && up.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetUp; + PrimitiveElement pe = PE_SpinWidgetUp; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetPlus; @@ -1275,7 +1275,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, } if ((controls & SC_SpinWidgetDown) && down.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetDown; + PrimitiveElement pe = PE_SpinWidgetDown; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetMinus; @@ -1854,7 +1854,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents, return ret; } -int LightStyleV3::styleHint( TQ_StyleHint stylehint, +int LightStyleV3::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, diff --git a/tdestyles/light/lightstyle-v3.h b/tdestyles/light/lightstyle-v3.h index 345b30144..5379e7e76 100644 --- a/tdestyles/light/lightstyle-v3.h +++ b/tdestyles/light/lightstyle-v3.h @@ -48,7 +48,7 @@ public: void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); - void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, + void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; @@ -76,7 +76,7 @@ public: TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp index 2cfd60db1..2e6749137 100644 --- a/tdestyles/plastik/plastik.cpp +++ b/tdestyles/plastik/plastik.cpp @@ -1451,7 +1451,7 @@ void PlastikStyle::drawTDEStylePrimitive(TDEStylePrimitive kpe, } -void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, +void PlastikStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2695,7 +2695,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element, // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - 1; TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim, r.y() + r.height() / 2 - dim / 2, dim, dim), r ); @@ -3013,7 +3013,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control, const TQSpinWidget *sw = dynamic_cast<const TQSpinWidget *>(widget); SFlags sflags = flags; - TQ_PrimitiveElement pe; + PrimitiveElement pe; bool hasFocus = false; if (sw) @@ -3465,7 +3465,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); } -int PlastikStyle::styleHint( TQ_StyleHint stylehint, +int PlastikStyle::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, diff --git a/tdestyles/plastik/plastik.h b/tdestyles/plastik/plastik.h index d25888e15..d19408c52 100644 --- a/tdestyles/plastik/plastik.h +++ b/tdestyles/plastik/plastik.h @@ -76,7 +76,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive(TQ_PrimitiveElement pe, + void drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -137,7 +137,7 @@ public: const TQStyleOption &o, const TQWidget *w = 0) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; |