summaryrefslogtreecommitdiffstats
path: root/kdefx/kstyle.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kdefx/kstyle.cpp')
-rw-r--r--kdefx/kstyle.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/kdefx/kstyle.cpp b/kdefx/kstyle.cpp
index f80094fe4..a9c493a67 100644
--- a/kdefx/kstyle.cpp
+++ b/kdefx/kstyle.cpp
@@ -123,8 +123,8 @@ namespace
static bool useDropShadow(TQWidget* w)
{
- return w && w->tqmetaObject() &&
- w->tqmetaObject()->findProperty("KStyleMenuDropShadow") != -1;
+ return w && w->metaObject() &&
+ w->metaObject()->findProperty("KStyleMenuDropShadow") != -1;
}
}
@@ -554,7 +554,7 @@ int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) c
// // What should "widget" be in actuality? How should I get it? From where?
// // Almost certainly it should not be null!
// TQWidget *widget = 0;
-// tqdrawControl(pe, p, widget, r, cg, flags, opt);
+// drawControl(pe, p, widget, r, cg, flags, opt);
//}
// #endif // USE_QT4
@@ -654,7 +654,7 @@ void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
-void KStyle::tqdrawControl( TQ_ControlElement element,
+void KStyle::drawControl( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -952,7 +952,7 @@ void KStyle::tqdrawControl( TQ_ControlElement element,
}
default:
- TQCommonStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+ TQCommonStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
}
@@ -979,7 +979,7 @@ TQRect KStyle::subRect(SubRect r, const TQWidget* widget) const
}
-int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
+int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const
{
switch(m)
{
@@ -1000,7 +1000,7 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
&& widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) )
return widget->fontMetrics().lineSpacing();
else
- return TQCommonStyle::tqpixelMetric(m, widget);
+ return TQCommonStyle::pixelMetric(m, widget);
}
// TABS
@@ -1084,10 +1084,10 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
return 0;
case PM_PopupMenuScrollerHeight:
- return tqpixelMetric( PM_ScrollBarExtent, 0);
+ return pixelMetric( PM_ScrollBarExtent, 0);
default:
- return TQCommonStyle::tqpixelMetric( m, widget );
+ return TQCommonStyle::pixelMetric( m, widget );
}
}
@@ -1104,7 +1104,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling;
}
-void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
+void KStyle::drawComplexControl( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -1227,7 +1227,7 @@ void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
// Draw the tickmarks
if (controls & SC_SliderTickmarks)
- TQCommonStyle::tqdrawComplexControl(control, &p2, widget,
+ TQCommonStyle::drawComplexControl(control, &p2, widget,
r, cg, flags, SC_SliderTickmarks, active, opt);
// Draw the slider handle
@@ -1253,7 +1253,7 @@ void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
// Paint the icon and text.
if ( controls & SC_ListView )
- TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
+ TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
// If we're have a branch or are expanded...
if ( controls & (SC_ListViewBranch | SC_ListViewExpand) )
@@ -1393,7 +1393,7 @@ void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
}
default:
- TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg,
+ TQCommonStyle::drawComplexControl( control, p, widget, r, cg,
flags, controls, active, opt );
break;
}
@@ -1432,7 +1432,7 @@ TQRect KStyle::querySubControlMetrics( TQ_ComplexControl control,
const TQScrollBar *sb = (const TQScrollBar*)widget;
bool horizontal = sb->orientation() == Qt::Horizontal;
int sliderstart = sb->sliderStart();
- int sbextent = tqpixelMetric(PM_ScrollBarExtent, widget);
+ int sbextent = pixelMetric(PM_ScrollBarExtent, widget);
int maxlen = (horizontal ? sb->width() : sb->height())
- (sbextent * (threeButtonScrollBar ? 3 : 2));
int sliderlen;
@@ -1443,7 +1443,7 @@ TQRect KStyle::querySubControlMetrics( TQ_ComplexControl control,
uint range = sb->maxValue() - sb->minValue();
sliderlen = (sb->pageStep() * maxlen) / (range + sb->pageStep());
- int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget );
+ int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget );
if ( sliderlen < slidermin || range > INT_MAX / 2 )
sliderlen = slidermin;
if ( sliderlen > maxlen )
@@ -1833,7 +1833,7 @@ TQPixmap KStyle::stylePixmap( StylePixmap stylepixmap,
}
-int KStyle::tqstyleHint( TQ_StyleHint sh, const TQWidget* w,
+int KStyle::styleHint( TQ_StyleHint sh, const TQWidget* w,
const TQStyleOption &opt, TQStyleHintReturn* shr) const
{
switch (sh)
@@ -1848,7 +1848,7 @@ int KStyle::tqstyleHint( TQ_StyleHint sh, const TQWidget* w,
return d->menuAltKeyNavigation ? 1 : 0;
case SH_PopupMenu_SubMenuPopupDelay:
- if ( tqstyleHint( SH_PopupMenu_SloppySubMenus, w ) )
+ if ( styleHint( SH_PopupMenu_SloppySubMenus, w ) )
return QMIN( 100, d->popupMenuDelay );
else
return d->popupMenuDelay;
@@ -1884,7 +1884,7 @@ int KStyle::tqstyleHint( TQ_StyleHint sh, const TQWidget* w,
}
default:
- return TQCommonStyle::tqstyleHint(sh, w, opt, shr);
+ return TQCommonStyle::styleHint(sh, w, opt, shr);
}
}
@@ -2222,12 +2222,12 @@ bool TransparencyHandler::eventFilter( TQObject* object, TQEvent* event )
case XRender:
#endif
case SoftwareBlend:
- blendToPixmap(p->tqcolorGroup(), p);
+ blendToPixmap(p->colorGroup(), p);
break;
case SoftwareTint:
default:
- blendToColor(p->tqcolorGroup().button());
+ blendToColor(p->colorGroup().button());
};
p->setErasePixmap(pix);
@@ -2315,10 +2315,10 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p)
// Allow styles to define the blend pixmap - allows for some interesting effects.
if (::tqqt_cast<TQPopupMenu*>(p))
- kstyle->renderMenuBlendPixmap( renderPix, p->tqcolorGroup(),
+ kstyle->renderMenuBlendPixmap( renderPix, p->colorGroup(),
::tqqt_cast<TQPopupMenu*>(p) );
else
- renderPix.fill(p->tqcolorGroup().button()); // Just tint as the default behavior
+ renderPix.fill(p->colorGroup().button()); // Just tint as the default behavior
Display* dpy = qt_xdisplay();
Pixmap alphaPixmap;