Remove additional unneeded tq method conversions

(cherry picked from commit 74c05bbf9d92e43a6cf3799355b5f3598884409e)

11 files changed, 27 insertions, 27 deletions

diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp
index 78e83f76..90ebde37 100644
--- a/kmrml/kmrml/kcontrol/indexer.cpp
+++ b/kmrml/kmrml/kcontrol/indexer.cpp
@@ -112,7 +112,7 @@ void Indexer::processNext()
          *m_process << *it;
 #endif
 
-    emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").tqarg( m_currentDir ));
+    emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").arg( m_currentDir ));
     m_process->start();
 }
 
@@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc )
                     if ( ok )
                     {
                         uint dirsLeft = m_dirs.count();
-                        TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").tqarg( m_dirCount - dirsLeft ).tqarg( m_dirCount).tqarg( m_currentDir ).tqarg( currentFile ).tqarg( numFiles );
+                        TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").arg( m_dirCount - dirsLeft ).arg( m_dirCount).arg( m_currentDir ).arg( currentFile ).arg( numFiles );
                         emit progress( perc, message );
                     }
                 }
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index ea922913..77ed52c1 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -465,7 +465,7 @@ void MainPage::slotIndexingFinished( int returnCode )
             if ( err )
                 syserr = TQString::fromLocal8Bit( err );
             else
-                syserr = i18n("Unknown error: %1").tqarg( returnCode );
+                syserr = i18n("Unknown error: %1").arg( returnCode );
         }
 
         KMessageBox::detailedError( this, i18n("An error occurred during indexing. The index might be invalid."),
diff --git a/kmrml/kmrml/lib/mrml_shared.cpp b/kmrml/kmrml/lib/mrml_shared.cpp
index 932010f6..3e7d6d95 100644
--- a/kmrml/kmrml/lib/mrml_shared.cpp
+++ b/kmrml/kmrml/lib/mrml_shared.cpp
@@ -53,7 +53,7 @@ const TQString * MrmlShared::m_element = 0L;
 const TQString * MrmlShared::m_attribute = 0L;
 const TQString * MrmlShared::m_attributeName = 0L;
 const TQString * MrmlShared::m_attributeValue = 0L;
-const TQString * MrmlShared::m_tqchildren = 0L;
+const TQString * MrmlShared::m_children = 0L;
 const TQString * MrmlShared::m_none = 0L;
 
 const TQString * MrmlShared::m_multiSet = 0L;
@@ -141,7 +141,7 @@ void MrmlShared::init()
     m_attribute = new TQString ( "attribute" ) ;
     m_attributeName = new TQString ( "attribute-name" ) ;
     m_attributeValue = new TQString ( "attribute-value" ) ;
-    m_tqchildren = new TQString ( "tqchildren" ) ;
+    m_children = new TQString ( "children" ) ;
     m_none = new TQString ( "none" ) ;
 
     m_multiSet = new TQString ( "multi-set" ) ;
@@ -215,7 +215,7 @@ void MrmlShared::cleanup()
     delete m_attribute;
     delete m_attributeName;
     delete m_attributeValue;
-    delete m_tqchildren;
+    delete m_children;
     delete m_none;
 
     delete m_visibility;
diff --git a/kmrml/kmrml/lib/mrml_shared.h b/kmrml/kmrml/lib/mrml_shared.h
index 175d5c3c..6ed2177a 100644
--- a/kmrml/kmrml/lib/mrml_shared.h
+++ b/kmrml/kmrml/lib/mrml_shared.h
@@ -76,7 +76,7 @@ public:
     static const TQString& attribute()           { return *m_attribute; }
     static const TQString& attributeName()       { return *m_attributeName; }
     static const TQString& attributeValue()      { return *m_attributeValue; }
-    static const TQString& tqchildren()            { return *m_tqchildren; }
+    static const TQString& children()            { return *m_children; }
     static const TQString& none()                { return *m_none; }
 
     static const TQString& visibility()          { return *m_visibility; }
@@ -139,7 +139,7 @@ private:
     static const TQString * m_attribute;
     static const TQString * m_attributeName;
     static const TQString * m_attributeValue;
-    static const TQString * m_tqchildren;
+    static const TQString * m_children;
     static const TQString * m_none;
 
     static const TQString * m_visibility;
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index 13f2fb66..3b19a171 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -216,11 +216,11 @@ bool Mrml::startSession( const KURL& url )
     // Wolfgang says, we shouldn't create an own session-id here, as gcc 2.95
     // apparently makes problems in exception handling somehow. So we simply
     // accept the server's session-id.
-    TQString msg = mrmlString( TQString() ).tqarg(
+    TQString msg = mrmlString( TQString() ).arg(
         "<open-session user-name=\"%1\" session-name=\"kio_mrml session\" /> \
          <get-algorithms />                                                  \
          <get-collections />                                                 \
-         </mrml>" ).tqarg( user( url ));
+         </mrml>" ).arg( user( url ));
 
     TQCString utf8 = msg.utf8();
 //     qDebug(":::Writing: %s", utf8.data());
@@ -240,13 +240,13 @@ TQString Mrml::mrmlString( const TQString& sessionId, const TQString& transactio
          </mrml>";
 
     if ( sessionId.isEmpty() ) // when we don't have one yet
-        return msg.tqarg( "<mrml>%1" );
+        return msg.arg( "<mrml>%1" );
 
     if ( transactionId.isNull() )
-        return msg.tqarg( "<mrml session-id=\"%1\">%1" ).tqarg( sessionId );
+        return msg.arg( "<mrml session-id=\"%1\">%1" ).arg( sessionId );
     else
-        return msg.tqarg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
-                  .tqarg( sessionId ).tqarg( transactionId );
+        return msg.arg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
+                  .arg( sessionId ).arg( transactionId );
 }
 
 void Mrml::emitData( const TQCString& msg )
diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp
index 8700ed43..3fadcaba 100644
--- a/kmrml/kmrml/mrml_elements.cpp
+++ b/kmrml/kmrml/mrml_elements.cpp
@@ -28,7 +28,7 @@ using namespace KMrml;
 //
 // MrmlElement is currently the baseclass for Algorithm and Collection. Both
 // may have a single child-element <query-paradigm-list>, with a number of
-// <query-paradigm> elements as tqchildren.
+// <query-paradigm> elements as children.
 //
 
 MrmlElement::MrmlElement( const TQDomElement& elem )
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index b2b4b78e..89acbd2e 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -310,7 +310,7 @@ void MrmlPart::contactServer( const KURL& url )
     TQString host = url.host().isEmpty() ?
                    TQString::fromLatin1("localhost") : url.host();
 
-    slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host ));
+    slotSetStatusBar( i18n("Connecting to indexing server at %1...").arg( host ));
 }
 
 //
