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

This reverts commit ef5831dd5c8811c94c9b1bc1377a90174d17c82c.

6 files changed, 9 insertions, 9 deletions

diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp
index 33a256c..12e149d 100644
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
@@ -23,7 +23,7 @@
 #include <tqfileinfo.h>
 #include <tqobject.h>
 #include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <k3bprocess.h>
 #include <kdebug.h>
@@ -186,7 +186,7 @@ bool K3bCdrecordProgram::scan( const TQString& p )
     endPos = out.output().find( "\n", pos );
 
     // cdrecord does not use local encoding for the copyright statement but plain latin1
-    bin->copyright = TQString::fromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace();
+    bin->copyright = TQString::tqfromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace();
   }
   else {
     kdDebug() << "(K3bCdrecordProgram) could not start " << path << endl;
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index c01e289..be9a7a1 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -169,7 +169,7 @@ TQString K3b::findUniqueFilePrefix( const TQString& _prefix, const TQString& pat
 
 TQString K3b::findTempFile( const TQString& ending, const TQString& d )
 {
-  return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::fromLatin1(".") + ending) );
+  return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::tqfromLatin1(".") + ending) );
 }
 
 
@@ -387,7 +387,7 @@ TQString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExter
   else if( (plainAtapiSupport() && bin->hasFeature("plain-atapi") ) )
     return dev->blockDeviceName();
   else
-    return TQString("ATAPI:%1").arg(dev->blockDeviceName());
+    return TQString("ATAPI:%1").tqarg(dev->blockDeviceName());
 }
 
 
diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h
index a5a738f..cbb4758 100644
--- a/libk3b/core/k3bjob.h
+++ b/libk3b/core/k3bjob.h
@@ -285,7 +285,7 @@ class LIBK3B_EXPORT K3bBurnJob : public K3bJob
   void setWritingApp( int w ) { m_writeMethod = w; }
 
  signals:
-  void bufferStatus( int );
+  void buffertqStatus( int );
 
   void deviceBuffer( int );
 
diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp
index c46fd0a..ca8d2e0 100644
--- a/libk3b/core/k3bprocess.cpp
+++ b/libk3b/core/k3bprocess.cpp
@@ -192,7 +192,7 @@ TQStringList K3bProcess::splitOutput( char* data, int len,
   // check if line ends with a newline
   // if not save the last line because it is not finished
   TQChar c = buffer.right(1).at(0);
-  bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) );  // What is unicode 46?? It is printed as a point
+  bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) );  // What is tqunicode 46?? It is printed as a point
   if( hasUnfinishedLine ) {
     kdDebug() << "(K3bProcess) found unfinished line: '" << lines.last() << "'" << endl;
     kdDebug() << "(K3bProcess)             last char: '" << buffer.right(1) << "'" << endl;
diff --git a/libk3b/core/k3bprogressinfoevent.h b/libk3b/core/k3bprogressinfoevent.h
index 3e0b67e..78e17a2 100644
--- a/libk3b/core/k3bprogressinfoevent.h
+++ b/libk3b/core/k3bprogressinfoevent.h
@@ -69,7 +69,7 @@ class K3bProgressInfoEvent : public TQCustomEvent
     NewTask,
     NewSubTask,
     DebuggingOutput,
-    BufferStatus,
+    BuffertqStatus,
     WriteSpeed,
     NextTrack
   };
diff --git a/libk3b/core/k3bversion.cpp b/libk3b/core/k3bversion.cpp
index cc91dd5..0eb6f19 100644
--- a/libk3b/core/k3bversion.cpp
+++ b/libk3b/core/k3bversion.cpp
@@ -157,9 +157,9 @@ TQString K3bVersion::createVersionString( int majorVersion,
     TQString s = TQString::number(majorVersion);
     
     if( minorVersion > -1 ) {
-      s.append( TQString(".%1").arg(minorVersion) );
+      s.append( TQString(".%1").tqarg(minorVersion) );
       if( patchlevel > -1 )
-	s.append( TQString(".%1").arg(patchlevel) );
+	s.append( TQString(".%1").tqarg(patchlevel) );
     }
     
     if( !suffix.isNull() )