1 files changed, 18 insertions, 18 deletions

diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp
index bf69f853..eee89d87 100644
--- a/libkcddb/cdinfo.cpp
+++ b/libkcddb/cdinfo.cpp
@@ -177,7 +177,7 @@ namespace KCDDB
       }
     }
 
-    int slashPos = dtitle.find('/');
+    int slashPos = dtitle.tqfind('/');
 
     if (-1 == slashPos)
     {
@@ -198,7 +198,7 @@ namespace KCDDB
     return true;
   }
 
-    QString
+    TQString
   CDInfo::toString(bool submit) const
   {
     TQString s;
@@ -209,18 +209,18 @@ namespace KCDDB
     if (submit)
     {
       s += "#\n";
-      s += TQString("# Submitted via: %1 %2\n").arg(CDDB::clientName(),
+      s += TQString("# Submitted via: %1 %2\n").tqarg(CDDB::clientName(),
         CDDB::clientVersion());
     }
 
     s += "DISCID=" + escape( id ) + "\n";
     s += createLine("DTITLE",escape( artist ) + " / " + escape( title ));
-    s += "DYEAR=" + (0 == year ? TQString::null : TQString::number(year)) + "\n";
+    s += "DYEAR=" + (0 == year ? TQString() : TQString::number(year)) + "\n";
     s += createLine("DGENRE",escape( genre ));
 
     for (uint i = 0; i < trackInfoList.count(); ++i)
     {
-      s += createLine(TQString("TTITLE%1").arg(i), 
+      s += createLine(TQString("TTITLE%1").tqarg(i), 
                 escape( trackInfoList[ i ].title));
     }
 
@@ -228,7 +228,7 @@ namespace KCDDB
 
     for (uint i = 0; i < trackInfoList.count(); ++i)
     {
-      s += createLine(TQString("EXTT%1").arg(i), escape(trackInfoList[i].extt));
+      s += createLine(TQString("EXTT%1").tqarg(i), escape(trackInfoList[i].extt));
     }
 
     s +="PLAYORDER=\n";
@@ -238,7 +238,7 @@ namespace KCDDB
 
   // Creates a line in the form NAME=VALUE, and splits it into several
   // lines if the line gets longer than 256 chars
-    QString
+    TQString
   CDInfo::createLine(const TQString& name, const TQString& value) const
   {
     Q_ASSERT(name.length() < 254);
@@ -251,11 +251,11 @@ namespace KCDDB
 
     while (tmpValue.length() > maxLength)
     {
-      lines += TQString("%1=%2\n").arg(name,tmpValue.left(maxLength));
+      lines += TQString("%1=%2\n").tqarg(name,tmpValue.left(maxLength));
       tmpValue = tmpValue.mid(maxLength);
     }
 
-    lines += TQString("%1=%2\n").arg(name,tmpValue);
+    lines += TQString("%1=%2\n").tqarg(name,tmpValue);
 
     return lines;
   }
@@ -270,25 +270,25 @@ namespace KCDDB
     }
   }
 
-    QString
+    TQString
   CDInfo::escape( const TQString& value )
   {
     TQString s = value;
-    s.replace( "\\", "\\\\" );
-    s.replace( "\n", "\\n" );
-    s.replace( "\t", "\\t" );
+    s.tqreplace( "\\", "\\\\" );
+    s.tqreplace( "\n", "\\n" );
+    s.tqreplace( "\t", "\\t" );
 
     return s;
   }
 
-    QString
+    TQString
   CDInfo::unescape( const TQString& value )
   {
     TQString s = value;
 
-    s.replace( "\\n", "\n" );
-    s.replace( "\\t", "\t" );
-    s.replace( "\\\\", "\\" );
+    s.tqreplace( "\\n", "\n" );
+    s.tqreplace( "\\t", "\t" );
+    s.tqreplace( "\\\\", "\\" );
 
     return s;
   }
@@ -296,7 +296,7 @@ namespace KCDDB
     void
   CDInfo::clear()
   {
-    id = artist = title = genre = extd = TQString::null;
+    id = artist = title = genre = extd = TQString();
     length = year = revision = 0;
     trackInfoList.clear();
   }