diff options
Diffstat (limited to 'style/lipstik.cpp')
| -rw-r--r-- | style/lipstik.cpp | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/style/lipstik.cpp b/style/lipstik.cpp index 4eb3d6f..b7ff52d 100644 --- a/style/lipstik.cpp +++ b/style/lipstik.cpp @@ -965,13 +965,13 @@ void LipstikStyle::renderPanel(TQPainter *p, p->setPen(g.mid()); p->drawConvexPolygon(TQPointArray(4, corners)); p->setPen(g.mid()); - p->drawPolyline(TQPointArray(4, corners), 0, 3); + p->tqdrawPolyline(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->drawPolyline(TQPointArray(4, corners), 0, 3); + p->tqdrawPolyline(TQPointArray(4, corners), 0, 3); } } else { renderContour(p, r, g.background(), getColor(g, PanelContour) ); @@ -1236,7 +1236,7 @@ void LipstikStyle::renderTab(TQPainter *p, // fake the panel border edge for tabs which are aligned left-most // (i.e. only if there is no widget in the corner of the tabwidget!) if(isFirst&&!reverseLayout&&!cornerWidget) - // normal layout + // normal tqlayout { if (!bottom) { p->setPen(alphaBlendColors(g.background(), getColor(g,PanelContour), 50) ); @@ -1258,7 +1258,7 @@ void LipstikStyle::renderTab(TQPainter *p, p->drawPoint(Rb.x()+1, Rb.bottom() ); } } else if(isFirst&&reverseLayout&&!cornerWidget) - // reverse layout + // reverse tqlayout { if (!bottom) { p->setPen(alphaBlendColors(g.background(), getColor(g,PanelContour), 50) ); @@ -2407,11 +2407,11 @@ void LipstikStyle::tqdrawPrimitive(PrimitiveElement pe, } } - const TQWMatrix oldMatrix( p->worldMatrix() ); + const TQWMatrix oldMatrix( p->tqworldMatrix() ); if (flags & Style_Down) { - p->translate(pixelMetric(PM_ButtonShiftHorizontal), - pixelMetric(PM_ButtonShiftVertical)); + p->translate(tqpixelMetric(PM_ButtonShiftHorizontal), + tqpixelMetric(PM_ButtonShiftVertical)); } a.translate((r.x()+r.width()/2), (r.y()+r.height()/2)); @@ -2452,7 +2452,7 @@ void LipstikStyle::tqdrawPrimitive(PrimitiveElement pe, } -void LipstikStyle::drawControl(ControlElement element, +void LipstikStyle::tqdrawControl(ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2614,7 +2614,7 @@ void LipstikStyle::drawControl(ControlElement element, if(cw) cornerWidget = true; } - TQTabBar::Shape tbs = tb->shape(); + TQTabBar::Shape tbs = tb->tqshape(); bool selected = false; if (flags & Style_Selected) selected = true; TabPosition pos; @@ -2650,7 +2650,7 @@ void LipstikStyle::drawControl(ControlElement element, renderTab(p, r, cg, mouseOver, selected, true, pos, false, cornerWidget); break; default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } break; @@ -2693,15 +2693,15 @@ void LipstikStyle::drawControl(ControlElement element, // Shift button contents if pushed. if ( active ) { - x += pixelMetric(PM_ButtonShiftHorizontal, widget); - y += pixelMetric(PM_ButtonShiftVertical, widget); + x += tqpixelMetric(PM_ButtonShiftHorizontal, widget); + y += tqpixelMetric(PM_ButtonShiftVertical, widget); flags |= Style_Sunken; } // Does the button have a popup menu? if ( button->isMenuButton() ) { - int dx = pixelMetric( PM_MenuButtonIndicator, widget ); + int dx = tqpixelMetric( PM_MenuButtonIndicator, widget ); if ( button->iconSet() && !button->iconSet()->isNull() && (dx + button->iconSet()->pixmap (TQIconSet::Small, TQIconSet::Normal, TQIconSet::Off ).width()) >= w ) { @@ -2710,7 +2710,7 @@ void LipstikStyle::drawControl(ControlElement element, else { p->setPen(cg.buttonText()); - tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ), + tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ), cg, flags, opt ); w -= dx; } @@ -2736,7 +2736,7 @@ void LipstikStyle::drawControl(ControlElement element, p->drawPixmap( x + 4, y + h / 2 - pixmap.height() / 2, pixmap ); if (cornArrow) //Draw over the icon - tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ), + tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ), cg, flags, opt ); @@ -2746,14 +2746,14 @@ void LipstikStyle::drawControl(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->colorGroup(), + drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->tqcolorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, - &button->colorGroup().buttonText() ); + &button->tqcolorGroup().buttonText() ); if ( flags & Style_HasFocus ) tqdrawPrimitive( PE_FocusRect, p, - visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), + tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, flags ); break; } @@ -2837,7 +2837,7 @@ void LipstikStyle::drawControl(ControlElement element, bool enabled = mi->isEnabled(); bool checkable = popupmenu->isCheckable(); bool active = flags & Style_Active; - bool etchtext = styleHint( SH_EtchDisabledText ); + bool etchtext = tqstyleHint( SH_EtchDisabledText ); bool reverse = TQApplication::reverseLayout(); if ( checkable ) @@ -2924,7 +2924,7 @@ void LipstikStyle::drawControl(ControlElement element, break; } - TQRect cr = visualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r ); + TQRect cr = tqvisualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r ); // Do we have an icon? if ( mi->iconSet() ) { @@ -3077,8 +3077,8 @@ void LipstikStyle::drawControl(ControlElement element, // Does the menu item have a submenu? if ( mi->popup() ) { PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; - int dim = pixelMetric(PM_MenuButtonIndicator) - 1; - TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim, + int dim = tqpixelMetric(PM_MenuButtonIndicator) - 1; + TQRect vr = tqvisualRect( 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 @@ -3124,11 +3124,11 @@ void LipstikStyle::drawControl(ControlElement element, break; default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } } -void LipstikStyle::drawControlMask(ControlElement element, +void LipstikStyle::tqdrawControlMask(ControlElement element, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -3143,12 +3143,12 @@ void LipstikStyle::drawControlMask(ControlElement element, } default: { - KStyle::drawControlMask (element, p, w, r, opt); + KStyle::tqdrawControlMask (element, p, w, r, opt); } } } -void LipstikStyle::drawComplexControlMask(ComplexControl c, +void LipstikStyle::tqdrawComplexControlMask(ComplexControl c, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -3164,12 +3164,12 @@ void LipstikStyle::drawComplexControlMask(ComplexControl c, break; } default: { - KStyle::drawComplexControlMask (c, p, w, r, o); + KStyle::tqdrawComplexControlMask (c, p, w, r, o); } } } -void LipstikStyle::drawComplexControl(ComplexControl control, +void LipstikStyle::tqdrawComplexControl(ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -3596,7 +3596,7 @@ void LipstikStyle::drawComplexControl(ComplexControl control, } default: - KStyle::drawComplexControl(control, p, widget, + KStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, opt); break; @@ -3701,15 +3701,15 @@ TQRect LipstikStyle::querySubControlMetrics(ComplexControl control, } } -int LipstikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const +int LipstikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const { switch(m) { // TABS // ---- case PM_TabBarTabVSpace: { const TQTabBar * tb = (const TQTabBar *) widget; - if (tb->shape() == TQTabBar::RoundedAbove || - tb->shape() == TQTabBar::RoundedBelow) + if (tb->tqshape() == TQTabBar::RoundedAbove || + tb->tqshape() == TQTabBar::RoundedBelow) return 12; else return 4; @@ -3813,7 +3813,7 @@ int LipstikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const } default: - return KStyle::pixelMetric(m, widget); + return KStyle::tqpixelMetric(m, widget); } } @@ -3835,8 +3835,8 @@ TQSize LipstikStyle::tqsizeFromContents(ContentsType t, bool checkable = popup->isCheckable(); if (mi->custom()) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if (!mi->custom()->fullSpan() ) h += 4; } else if (mi->widget()) { @@ -3882,8 +3882,8 @@ TQSize LipstikStyle::tqsizeFromContents(ContentsType t, { const TQPushButton* btn = static_cast<const TQPushButton*>(widget); - int w = s.width() + 2 * pixelMetric(PM_ButtonMargin, widget); - int h = s.height() + 2 * pixelMetric(PM_ButtonMargin, widget); + int w = s.width() + 2 * tqpixelMetric(PM_ButtonMargin, widget); + int h = s.height() + 2 * tqpixelMetric(PM_ButtonMargin, widget); if ( btn->text().isEmpty() && s.width() < 32 ) return TQSize(w, h); return TQSize( w+25, h+5 ); @@ -3904,7 +3904,7 @@ TQSize LipstikStyle::tqsizeFromContents(ContentsType t, return KStyle::tqsizeFromContents (t, widget, s, opt); } -int LipstikStyle::styleHint( StyleHint stylehint, +int LipstikStyle::tqstyleHint( StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, TQStyleHintReturn* returnData ) const @@ -3914,7 +3914,7 @@ int LipstikStyle::styleHint( StyleHint stylehint, return 96; // Motif-like delay... default: - return KStyle::styleHint(stylehint, widget, option, returnData); + return KStyle::tqstyleHint(stylehint, widget, option, returnData); } } @@ -3934,14 +3934,14 @@ bool LipstikStyle::eventFilter(TQObject *obj, TQEvent *ev) TQWidget* spinbox = widget->parentWidget(); if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut)) { - spinbox->repaint(false); + spinbox->tqrepaint(false); } return false; } if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut)) { - widget->repaint(false); + widget->tqrepaint(false); } return false; } @@ -3957,13 +3957,13 @@ bool LipstikStyle::eventFilter(TQObject *obj, TQEvent *ev) { TQWidget* button = TQT_TQWIDGET(obj); hoverWidget = button; - button->repaint(false); + button->tqrepaint(false); } else if ((ev->type() == TQEvent::Leave) && (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(hoverWidget)) ) { TQWidget* button = TQT_TQWIDGET(obj); hoverWidget = 0; - button->repaint(false); + button->tqrepaint(false); } return false; } @@ -3973,7 +3973,7 @@ bool LipstikStyle::eventFilter(TQObject *obj, TQEvent *ev) TQWidget* tabbar = TQT_TQWIDGET(obj); hoverWidget = tabbar; hoverTab = 0; - tabbar->repaint(false); + tabbar->tqrepaint(false); } else if (ev->type() == TQEvent::MouseMove) { @@ -3984,15 +3984,15 @@ bool LipstikStyle::eventFilter(TQObject *obj, TQEvent *ev) // avoid unnecessary repaints (which otherwise would occour on every // MouseMove event causing high cpu load). - bool repaint = true; + bool tqrepaint = true; TQTab *tab = tabbar->selectTab(me->pos() ); if (hoverTab == tab) - repaint = false; + tqrepaint = false; hoverTab = tab; - if (repaint) - tabbar->repaint(false); + if (tqrepaint) + tabbar->tqrepaint(false); } } else if (ev->type() == TQEvent::Leave) @@ -4000,7 +4000,7 @@ bool LipstikStyle::eventFilter(TQObject *obj, TQEvent *ev) TQWidget* tabbar = TQT_TQWIDGET(obj); hoverWidget = 0; hoverTab = 0; - tabbar->repaint(false); + tabbar->tqrepaint(false); } return false; } |