From 9150603ad32928e9c514c0492a8518b742d82ac3 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: 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/kdesdk@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- scheck/bitmaps.h | 2 +- scheck/scheck.cpp | 22 +++++++++++----------- scheck/status.txt | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'scheck') diff --git a/scheck/bitmaps.h b/scheck/bitmaps.h index ec3829e0..6d0d280a 100644 --- a/scheck/bitmaps.h +++ b/scheck/bitmaps.h @@ -22,7 +22,7 @@ static const unsigned char radiooff_center_bits[] = { 0xfc, 0x07, 0xfc, 0x07, 0xfc, 0x07, 0xf8, 0x03, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char radiotqmask_bits[] = { +static const unsigned char radiomask_bits[] = { 0xf0, 0x01, 0xfc, 0x07, 0xfe, 0x0b, 0xfe, 0x0b, 0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xfe, 0x0b, 0xf2, 0x09, 0x0c, 0x06, 0xf0, 0x01}; diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp index 4e4dd724..0e4aa9c2 100644 --- a/scheck/scheck.cpp +++ b/scheck/scheck.cpp @@ -104,7 +104,7 @@ static TQBitmap lightBmp; static TQBitmap grayBmp; static TQBitmap dgrayBmp; static TQBitmap centerBmp; -static TQBitmap tqmaskBmp; +static TQBitmap maskBmp; static TQBitmap xBmp; static const int itemFrame = 1; @@ -991,7 +991,7 @@ void StyleCheckStyle::unPolish(TQWidget* widget) -// This function draws primitive elements as well as their tqmasks. +// This function draws primitive elements as well as their masks. void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQRect &r, @@ -1344,13 +1344,13 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, // RADIOBUTTON (exclusive indicator) tqmask // ------------------------------------------------------------------- case PE_ExclusiveIndicatorMask: { - if (tqmaskBmp.isNull()) { - tqmaskBmp = TQBitmap(13, 13, radiotqmask_bits, true); - tqmaskBmp.setMask(tqmaskBmp); + if (maskBmp.isNull()) { + maskBmp = TQBitmap(13, 13, radiomask_bits, true); + maskBmp.setMask(maskBmp); } p->setPen(TQt::color1); - p->drawPixmap(r.x(), r.y(), tqmaskBmp); + p->drawPixmap(r.x(), r.y(), maskBmp); break; } @@ -2323,11 +2323,11 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control, drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); // Check whether to draw a background pixmap - else if ( toolbutton->tqparentWidget() && - toolbutton->tqparentWidget()->backgroundPixmap() && - !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() ) + else if ( toolbutton->parentWidget() && + toolbutton->parentWidget()->backgroundPixmap() && + !toolbutton->parentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap()); + TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, toolbutton->pos() ); } else if (widget->tqparent()) @@ -2685,7 +2685,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) //Walk tqparent hierarchy to check whether any are groupboxes too.. TQObject* tqparent = TQT_TQOBJECT(gb); - // GCC suggested tqparentheses around assignment used as truth value + // GCC suggested parentheses around assignment used as truth value // I suggested that it could eat me. GCC won. while ( (tqparent = tqparent->tqparent()) ) { diff --git a/scheck/status.txt b/scheck/status.txt index d8e8376a..4860b230 100644 --- a/scheck/status.txt +++ b/scheck/status.txt @@ -31,7 +31,7 @@ other non heading/title text - Kind of -- hard to distinguish from title Other violations -Check for nested groupboxes. - Done, when tqparenting hierarchy isn't bizzare. +Check for nested groupboxes. - Done, when parenting hierarchy isn't bizzare. Other todo: -- cgit v1.2.1