summaryrefslogtreecommitdiffstats
path: root/kstyles/plastik
diff options
context:
space:
mode:
Diffstat (limited to 'kstyles/plastik')
-rw-r--r--kstyles/plastik/plastik.cpp64
-rw-r--r--kstyles/plastik/plastik.h12
2 files changed, 38 insertions, 38 deletions
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index 22290feb5..68f717b6a 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -893,13 +893,13 @@ void PlastikStyle::renderPanel(TQPainter *p,
p->setPen(g.background().dark());
p->drawConvexPolygon(TQPointArray(4, corners));
p->setPen(g.background().light());
- p->tqdrawPolyline(TQPointArray(4, corners), 0, 3);
+ p->drawPolyline(TQPointArray(4, corners), 0, 3);
} else {
const TQCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 };
p->setPen(g.background().dark());
p->drawPolygon(TQPointArray(4, corners));
p->setPen(g.background().light());
- p->tqdrawPolyline(TQPointArray(4, corners), 0, 3);
+ p->drawPolyline(TQPointArray(4, corners), 0, 3);
}
} else {
renderContour(p, r, g.background(), getColor(g, PanelContour) );
@@ -2095,11 +2095,11 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
}
}
- const TQWMatrix oldMatrix( p->tqworldMatrix() );
+ const TQWMatrix oldMatrix( p->worldMatrix() );
if (flags & Style_Down) {
- p->translate(tqpixelMetric(PM_ButtonShiftHorizontal),
- tqpixelMetric(PM_ButtonShiftVertical));
+ p->translate(pixelMetric(PM_ButtonShiftHorizontal),
+ pixelMetric(PM_ButtonShiftVertical));
}
a.translate((r.x()+r.width()/2), (r.y()+r.height()/2));
@@ -2139,7 +2139,7 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
}
-void PlastikStyle::tqdrawControl(TQ_ControlElement element,
+void PlastikStyle::drawControl(TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2337,7 +2337,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
renderTab(p, r, cg, mouseOver, selected, true, pos, false, cornerWidget);
break;
default:
- KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+ KStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
break;
@@ -2380,15 +2380,15 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
// Shift button contents if pushed.
if ( active )
{
- x += tqpixelMetric(PM_ButtonShiftHorizontal, widget);
- y += tqpixelMetric(PM_ButtonShiftVertical, widget);
+ x += pixelMetric(PM_ButtonShiftHorizontal, widget);
+ y += pixelMetric(PM_ButtonShiftVertical, widget);
flags |= Style_Sunken;
}
// Does the button have a popup menu?
if ( button->isMenuButton() )
{
- int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+ int dx = pixelMetric( PM_MenuButtonIndicator, widget );
if ( button->iconSet() && !button->iconSet()->isNull() &&
(dx + button->iconSet()->pixmap (TQIconSet::Small, TQIconSet::Normal, TQIconSet::Off ).width()) >= w )
{
@@ -2397,7 +2397,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
else
{
p->setPen(cg.buttonText());
- tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
+ tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
cg, flags, opt );
w -= dx;
}
@@ -2423,7 +2423,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
p->drawPixmap( x + 4, y + h / 2 - pixmap.height() / 2, pixmap );
if (cornArrow) //Draw over the icon
- tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
+ tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
cg, flags, opt );
@@ -2433,14 +2433,14 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
}
// Make the label indicate if the button is a default button or not
- drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->tqcolorGroup(),
+ drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->colorGroup(),
button->isEnabled(), button->pixmap(), button->text(), -1,
- &button->tqcolorGroup().buttonText() );
+ &button->colorGroup().buttonText() );
if ( flags & Style_HasFocus )
tqdrawPrimitive( PE_FocusRect, p,
- tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
+ visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
cg, flags );
break;
}
@@ -2490,7 +2490,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
bool enabled = mi->isEnabled();
bool checkable = popupmenu->isCheckable();
bool active = flags & Style_Active;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
bool reverse = TQApplication::reverseLayout();
if ( checkable )
checkcol = QMAX( checkcol, 20 );
@@ -2525,7 +2525,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
break;
}
- TQRect cr = tqvisualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r );
+ TQRect cr = visualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r );
// Do we have an icon?
if ( mi->iconSet() )
{
@@ -2669,8 +2669,8 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
// Does the menu item have a submenu?
if ( mi->popup() ) {
TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
- int dim = tqpixelMetric(PM_MenuButtonIndicator) - 1;
- TQRect vr = tqvisualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
+ int dim = pixelMetric(PM_MenuButtonIndicator) - 1;
+ TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
r.y() + r.height() / 2 - dim / 2, dim, dim), r );
// Draw an arrow at the far end of the menu item
@@ -2706,11 +2706,11 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
break;
default:
- KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+ KStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
}
-void PlastikStyle::tqdrawControlMask(TQ_ControlElement element,
+void PlastikStyle::drawControlMask(TQ_ControlElement element,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -2725,12 +2725,12 @@ void PlastikStyle::tqdrawControlMask(TQ_ControlElement element,
}
default: {
- KStyle::tqdrawControlMask (element, p, w, r, opt);
+ KStyle::drawControlMask (element, p, w, r, opt);
}
}
}
-void PlastikStyle::tqdrawComplexControlMask(TQ_ComplexControl c,
+void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -2746,12 +2746,12 @@ void PlastikStyle::tqdrawComplexControlMask(TQ_ComplexControl c,
break;
}
default: {
- KStyle::tqdrawComplexControlMask (c, p, w, r, o);
+ KStyle::drawComplexControlMask (c, p, w, r, o);
}
}
}
-void PlastikStyle::tqdrawComplexControl(TQ_ComplexControl control,
+void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -3141,7 +3141,7 @@ void PlastikStyle::tqdrawComplexControl(TQ_ComplexControl control,
}
default:
- KStyle::tqdrawComplexControl(control, p, widget,
+ KStyle::drawComplexControl(control, p, widget,
r, cg, flags, controls,
active, opt);
break;
@@ -3246,7 +3246,7 @@ TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
}
}
-int PlastikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int PlastikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
{
switch(m) {
// TABS
@@ -3343,7 +3343,7 @@ int PlastikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
}
default:
- return KStyle::tqpixelMetric(m, widget);
+ return KStyle::pixelMetric(m, widget);
}
}
@@ -3412,8 +3412,8 @@ TQSize PlastikStyle::tqsizeFromContents(ContentsType t,
{
const TQPushButton* btn = static_cast<const TQPushButton*>(widget);
- int w = s.width() + 2 * tqpixelMetric(PM_ButtonMargin, widget);
- int h = s.height() + 2 * tqpixelMetric(PM_ButtonMargin, widget);
+ int w = s.width() + 2 * pixelMetric(PM_ButtonMargin, widget);
+ int h = s.height() + 2 * pixelMetric(PM_ButtonMargin, widget);
if ( btn->text().isEmpty() && s.width() < 32 ) return TQSize(w, h);
return TQSize( w+25, h+5 );
@@ -3434,7 +3434,7 @@ TQSize PlastikStyle::tqsizeFromContents(ContentsType t,
return KStyle::tqsizeFromContents (t, widget, s, opt);
}
-int PlastikStyle::tqstyleHint( TQ_StyleHint stylehint,
+int PlastikStyle::styleHint( TQ_StyleHint stylehint,
const TQWidget *widget,
const TQStyleOption &option,
TQStyleHintReturn* returnData ) const
@@ -3444,7 +3444,7 @@ int PlastikStyle::tqstyleHint( TQ_StyleHint stylehint,
return 96; // Motif-like delay...
default:
- return KStyle::tqstyleHint(stylehint, widget, option, returnData);
+ return KStyle::styleHint(stylehint, widget, option, returnData);
}
}
diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h
index 6fa325db9..fbac34232 100644
--- a/kstyles/plastik/plastik.h
+++ b/kstyles/plastik/plastik.h
@@ -81,7 +81,7 @@ public:
SFlags flags = Style_Default,
const TQStyleOption &opt = TQStyleOption::Default ) const;
- void tqdrawControl(TQ_ControlElement element,
+ void drawControl(TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -89,9 +89,9 @@ public:
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControlMask( TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
+ void drawControlMask( TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
- void tqdrawComplexControl(TQ_ComplexControl control,
+ void drawComplexControl(TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -101,7 +101,7 @@ public:
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const;
- int tqpixelMetric(PixelMetric m,
+ int pixelMetric(PixelMetric m,
const TQWidget *widget = 0 ) const;
TQRect subRect(SubRect r,
@@ -112,7 +112,7 @@ public:
SubControl subcontrol,
const TQStyleOption &opt = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask(TQStyle::TQ_ComplexControl c,
+ void drawComplexControlMask(TQStyle::TQ_ComplexControl c,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -123,7 +123,7 @@ public:
const TQSize &s,
const TQStyleOption &o) const;
- int tqstyleHint(TQ_StyleHint, const TQWidget * = 0,
+ int styleHint(TQ_StyleHint, const TQWidget * = 0,
const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0 ) const;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-28 07:43:47 +0000