Remove additional unneeded tq method conversions

(cherry picked from commit 7e66d7c3611d907ea28b140281b472bb1c406be6)

13 files changed, 28 insertions, 28 deletions

diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp
index 26677de6..6ff099e4 100644
--- a/lib/widgets/fancylistviewitem.cpp
+++ b/lib/widgets/fancylistviewitem.cpp
@@ -129,7 +129,7 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg,
             else if ( align & AlignTop )
                 yo = 0;
 
-// respect horizontal tqalignment when there is no text for an item.
+// respect horizontal alignment when there is no text for an item.
             if ( t.isEmpty() ) {
                 if ( align & AlignRight )
                     xo = width - 2 * marg - iconWidth;
diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp
index 000b5169..9905685f 100644
--- a/lib/widgets/flagboxes.cpp
+++ b/lib/widgets/flagboxes.cpp
@@ -624,7 +624,7 @@ void FlagSpinEdit::setText( const TQString text )
 
 TQString FlagSpinEdit::text( )
 {
-    return TQString("%1").tqarg(spb->value());
+    return TQString("%1").arg(spb->value());
 }
 
 TQString FlagSpinEdit::flags( )
diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp
index 704bb9ce..56321450 100644
--- a/lib/widgets/processwidget.cpp
+++ b/lib/widgets/processwidget.cpp
@@ -227,7 +227,7 @@ void ProcessWidget::childFinished(bool normal, int status)
 
     if (normal) {
         if (status) {
-            s = i18n("*** Exited with status: %1 ***").tqarg(status);
+            s = i18n("*** Exited with status: %1 ***").arg(status);
             t = ProcessListBoxItem::Error;
         } else {
             s = i18n("*** Exited normally ***");
diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp
index 753af410..99b0151e 100644
--- a/lib/widgets/propeditor/pdoublenuminput.cpp
+++ b/lib/widgets/propeditor/pdoublenuminput.cpp
@@ -78,7 +78,7 @@ void PDoubleNumInput::updateProperty(double val)
 void PDoubleNumInput::updateProperty(int val)
 {
 #ifdef PURE_QT
-    TQString format = TQString("%.%1f").tqarg( m_edit->digits() );
+    TQString format = TQString("%.%1f").arg( m_edit->digits() );
     TQString strVal = TQString().sprintf(format.latin1(),
                                        (val/(float)pow(m_edit->digits(),10)) );
     emit propertyChanged(m_property, TQVariant(strVal));
diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index 82a96e9c..67c86995 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -61,7 +61,7 @@ void PFontButton::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect&
     p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
         fi.family() + (fi.bold() ? i18n(" Bold") : TQString("")) +
         (fi.italic() ? i18n(" Italic") : TQString("")) +
-        " " + TQString("%1").tqarg(fi.pointSize()) );
+        " " + TQString("%1").arg(fi.pointSize()) );
 }
 
 void PFontButton::setValue(const TQVariant& value, bool emitChange)
diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp
index 64a823a9..d02d9dcc 100644
--- a/lib/widgets/propeditor/ppointedit.cpp
+++ b/lib/widgets/propeditor/ppointedit.cpp
@@ -45,13 +45,13 @@ void PPointEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect&
     p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
 }
 
 void PPointEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
+    m_edit->setText(TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp
index dbc35ae5..6be2da82 100644
--- a/lib/widgets/propeditor/prectedit.cpp
+++ b/lib/widgets/propeditor/prectedit.cpp
@@ -45,13 +45,13 @@ void PRectEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r
     p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height()));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
 }
 
 void PRectEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height()));
+    m_edit->setText(TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index 4c5c8b16..a1bd9406 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -270,7 +270,7 @@ void PropertyEditor::addChildProperties(PropertyItem *parent)
         machine(prop);
     }
 
-//     qWarning("seeking tqchildren: count: %d", prop->details.count());
+//     qWarning("seeking children: count: %d", prop->details.count());
 
     parent->setOpen(true);
     for (TQValueList<ChildProperty>::iterator it = prop->details.begin(); it != prop->details.end(); ++it)
@@ -301,7 +301,7 @@ void PropertyEditor::propertyValueChanged(Property *property)
         m_currentEditWidget->setValue(property->value(), false);
     else
     {
-//        tqrepaint all items
+//        repaint all items
         TQListViewItemIterator it(this);
         while (it.current())
         {
@@ -386,7 +386,7 @@ void PropertyEditor::placeEditor(PropertyItem *item)
         m_currentEditLayout->addWidget(editor, 0, 0);
         m_currentEditLayout->addWidget(m_undoButton, 0, 1);
         m_currentEditArea->resize(r.size());
-//        m_currentEditLayout->tqinvalidate();
+//        m_currentEditLayout->invalidate();
         moveChild(m_currentEditArea, r.x(), r.y());
         m_currentEditWidget = editor;
     }
diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp
index c4d28402..a39bd9fd 100644
--- a/lib/widgets/propeditor/psizeedit.cpp
+++ b/lib/widgets/propeditor/psizeedit.cpp
@@ -46,13 +46,13 @@ void PSizeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r
     p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
 }
 
 void PSizeEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
