From 664a63eaba4c3706a655b4fb54310c8966d51b02 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kde-style-lipstik@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- style/lipstik.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/style/lipstik.cpp b/style/lipstik.cpp index aba9b7b..eca21f9 100644 --- a/style/lipstik.cpp +++ b/style/lipstik.cpp @@ -82,7 +82,7 @@ // some bitmaps for the radio button so it's easier to handle the circle stuff... // 13x13 -static const unsigned char radiobutton_tqmask_bits[] = { +static const unsigned char radiobutton_mask_bits[] = { 0xf8, 0x03, 0xfc, 0x07, 0xfe, 0x0f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07, 0xf8, 0x03}; @@ -1948,7 +1948,7 @@ void LipstikStyle::tqdrawPrimitive(PrimitiveElement pe, TQColor contentColor = enabled?cg.base():cg.background(); TQBitmap bmp; - bmp = TQBitmap(13, 13, radiobutton_tqmask_bits, true); + bmp = TQBitmap(13, 13, radiobutton_mask_bits, true); // first the surface... uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom|Is_Horizontal; if(!enabled) { @@ -2022,7 +2022,7 @@ void LipstikStyle::tqdrawPrimitive(PrimitiveElement pe, p->fillRect(r, color0); TQBitmap bmp; - bmp = TQBitmap(13, 13, radiobutton_tqmask_bits, true); + bmp = TQBitmap(13, 13, radiobutton_mask_bits, true); bmp.setMask(bmp); p->setPen(color1); p->drawPixmap(x, y, bmp); @@ -3370,7 +3370,7 @@ void LipstikStyle::tqdrawComplexControl(ComplexControl control, { // Tricky... (I'm lucky TQtCurve has already gone there... thanks Craig!) if (_drawToolBarGradient) { - const TQToolBar *tbar=widget->tqparentWidget() ? ::tqqt_cast(widget->tqparentWidget()) : NULL; + const TQToolBar *tbar=widget->parentWidget() ? ::tqqt_cast(widget->parentWidget()) : NULL; bool horizontal=false; if ( tbar != NULL ) { if ( Qt::Horizontal==tbar->orientation() ) { @@ -3400,15 +3400,15 @@ void LipstikStyle::tqdrawComplexControl(ComplexControl control, if (controls & SC_ToolButton) { // If we're pressed, on, or raised... if (bflags & (Style_Down | Style_On | Style_Raised) || widget==hoverWidget) { - if ( widget == hoverWidget && tb->tqparentWidget()->inherits( "KTabWidget" )) { + if ( widget == hoverWidget && tb->parentWidget()->inherits( "KTabWidget" )) { renderButton(p, r, cg, false, true, false, true, false ); } else { tqdrawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); } - } else if (tb->tqparentWidget() && - tb->tqparentWidget()->backgroundPixmap() && - !tb->tqparentWidget()->backgroundPixmap()->isNull()) { - TQPixmap pixmap = *(tb->tqparentWidget()->backgroundPixmap()); + } else if (tb->parentWidget() && + tb->parentWidget()->backgroundPixmap() && + !tb->parentWidget()->backgroundPixmap()->isNull()) { + TQPixmap pixmap = *(tb->parentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, tb->pos() ); } } @@ -3928,9 +3928,9 @@ bool LipstikStyle::eventFilter(TQObject *obj, TQEvent *ev) if ( ::tqqt_cast(obj) ) { TQWidget* widget = TQT_TQWIDGET(obj); - if ( ::tqqt_cast(widget->tqparentWidget()) ) + if ( ::tqqt_cast(widget->parentWidget()) ) { - TQWidget* spinbox = widget->tqparentWidget(); + TQWidget* spinbox = widget->parentWidget(); if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut)) { spinbox->tqrepaint(false);