Rename a number of old tq methods that are no longer tq specific

9 files changed, 29 insertions, 29 deletions

diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp
index 416ab10..78767c2 100644
--- a/libk3b/cddb/k3bcddb.cpp
+++ b/libk3b/cddb/k3bcddb.cpp
@@ -187,7 +187,7 @@ K3bCddbQuery* K3bCddb::getQuery( const TQString& s )
     }
 
     m_httpQuery->setServer( server, port );
-    m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::tqfromLatin1("/~cddb/cddb.cgi") );
+    m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::fromLatin1("/~cddb/cddb.cgi") );
 
     return m_httpQuery;
   }
diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp
index f3b9152..45af445 100644
--- a/libk3b/cddb/k3bcddbhttpquery.cpp
+++ b/libk3b/cddb/k3bcddbhttpquery.cpp
@@ -21,7 +21,7 @@
 
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -58,7 +58,7 @@ void K3bCddbHttpQuery::doMatchQuery()
   m_state = READ;
   m_parsingBuffer.truncate(0);
 
-  performCommand( TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid ) );
+  performCommand( TQString( "cddb read %1 %2").arg( header().category ).arg( header().discid ) );
 }
 
 
@@ -82,7 +82,7 @@ void K3bCddbHttpQuery::performCommand( const TQString& cmd )
 
   if( !job ) {
     setError( CONNECTION_ERROR );
-    emit infoMessage( i18n("Could not connect to host %1").tqarg(m_server) );
+    emit infoMessage( i18n("Could not connect to host %1").arg(m_server) );
     emitQueryFinished();
     return;
   }
diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp
index 1c247dd..96ce176 100644
--- a/libk3b/cddb/k3bcddblocalquery.cpp
+++ b/libk3b/cddb/k3bcddblocalquery.cpp
@@ -18,7 +18,7 @@
 
 #include <tqdir.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kapplication.h>
 #include <klocale.h>
@@ -38,7 +38,7 @@ K3bCddbLocalQuery::~K3bCddbLocalQuery()
 
 void K3bCddbLocalQuery::doQuery()
 {
-  emit infoMessage( i18n("Searching entry in %1").tqarg( m_cddbDir ) );
+  emit infoMessage( i18n("Searching entry in %1").arg( m_cddbDir ) );
   kapp->processEvents(); //BAD!
 
   TQString path = preparePath( m_cddbDir );
diff --git a/libk3b/cddb/k3bcddblocalsubmit.cpp b/libk3b/cddb/k3bcddblocalsubmit.cpp
index 3c401b1..294e413 100644
--- a/libk3b/cddb/k3bcddblocalsubmit.cpp
+++ b/libk3b/cddb/k3bcddblocalsubmit.cpp
@@ -19,7 +19,7 @@
 
 #include <tqdir.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -94,7 +94,7 @@ void K3bCddbLocalSubmit::doSubmit()
   else {
     kdDebug() << "(K3bCddbLocalSubmit) could not find directory: " << path << endl;
     setError( IO_ERROR );
-    emit infoMessage( i18n("Could not find directory: %1").tqarg(path) );
+    emit infoMessage( i18n("Could not find directory: %1").arg(path) );
     emit submitFinished( this );
   }
 }
diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp
index f8746b7..0e7a5bc 100644
--- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp
+++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp
@@ -16,7 +16,7 @@
 
 #include "k3bcddbmultientriesdialog.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 
@@ -29,13 +29,13 @@ K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* parent, const ch
   : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, parent, name ) 
 {
   TQFrame* frame = plainPage();
-  TQVBoxLayout* tqlayout = new TQVBoxLayout( frame );
-  tqlayout->setAutoAdd( true );
-  tqlayout->setSpacing( spacingHint() );
-  tqlayout->setMargin( 0 );
+  TQVBoxLayout* layout = new TQVBoxLayout( frame );
+  layout->setAutoAdd( true );
+  layout->setSpacing( spacingHint() );
+  layout->setMargin( 0 );
 
   TQLabel* infoLabel = new TQLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame );
-  infoLabel->tqsetAlignment( WordBreak );
+  infoLabel->setAlignment( WordBreak );
 
   m_listBox = new KListBox( frame, "list_box");
 
diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp
index bcd75be..74d318c 100644
--- a/libk3b/cddb/k3bcddbpquery.cpp
+++ b/libk3b/cddb/k3bcddbpquery.cpp
@@ -17,7 +17,7 @@
 
 #include <tqstringlist.h>
 #include <tqsocket.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -54,7 +54,7 @@ void K3bCddbpQuery::doQuery()
   // connect to the server
 
   m_socket->connectToHost( m_server, m_port );
-  emit infoMessage( i18n("Searching %1 on port %2").tqarg(m_server).tqarg(m_port) );
+  emit infoMessage( i18n("Searching %1 on port %2").arg(m_server).arg(m_port) );
 }
 
 
@@ -63,7 +63,7 @@ void K3bCddbpQuery::doMatchQuery()
   // we should still be connected
   // TODO: check this
 
-  TQString read = TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid );
+  TQString read = TQString( "cddb read %1 %2").arg( header().category ).arg( header().discid );
   
   m_state = READ;
   m_parsingBuffer = "";
@@ -258,16 +258,16 @@ void K3bCddbpQuery::slotError( int e )
 {
   switch(e) {
   case TQSocket::ErrConnectionRefused:
-    kdDebug() <<  i18n("Connection to %1 refused").tqarg( m_server ) << endl;
-    emit infoMessage( i18n("Connection to %1 refused").tqarg( m_server ) );
+    kdDebug() <<  i18n("Connection to %1 refused").arg( m_server ) << endl;
+    emit infoMessage( i18n("Connection to %1 refused").arg( m_server ) );
     break;
   case TQSocket::ErrHostNotFound:
-    kdDebug() <<  i18n("Could not find host %1").tqarg( m_server ) << endl;
-    emit infoMessage( i18n("Could not find host %1").tqarg( m_server ) );
+    kdDebug() <<  i18n("Could not find host %1").arg( m_server ) << endl;
+    emit infoMessage( i18n("Could not find host %1").arg( m_server ) );
     break;
   case TQSocket::ErrSocketRead:
-    kdDebug() <<  i18n("Error while reading from %1").tqarg( m_server ) << endl;
-    emit infoMessage( i18n("Error while reading from %1").tqarg( m_server ) );
+    kdDebug() <<  i18n("Error while reading from %1").arg( m_server ) << endl;
+    emit infoMessage( i18n("Error while reading from %1").arg( m_server ) );
     break;
   }
 
diff --git a/libk3b/cddb/k3bcddbpquery.h b/libk3b/cddb/k3bcddbpquery.h
index d0a12bc..2a9b87b 100644
--- a/libk3b/cddb/k3bcddbpquery.h
+++ b/libk3b/cddb/k3bcddbpquery.h
@@ -21,7 +21,7 @@
 
 #include <tqstring.h>
 #include <tqvaluelist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 class TQSocket;
 
diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp
index e4ccc75..ffd4e20 100644
--- a/libk3b/cddb/k3bcddbquery.cpp
+++ b/libk3b/cddb/k3bcddbquery.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
 #include <tqtimer.h>
@@ -226,7 +226,7 @@ TQString K3bCddbQuery::handshakeString() const
   if( host.isEmpty() )
     host = "kde-host";
   
-  return TQString("%1 %2 K3b %3").tqarg(user).tqarg(host).tqarg(kapp->aboutData()->version());
+  return TQString("%1 %2 K3b %3").arg(user).arg(host).arg(kapp->aboutData()->version());
 }
 
 
@@ -238,10 +238,10 @@ TQString K3bCddbQuery::queryString() const
     + TQString::number( (unsigned int)m_toc.count() );
   
   for( K3bDevice::Toc::const_iterator it = m_toc.begin(); it != m_toc.end(); ++it ) {
-    query.append( TQString( " %1" ).tqarg( (*it).firstSector().lba() ) );
+    query.append( TQString( " %1" ).arg( (*it).firstSector().lba() ) );
   }
   
-  query.append( TQString( " %1" ).tqarg( m_toc.length().lba() / 75 ) );
+  query.append( TQString( " %1" ).arg( m_toc.length().lba() / 75 ) );
   
   return query;
 }
diff --git a/libk3b/cddb/k3bcddbquery.h b/libk3b/cddb/k3bcddbquery.h
index 6d75262..3d81383 100644
--- a/libk3b/cddb/k3bcddbquery.h
+++ b/libk3b/cddb/k3bcddbquery.h
@@ -19,7 +19,7 @@
 
 #include <tqobject.h>
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "k3bcddbresult.h"