+    m_edit->setText(TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp
index d9ec7869..652fc616 100644
--- a/lib/widgets/propeditor/psizepolicyedit.cpp
+++ b/lib/widgets/propeditor/psizepolicyedit.cpp
@@ -47,13 +47,13 @@ void PSizePolicyEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQR
     p->setPen(TQt::NoPen);
     p->setBrush(cg.background());
     p->drawRect(r);
-    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch()));
+    p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
 }
 
 void PSizePolicyEdit::setValue(const TQVariant& value, bool emitChange)
 {
     m_value = value;
-    m_edit->setText(TQString("%1/%2/%3/%4").tqarg(findValueDescription(value.toSizePolicy().horData())).tqarg(findValueDescription(value.toSizePolicy().verData())).tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch()));
+    m_edit->setText(TQString("%1/%2/%3/%4").arg(findValueDescription(value.toSizePolicy().horData())).arg(findValueDescription(value.toSizePolicy().verData())).arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
 
     if (emitChange)
         emit propertyChanged(m_property, value);
diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp
index 6116ca8c..6000d96a 100644
--- a/lib/widgets/propeditor/psymbolcombo.cpp
+++ b/lib/widgets/propeditor/psymbolcombo.cpp
@@ -58,7 +58,7 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char
 TQVariant PSymbolCombo::value() const
 {
     if (!(m_edit->text().isNull()))
-        return TQVariant(TQString("%1").tqarg(m_edit->text().tqat(0).tqunicode()));
+        return TQVariant(TQString("%1").arg(m_edit->text().at(0).tqunicode()));
     else
         return TQVariant(0);
 }
@@ -109,7 +109,7 @@ void PSymbolCombo::selectChar()
 
 void PSymbolCombo::updateProperty(const TQString& val)
 {
-    emit propertyChanged(m_property, TQVariant(TQString("%1").tqarg(val.tqat(0).tqunicode())));
+    emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).tqunicode())));
 }
 
 void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
diff --git a/lib/widgets/propeditor/qfloatinput.cpp b/lib/widgets/propeditor/qfloatinput.cpp
index 1922ea6a..f2fefed8 100644
--- a/lib/widgets/propeditor/qfloatinput.cpp
+++ b/lib/widgets/propeditor/qfloatinput.cpp
@@ -38,7 +38,7 @@ TQFloatInput::TQFloatInput( int min, int max, float step, int digits,
 
 TQString TQFloatInput::mapValueToText( int value )
 {
-    TQString format = TQString("%.%1f").tqarg( m_digits );
+    TQString format = TQString("%.%1f").arg( m_digits );
     return TQString().sprintf(format.latin1(),
                              (value/(float)pow(m_digits,10)) );
 }
diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp
index 99ce12e4..4db96f46 100644
--- a/lib/widgets/qcomboview.cpp
+++ b/lib/widgets/qcomboview.cpp
@@ -88,7 +88,7 @@ void QComboViewData::updateLinedGeometry()
     const TQPixmap *pix = combo->currentItem() ? combo->currentItem()->pixmap(0) : 0;
     if ( pix && pix->width() < r.width() )
         r.setLeft( r.left() + pix->width() + 4 );
-    if ( r != ed->tqgeometry() )
+    if ( r != ed->geometry() )
         ed->setGeometry( r );
 }
 
@@ -269,7 +269,7 @@ void QComboView::setAutoResize( bool enable )
     reimp
 
     This implementation caches the size hint to avoid resizing when
-    the contents change dynamically. To tqinvalidate the cached value
+    the contents change dynamically. To invalidate the cached value
     call setFont().
 */
 TQSize QComboView::sizeHint() const
@@ -385,7 +385,7 @@ void QComboView::setPalette( const TQPalette &palette )
 
 void QComboView::setFont( const TQFont &font )
 {
-    d->sizeHint = TQSize();      // tqinvalidate size hint
+    d->sizeHint = TQSize();      // invalidate size hint
     TQWidget::setFont( font );
     d->listView()->setFont( font );
     if (d->ed)
@@ -489,7 +489,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e )
         if ( arrowRect.contains( e->pos() ) ) {
             d->arrowPressed = TRUE;
             d->arrowDown    = TRUE;
-            tqrepaint( FALSE );
+            repaint( FALSE );
         }
         TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout()));
         d->shortClick = TRUE;
@@ -808,7 +808,7 @@ void QComboView::popDownListView()
     d->listView()->setCurrentItem( d->current );
     if ( d->arrowDown ) {
         d->arrowDown = FALSE;
-        tqrepaint( FALSE );
+        repaint( FALSE );
     }
     d->poppedUp = FALSE;
 }
@@ -908,12 +908,12 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
                     if ( arrowRect.contains( comboPos ) ) {
                         if ( !d->arrowDown  ) {
                             d->arrowDown = TRUE;
-                            tqrepaint( FALSE );
+                            repaint( FALSE );
                         }
                         } else {
                         if ( d->arrowDown  ) {
                             d->arrowDown = FALSE;
-                            tqrepaint( FALSE );
+                            repaint( FALSE );
                         }
                     }
                 }
@@ -948,7 +948,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
                     d->arrowPressed = FALSE;
                     if ( d->arrowDown  ) {
                         d->arrowDown = FALSE;
-                        tqrepaint( FALSE );
+                        repaint( FALSE );
                     }
                 }
             }
@@ -1333,7 +1333,7 @@ bool QComboView::autoCompletion() const
  */
 void QComboView::styleChange( TQStyle& s )
 {
-    d->sizeHint = TQSize();		// tqinvalidate size hint...
+    d->sizeHint = TQSize();		// invalidate size hint...
     if ( d->ed )
         d->updateLinedGeometry();
     TQWidget::styleChange( s );