From 746abe84406ed1ec1a8dc68f29ce0ab8322ccc80 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:55:10 -0600 Subject: Remove additional unneeded tq method conversions --- libtdeedu/extdate/extdatepicker.cpp | 2 +- libtdeedu/extdate/extdatetbl.cpp | 4 ++-- libtdeedu/extdate/extdatetimeedit.cpp | 36 +++++++++++++++++------------------ libtdeedu/tdeeduplot/kplotwidget.cpp | 4 ++-- libtdeedu/tdeeduplot/kplotwidget.h | 2 +- libtdeedu/tdeeduui/tdeeduglossary.cpp | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) (limited to 'libtdeedu') diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp index 62186fde..5557b8fd 100644 --- a/libtdeedu/extdate/extdatepicker.cpp +++ b/libtdeedu/extdate/extdatepicker.cpp @@ -77,7 +77,7 @@ void ExtDatePicker::fillWeeksCombo(const ExtDate &date) for (; day <= lastDay; day = d->calendar->addDays(day, 7 /*calendar->daysOfWeek()*/) ) { int year = 0; - TQString week = i18n("Week %1").tqarg(d->calendar->weekNumber(day, &year)); + TQString week = i18n("Week %1").arg(d->calendar->weekNumber(day, &year)); if ( year != date.year() ) week += "*"; // show that this is a week from a different year d->selectWeek->insertItem(week); } diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp index b3dc27bd..78c7c9a8 100644 --- a/libtdeedu/extdate/extdatetbl.cpp +++ b/libtdeedu/extdate/extdatetbl.cpp @@ -779,7 +779,7 @@ ExtDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) updateCell( row, col /*, false */ ); // mark the new active cell } } - if ( tmpRow > -1 ) // tqrepaint the former active cell + if ( tmpRow > -1 ) // repaint the former active cell updateCell( tmpRow, tmpCol /*, true */ ); } } @@ -947,7 +947,7 @@ int KPopupFrame::exec(TQPoint pos) { popup(pos); - tqrepaint(); + repaint(); tqApp->enter_loop(); hide(); return result; diff --git a/libtdeedu/extdate/extdatetimeedit.cpp b/libtdeedu/extdate/extdatetimeedit.cpp index 2d75c12a..b2468107 100644 --- a/libtdeedu/extdate/extdatetimeedit.cpp +++ b/libtdeedu/extdate/extdatetimeedit.cpp @@ -295,7 +295,7 @@ public: TQRect r( rect.x(), rect.y(), rect.width() - 2 * ( 2 + fw ), rect.height() ); parag->pseudoDocument()->docRect = r; - parag->tqinvalidate(0); + parag->invalidate(0); parag->format(); int xoff = 2 + fw - offset; @@ -465,7 +465,7 @@ void ExtDateTimeEditor::mousePressEvent( TQMouseEvent *e ) int sec = sectionAt( p ); if ( sec != -1 ) { cw->setFocusSection( sec ); - tqrepaint( rect(), FALSE ); + repaint( rect(), FALSE ); } } @@ -481,13 +481,13 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) case Key_Right: if ( d->focusSection() < (int)d->sectionCount()-1 ) { if ( cw->setFocusSection( focusSection()+1 ) ) - tqrepaint( rect(), FALSE ); + repaint( rect(), FALSE ); } return TRUE; case Key_Left: if ( d->focusSection() > 0 ) { if ( cw->setFocusSection( focusSection()-1 ) ) - tqrepaint( rect(), FALSE ); + repaint( rect(), FALSE ); } return TRUE; case Key_Up: @@ -547,7 +547,7 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) // do the same thing as KEY_RIGHT when the user presses the separator key if ( d->focusSection() < 2 ) { if ( cw->setFocusSection( focusSection()+1 ) ) - tqrepaint( rect(), FALSE ); + repaint( rect(), FALSE ); } return TRUE; } else if ( !txt.isEmpty() && ::tqqt_cast(cw) && focusSection() == (int) d->sectionCount()-1 ) { @@ -1133,7 +1133,7 @@ void ExtDateEdit::setOrder( ExtDateEdit::Order order ) } if ( isVisible() ) - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), FALSE ); } @@ -1171,7 +1171,7 @@ void ExtDateEdit::stepUp() emit valueChanged( date() ); } - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), FALSE ); } @@ -1205,7 +1205,7 @@ void ExtDateEdit::stepDown() emit valueChanged( date() ); } - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), FALSE ); } /*! @@ -1292,7 +1292,7 @@ void ExtDateEdit::setDate( const ExtDate& date ) emit valueChanged( date ); } d->changed = FALSE; - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), FALSE ); } ExtDate ExtDateEdit::date() const @@ -1428,7 +1428,7 @@ void ExtDateEdit::addNumber( int sec, int num ) } d->overwrite = overwrite; d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), FALSE ); } @@ -1581,7 +1581,7 @@ void ExtDateEdit::removeFirstNumber( int sec ) d->d = txt.toInt(); d->dayCache = d->d; } - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), FALSE ); } /*! \reimp @@ -1607,7 +1607,7 @@ void ExtDateEdit::removeLastNumber( int sec ) d->d = txt.toInt(); d->dayCache = d->d; } - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), FALSE ); } /*! @@ -1882,7 +1882,7 @@ public: // emit valueChanged( time ); // } // d->changed = FALSE; -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // TQTime TQTimeEdit::time() const @@ -2012,7 +2012,7 @@ public: // d->changed = TRUE; // emit valueChanged( time() ); // } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // @@ -2061,7 +2061,7 @@ public: // d->changed = TRUE; // emit valueChanged( time() ); // } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // @@ -2343,7 +2343,7 @@ public: // emit valueChanged( time() ); // d->overwrite = overwrite; // d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // @@ -2383,7 +2383,7 @@ public: // d->s = txt.toInt(); // break; // } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // /*! \reimp @@ -2418,7 +2418,7 @@ public: // d->s = txt.toInt(); // break; // } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // /*! \reimp diff --git a/libtdeedu/tdeeduplot/kplotwidget.cpp b/libtdeedu/tdeeduplot/kplotwidget.cpp index 5f13de6e..3170b0a8 100644 --- a/libtdeedu/tdeeduplot/kplotwidget.cpp +++ b/libtdeedu/tdeeduplot/kplotwidget.cpp @@ -294,7 +294,7 @@ void KPlotWidget::drawBox( TQPainter *p ) { double lab = x0 + ix*dXtick; if ( fabs(lab)/dXtick < 0.00001 ) lab = 0.0; //fix occassional roundoff error with "0.0" label - TQString str = TQString( "%1" ).tqarg( lab, BottomAxis.labelFieldWidth(), BottomAxis.labelFmt(), BottomAxis.labelPrec() ); + TQString str = TQString( "%1" ).arg( lab, BottomAxis.labelFieldWidth(), BottomAxis.labelFmt(), BottomAxis.labelPrec() ); if ( px > 0 && px < PixRect.width() ) { TQRect r( px - BIGTICKSIZE, PixRect.height()+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); @@ -340,7 +340,7 @@ void KPlotWidget::drawBox( TQPainter *p ) { double lab = y0 + iy*dYtick; if ( fabs(lab)/dYtick < 0.00001 ) lab = 0.0; //fix occassional roundoff error with "0.0" label - TQString str = TQString( "%1" ).tqarg( lab, LeftAxis.labelFieldWidth(), LeftAxis.labelFmt(), LeftAxis.labelPrec() ); + TQString str = TQString( "%1" ).arg( lab, LeftAxis.labelFieldWidth(), LeftAxis.labelFmt(), LeftAxis.labelPrec() ); if ( py > 0 && py < PixRect.height() ) { TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); diff --git a/libtdeedu/tdeeduplot/kplotwidget.h b/libtdeedu/tdeeduplot/kplotwidget.h index c886bbaf..7dd3f1f4 100644 --- a/libtdeedu/tdeeduplot/kplotwidget.h +++ b/libtdeedu/tdeeduplot/kplotwidget.h @@ -213,7 +213,7 @@ public: KPlotAxis LeftAxis; protected: - /**@short the paint event handler, executed when update() or tqrepaint() is called. + /**@short the paint event handler, executed when update() or repaint() is called. */ virtual void paintEvent( TQPaintEvent* /* e */ ); diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp index 1e405abf..6b3c2843 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.cpp +++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp @@ -396,7 +396,7 @@ TQString GlossaryItem::parseReferences() const htmlcode += "
"; else first = false; - htmlcode += TQString( "%2" ).tqarg( m_ref[i], m_ref[i] ); + htmlcode += TQString( "%2" ).arg( m_ref[i], m_ref[i] ); } return htmlcode; -- cgit v1.2.1