@@ -495,7 +495,7 @@ void MrmlPart::parseMrml( TQDomDocument& doc )
                 else if ( tagName == "error" ) {
                     KMessageBox::information( widget(),
                                        i18n("Server returned error:\n%1\n")
-                                       .tqarg( elem.attribute( "message" )),
+                                       .arg( elem.attribute( "message" )),
                                               i18n("Server Error") );
                 }
 
diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp
index fa70124b..2fed1bcb 100644
--- a/kmrml/kmrml/mrml_view.cpp
+++ b/kmrml/kmrml/mrml_view.cpp
@@ -307,10 +307,10 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL,
     /*
     if ( similarity > -1 )
         TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>")
-                       .tqarg( url )
-                       .tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity))));
+                       .arg( url )
+                       .arg(i18n("Similarity: %1").arg( TQString::number(similarity))));
     else
-        TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").tqarg( url ) );
+        TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").arg( url ) );
     */
 
     setMinimumSize( 130, 130 ); // ###
diff --git a/kmrml/kmrml/propertysheet.cpp b/kmrml/kmrml/propertysheet.cpp
index dba9d531..af913558 100644
--- a/kmrml/kmrml/propertysheet.cpp
+++ b/kmrml/kmrml/propertysheet.cpp
@@ -98,10 +98,10 @@ void PropertySheet::initFromDOM( const TQDomElement& elem )
     m_minSubsetSize = toInt( elem.attribute( MrmlShared::minSubsetSize() ));
     m_maxSubsetSize = toInt( elem.attribute( MrmlShared::maxSubsetSize() ));
 
-    TQValueList<TQDomElement> tqchildren =
+    TQValueList<TQDomElement> children =
         KMrml::directChildElements( elem, MrmlShared::propertySheet() );
-    TQValueListConstIterator<TQDomElement> it = tqchildren.begin();
-    for ( ; it != tqchildren.end(); ++it )
+    TQValueListConstIterator<TQDomElement> it = children.begin();
+    for ( ; it != children.end(); ++it )
         m_subSheets.append( new PropertySheet( *it ) );
 }
 
@@ -190,7 +190,7 @@ PropertySheet::SendType PropertySheet::getSendType( const TQString& value )
         type = AttributeName;
     else if ( value == MrmlShared::attributeValue() )
         type = AttributeValue;
-    else if ( value == MrmlShared::tqchildren() )
+    else if ( value == MrmlShared::children() )
         type = Children;
     else if ( value == MrmlShared::none() )
         type = None;
diff --git a/kmrml/kmrml/propertysheet.h b/kmrml/kmrml/propertysheet.h
index 2e20cb85..e4759282 100644
--- a/kmrml/kmrml/propertysheet.h
+++ b/kmrml/kmrml/propertysheet.h
@@ -34,7 +34,7 @@ namespace KMrml
         {
             MultiSet = 1,       // ??
             Subset,             // radio-button/combobox or listbox
-            SetElement,         // CheckBox -> disables/enables tqchildren?
+            SetElement,         // CheckBox -> disables/enables children?
             Boolean,            // CheckBox
             Numeric,            // Slider/Spinbox
             Textual,            // lineedit
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index 60b37c48..2188d1b5 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -146,7 +146,7 @@ void Watcher::slotProcExited( KProcess *proc )
                              i18n("<qt>The server with the command line"
                                   "<br>%1<br>"
                                   "is not available anymore. Do you want to "
-                                  "restart it?" ).tqarg( daemon->commandline ),
+                                  "restart it?" ).arg( daemon->commandline ),
                                             i18n("Service Failure"), i18n("Restart Server"), i18n("Do Not Restart") )
                  == KMessageBox::Yes )
             {
@@ -175,7 +175,7 @@ bool Watcher::startDaemon( DaemonData *daemon )
                       i18n("Unable to start the server with the "
                            "command line"
                            "<br>%1<br>"
-                          "Try again?").tqarg( daemon->commandline ),
+                          "Try again?").arg( daemon->commandline ),
                                          i18n("Service Failure"), i18n("Try Again"), i18n("Do Not Try") )
              == KMessageBox::Yes )
         {