diff options
Diffstat (limited to 'scheck')
| -rw-r--r-- | scheck/scheck.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp index b1fb9f9c..787c4221 100644 --- a/scheck/scheck.cpp +++ b/scheck/scheck.cpp @@ -900,10 +900,10 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget) return; } - const TQObjectList tqchildren = widget->childrenListObject(); - if (tqchildren.isEmpty()) + const TQObjectList children = widget->childrenListObject(); + if (children.isEmpty()) return; - TQObjectListIterator iter(tqchildren); + TQObjectListIterator iter(children); TQObject* walk; while ((walk = iter.current())) @@ -1846,13 +1846,13 @@ void StyleCheckStyle::drawControl( ControlElement element, { const TQCheckBox* checkbox = static_cast<const TQCheckBox*>(widget); - int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; + int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; TQValueVector<StyleGuideViolation> violations = checkSentenceStyle(checkbox->text()); - renderViolations(violations, p, r, tqalignment | AlignVCenter | ShowPrefix, checkbox->text()); + renderViolations(violations, p, r, alignment | AlignVCenter | ShowPrefix, checkbox->text()); - drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg, + drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg, flags & Style_Enabled, checkbox->pixmap(), removedXX(stripAccelViolations(checkbox->text()))); if (flags & Style_HasFocus) @@ -1867,13 +1867,13 @@ void StyleCheckStyle::drawControl( ControlElement element, { const TQRadioButton* rb = static_cast<const TQRadioButton*>(widget); - int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; + int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; TQValueVector<StyleGuideViolation> violations = checkSentenceStyle(rb->text()); - renderViolations(violations, p, r,tqalignment | AlignVCenter | ShowPrefix, rb->text()); + renderViolations(violations, p, r,alignment | AlignVCenter | ShowPrefix, rb->text()); - drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg, + drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg, flags & Style_Enabled, rb->pixmap(), removedXX(stripAccelViolations(rb->text()))); if (flags & Style_HasFocus) @@ -2571,7 +2571,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, } -// Fix TQt's wacky image tqalignment +// Fix TQt's wacky image alignment TQPixmap StyleCheckStyle::stylePixmap(StylePixmap stylepixmap, const TQWidget* widget, const TQStyleOption& opt) const @@ -2602,12 +2602,12 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) if ( (event->type() == TQEvent::Enter) && (button->isEnabled()) ) { hoverWidget = button; - button->tqrepaint( false ); + button->repaint( false ); } else if ( (event->type() == TQEvent::Leave) && (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) { hoverWidget = 0L; - button->tqrepaint( false ); + button->repaint( false ); } } @@ -2629,14 +2629,14 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) m = lb->fontMetrics().width('x') / 2 - lb->margin(); if ( m > 0 ) { - int hAlign = TQApplication::horizontalAlignment( lb->tqalignment() ); + int hAlign = TQApplication::horizontalAlignment( lb->alignment() ); if ( hAlign & AlignLeft ) cr.setLeft( cr.left() + m ); if ( hAlign & AlignRight ) cr.setRight( cr.right() - m ); - if ( lb->tqalignment() & AlignTop ) + if ( lb->alignment() & AlignTop ) cr.setTop( cr.top() + m ); - if ( lb->tqalignment() & AlignBottom ) + if ( lb->alignment() & AlignBottom ) cr.setBottom( cr.bottom() - m ); } @@ -2656,17 +2656,17 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) if (lb->buddy()) { - renderViolations(violations, &p, cr,lb->tqalignment() | ShowPrefix, lb->text() ); + renderViolations(violations, &p, cr,lb->alignment() | ShowPrefix, lb->text() ); // ordinary text or pixmap label - drawItem( &p, cr, lb->tqalignment(), lb->colorGroup(), lb->isEnabled(), + drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(), 0, removedXX(stripAccelViolations(lb->text())) ); } else { - renderViolations(violations, &p, cr,lb->tqalignment(), lb->text() ); + renderViolations(violations, &p, cr,lb->alignment(), lb->text() ); // ordinary text or pixmap label - drawItem( &p, cr, lb->tqalignment(), lb->colorGroup(), lb->isEnabled(), + drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(), 0, removedXX(stripAccelViolations(lb->text())) ); } @@ -2704,11 +2704,11 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) int h = fm.height(); int tw = fm.width( stripped_title, stripped_title.length() ) + 2*fm.width(TQChar(' ')); int x; - if ( gb->tqalignment() & AlignHCenter ) // center tqalignment + if ( gb->alignment() & AlignHCenter ) // center alignment x = gb->frameRect().width()/2 - tw/2; - else if ( gb->tqalignment() & AlignRight ) // right tqalignment + else if ( gb->alignment() & AlignRight ) // right alignment x = gb->frameRect().width() - tw - 8; - else if ( gb->tqalignment() & AlignLeft ) // left tqalignment + else if ( gb->alignment() & AlignLeft ) // left alignment x = 8; else { // auto align |