From a20928b6bfae18a41bb42b85e10f73fb63548ccc Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 23 Jan 2011 05:12:43 +0000 Subject: Styles are now mostly functional under Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1216403 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kstyles/light/lightstyle-v2.cpp | 24 ++++++++++++------------ kstyles/light/lightstyle-v2.h | 14 +++++++------- kstyles/light/lightstyle-v3.cpp | 24 ++++++++++++------------ kstyles/light/lightstyle-v3.h | 14 +++++++------- 4 files changed, 38 insertions(+), 38 deletions(-) (limited to 'kstyles/light') diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp index 6fde9549d..94ba6c058 100644 --- a/kstyles/light/lightstyle-v2.cpp +++ b/kstyles/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( PrimitiveElement pe, +void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, const TQRect &r, const TQColorGroup &cg, @@ -444,7 +444,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, case PE_ScrollBarSubLine: { TQRect fr = r, ar = r; - PrimitiveElement pe; + TQ_PrimitiveElement pe; p->setPen(cg.dark()); if (flags & Style_Horizontal) { @@ -469,7 +469,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, case PE_ScrollBarAddLine: { TQRect fr = r, ar = r; - PrimitiveElement pe; + TQ_PrimitiveElement pe; p->setPen(cg.dark()); if (flags & Style_Horizontal) { @@ -612,7 +612,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, } } -void LightStyleV2::tqdrawControl( ControlElement control, +void LightStyleV2::tqdrawControl( TQ_ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -970,7 +970,7 @@ void LightStyleV2::tqdrawControl( ControlElement control, } } -void LightStyleV2::tqdrawControlMask( ControlElement control, +void LightStyleV2::tqdrawControlMask( TQ_ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1015,7 +1015,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQWidget *widget) const return rect; } -void LightStyleV2::tqdrawComplexControl( ComplexControl control, +void LightStyleV2::tqdrawComplexControl( TQ_ComplexControl control, TQPainter* p, const TQWidget* widget, const TQRect& r, @@ -1087,7 +1087,7 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control, const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget; TQRect frame, up, down; - frame = querySubControlMetrics((QStyle::ComplexControl)CC_SpinWidget, widget, + frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetFrame, data); up = spinwidget->upRect(); down = spinwidget->downRect(); @@ -1097,7 +1097,7 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control, &cg.tqbrush(TQColorGroup::Base)); if ((controls & SC_SpinWidgetUp) && up.isValid()) { - PrimitiveElement pe = PE_SpinWidgetUp; + TQ_PrimitiveElement pe = PE_SpinWidgetUp; if ( spinwidget->buttonSymbols() == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetPlus; @@ -1130,7 +1130,7 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control, } if ((controls & SC_SpinWidgetDown) && down.isValid()) { - PrimitiveElement pe = PE_SpinWidgetDown; + TQ_PrimitiveElement pe = PE_SpinWidgetDown; if ( spinwidget->buttonSymbols() == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetMinus; @@ -1299,7 +1299,7 @@ void LightStyleV2::tqdrawComplexControl( ComplexControl control, } } -TQRect LightStyleV2::querySubControlMetrics( ComplexControl control, +TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control, const TQWidget *widget, SubControl sc, const TQStyleOption &data ) const @@ -1393,7 +1393,7 @@ TQRect LightStyleV2::querySubControlMetrics( ComplexControl control, return ret; } -TQStyle::SubControl LightStyleV2::querySubControl( ComplexControl control, +TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control, const TQWidget *widget, const TQPoint &pos, const TQStyleOption &data ) const @@ -1479,7 +1479,7 @@ int LightStyleV2::tqpixelMetric( PixelMetric metric, return ret; } -TQSize LightStyleV2::sizeFromContents( ContentsType contents, +TQSize LightStyleV2::tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption &data ) const diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h index 292984811..83a5f46f1 100644 --- a/kstyles/light/lightstyle-v2.h +++ b/kstyles/light/lightstyle-v2.h @@ -44,32 +44,32 @@ public: void polishPopupMenu( TQPopupMenu * ); - void drawPrimitive(PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &, + void tqdrawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void tqdrawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawControl(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void tqdrawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawControlMask(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption & = TQStyleOption::Default) const; TQRect subRect(SubRect, const TQWidget *) const; - void tqdrawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawComplexControl(TQ_ComplexControl, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default ) const; - TQRect querySubControlMetrics(ComplexControl, const TQWidget *, SubControl, + TQRect querySubControlMetrics(TQ_ComplexControl, const TQWidget *, SubControl, const TQStyleOption & = TQStyleOption::Default ) const; - SubControl querySubControl(ComplexControl, const TQWidget *, const TQPoint &, + SubControl querySubControl(TQ_ComplexControl, const TQWidget *, const TQPoint &, const TQStyleOption &data = TQStyleOption::Default ) const; int tqpixelMetric(PixelMetric, const TQWidget * = 0 ) const; - TQSize sizeFromContents(ContentsType, const TQWidget *, const TQSize &, + TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &, const TQStyleOption & = TQStyleOption::Default ) const; int tqstyleHint(StyleHint, const TQWidget * = 0, diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index b7da954c9..b05517248 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -212,7 +212,7 @@ static void drawLightBevel( TQPainter *p, p->fillRect( br, *fill ); } -void LightStyleV3::drawPrimitive( PrimitiveElement pe, +void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, const TQRect &r, const TQColorGroup &cg, @@ -587,7 +587,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, case PE_ScrollBarSubLine: { TQRect br = r; - PrimitiveElement pe; + TQ_PrimitiveElement pe; p->setPen( cg.background() ); if (flags & Style_Horizontal) { @@ -621,7 +621,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, case PE_ScrollBarAddLine: { TQRect br = r; - PrimitiveElement pe; + TQ_PrimitiveElement pe; p->setPen( cg.background() ); if (flags & Style_Horizontal) { @@ -803,7 +803,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, } } -void LightStyleV3::tqdrawControl( ControlElement control, +void LightStyleV3::tqdrawControl( TQ_ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1088,7 +1088,7 @@ void LightStyleV3::tqdrawControl( ControlElement control, } } -void LightStyleV3::tqdrawControlMask( ControlElement control, +void LightStyleV3::tqdrawControlMask( TQ_ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1150,7 +1150,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQWidget *widget) const return rect; } -void LightStyleV3::tqdrawComplexControl( ComplexControl control, +void LightStyleV3::tqdrawComplexControl( TQ_ComplexControl control, TQPainter* p, const TQWidget* widget, const TQRect& r, @@ -1218,7 +1218,7 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control, const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget; TQRect frame, up, down; - frame = querySubControlMetrics((QStyle::ComplexControl)CC_SpinWidget, widget, + frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetFrame, data); up = spinwidget->upRect(); down = spinwidget->downRect(); @@ -1227,7 +1227,7 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control, tqdrawPrimitive( PE_Panel, p, frame, cg, flags | Style_Sunken ); if ((controls & SC_SpinWidgetUp) && up.isValid()) { - PrimitiveElement pe = PE_SpinWidgetUp; + TQ_PrimitiveElement pe = PE_SpinWidgetUp; if ( spinwidget->buttonSymbols() == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetPlus; @@ -1245,7 +1245,7 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control, } if ((controls & SC_SpinWidgetDown) && down.isValid()) { - PrimitiveElement pe = PE_SpinWidgetDown; + TQ_PrimitiveElement pe = PE_SpinWidgetDown; if ( spinwidget->buttonSymbols() == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetMinus; @@ -1426,7 +1426,7 @@ void LightStyleV3::tqdrawComplexControl( ComplexControl control, } } -TQRect LightStyleV3::querySubControlMetrics( ComplexControl control, +TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control, const TQWidget *widget, SubControl sc, const TQStyleOption &data ) const @@ -1576,7 +1576,7 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control, return ret; } -TQStyle::SubControl LightStyleV3::querySubControl( ComplexControl control, +TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control, const TQWidget *widget, const TQPoint &pos, const TQStyleOption &data ) const @@ -1697,7 +1697,7 @@ int LightStyleV3::tqpixelMetric( PixelMetric metric, return ret; } -TQSize LightStyleV3::sizeFromContents( ContentsType contents, +TQSize LightStyleV3::tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption &data ) const diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h index a97c57643..2bc7b65a5 100644 --- a/kstyles/light/lightstyle-v3.h +++ b/kstyles/light/lightstyle-v3.h @@ -48,32 +48,32 @@ public: void polishPopupMenu( TQPopupMenu * ); - void drawPrimitive(PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &, + void tqdrawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void tqdrawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawControl(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void tqdrawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawControlMask(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption & = TQStyleOption::Default) const; TQRect subRect(SubRect, const TQWidget *) const; - void tqdrawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawComplexControl(TQ_ComplexControl, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default ) const; - TQRect querySubControlMetrics(ComplexControl, const TQWidget *, SubControl, + TQRect querySubControlMetrics(TQ_ComplexControl, const TQWidget *, SubControl, const TQStyleOption & = TQStyleOption::Default ) const; - SubControl querySubControl(ComplexControl, const TQWidget *, const TQPoint &, + SubControl querySubControl(TQ_ComplexControl, const TQWidget *, const TQPoint &, const TQStyleOption &data = TQStyleOption::Default ) const; int tqpixelMetric(PixelMetric, const TQWidget * = 0 ) const; - TQSize sizeFromContents(ContentsType, const TQWidget *, const TQSize &, + TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &, const TQStyleOption & = TQStyleOption::Default ) const; int tqstyleHint(StyleHint, const TQWidget * = 0, -- cgit v1.2.1