diff options
Diffstat (limited to 'style/qtc_kstyle.cpp')
| -rw-r--r-- | style/qtc_kstyle.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/style/qtc_kstyle.cpp b/style/qtc_kstyle.cpp index 910ec7c..2f5b687 100644 --- a/style/qtc_kstyle.cpp +++ b/style/qtc_kstyle.cpp @@ -423,7 +423,7 @@ void TQtCKStyle::drawPrimitive( PrimitiveElement pe, -void TQtCKStyle::tqdrawControl( ControlElement element, +void TQtCKStyle::drawControl( ControlElement element, TQPainter* p, const TQWidget* widget, const TQRect &r, @@ -721,7 +721,7 @@ void TQtCKStyle::tqdrawControl( ControlElement element, } default: - TQCommonStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); + TQCommonStyle::drawControl(element, p, widget, r, cg, flags, opt); } } @@ -748,7 +748,7 @@ TQRect TQtCKStyle::subRect(SubRect r, const TQWidget* widget) const } -int TQtCKStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const +int TQtCKStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const { switch(m) { @@ -769,7 +769,7 @@ int TQtCKStyle::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 @@ -853,10 +853,10 @@ int TQtCKStyle::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 ); } } @@ -873,7 +873,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item) return sibling; } -void TQtCKStyle::tqdrawComplexControl( ComplexControl control, +void TQtCKStyle::drawComplexControl( ComplexControl control, TQPainter* p, const TQWidget* widget, const TQRect &r, @@ -996,7 +996,7 @@ void TQtCKStyle::tqdrawComplexControl( 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 @@ -1022,7 +1022,7 @@ void TQtCKStyle::tqdrawComplexControl( 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) ) @@ -1162,7 +1162,7 @@ void TQtCKStyle::tqdrawComplexControl( ComplexControl control, } default: - TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg, + TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); break; } @@ -1201,7 +1201,7 @@ TQRect TQtCKStyle::querySubControlMetrics( 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; @@ -1212,7 +1212,7 @@ TQRect TQtCKStyle::querySubControlMetrics( 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 ) @@ -1602,7 +1602,7 @@ TQPixmap TQtCKStyle::stylePixmap( StylePixmap stylepixmap, } -int TQtCKStyle::tqstyleHint( StyleHint sh, const TQWidget* w, +int TQtCKStyle::styleHint( StyleHint sh, const TQWidget* w, const TQStyleOption &opt, TQStyleHintReturn* shr) const { switch (sh) @@ -1617,7 +1617,7 @@ int TQtCKStyle::tqstyleHint( 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 TQMIN( 100, d->popupMenuDelay ); else return d->popupMenuDelay; @@ -1653,7 +1653,7 @@ int TQtCKStyle::tqstyleHint( StyleHint sh, const TQWidget* w, } default: - return TQCommonStyle::tqstyleHint(sh, w, opt, shr); + return TQCommonStyle::styleHint(sh, w, opt, shr); } } |