1 files changed, 16 insertions, 16 deletions

diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp
index b540aaf1..a93b5996 100644
--- a/juk/tagguesser.cpp
+++ b/juk/tagguesser.cpp
@@ -23,7 +23,7 @@ FileNameScheme::FileNameScheme(const TQString &s)
     m_commentField(-1)
 {
     int fieldNumber = 1;
-    int i = s.find('%');
+    int i = s.tqfind('%');
     while (i > -1) {
         switch (s[ i + 1 ]) {
             case 't': m_titleField = fieldNumber++;
@@ -39,7 +39,7 @@ FileNameScheme::FileNameScheme(const TQString &s)
             default:
                       break;
         }
-        i = s.find('%', i + 1);
+        i = s.tqfind('%', i + 1);
     }
     m_regExp.setPattern(composeRegExp(s));
 }
@@ -50,42 +50,42 @@ bool FileNameScheme::matches(const TQString &fileName) const
      * does not work as a separator.
      */
     TQString stripped = fileName;
-    stripped.truncate(stripped.findRev('.'));
+    stripped.truncate(stripped.tqfindRev('.'));
     return m_regExp.exactMatch(stripped);
 }
 
 TQString FileNameScheme::title() const
 {
     if(m_titleField == -1)
-        return TQString::null;
+        return TQString();
     return m_regExp.capturedTexts()[ m_titleField ];
 }
 
 TQString FileNameScheme::artist() const
 {
     if(m_artistField == -1)
-        return TQString::null;
+        return TQString();
     return m_regExp.capturedTexts()[ m_artistField ];
 }
 
 TQString FileNameScheme::album() const
 {
     if(m_albumField == -1)
-        return TQString::null;
+        return TQString();
     return m_regExp.capturedTexts()[ m_albumField ];
 }
 
 TQString FileNameScheme::track() const
 {
     if(m_trackField == -1)
-        return TQString::null;
+        return TQString();
     return m_regExp.capturedTexts()[ m_trackField ];
 }
 
 TQString FileNameScheme::comment() const
 {
     if(m_commentField == -1)
-        return TQString::null;
+        return TQString();
     return m_regExp.capturedTexts()[ m_commentField ];
 }
 
@@ -103,7 +103,7 @@ TQString FileNameScheme::composeRegExp(const TQString &s) const
 
     TQString regExp = TQRegExp::escape(s.simplifyWhiteSpace());
     regExp = ".*" + regExp;
-    regExp.replace(' ', "\\s+");
+    regExp.tqreplace(' ', "\\s+");
     regExp = KMacroExpander::expandMacros(regExp, substitutions);
     regExp += "[^/]*$";
     return regExp;
@@ -180,18 +180,18 @@ void TagGuesser::loadSchemes()
 
 void TagGuesser::guess(const TQString &absFileName)
 {
-    m_title = m_artist = m_album = m_track = m_comment = TQString::null;
+    m_title = m_artist = m_album = m_track = m_comment = TQString();
 
     FileNameScheme::List::ConstIterator it = m_schemes.begin();
     FileNameScheme::List::ConstIterator end = m_schemes.end();
     for (; it != end; ++it) {
         const FileNameScheme schema(*it);
         if(schema.matches(absFileName)) {
-            m_title = capitalizeWords(schema.title().replace('_', " ")).stripWhiteSpace();
-            m_artist = capitalizeWords(schema.artist().replace('_', " ")).stripWhiteSpace();
-            m_album = capitalizeWords(schema.album().replace('_', " ")).stripWhiteSpace();
+            m_title = capitalizeWords(schema.title().tqreplace('_', " ")).stripWhiteSpace();
+            m_artist = capitalizeWords(schema.artist().tqreplace('_', " ")).stripWhiteSpace();
+            m_album = capitalizeWords(schema.album().tqreplace('_', " ")).stripWhiteSpace();
             m_track = schema.track().stripWhiteSpace();
-            m_comment = schema.comment().replace('_', " ").stripWhiteSpace();
+            m_comment = schema.comment().tqreplace('_', " ").stripWhiteSpace();
             break;
         }
     }
@@ -206,10 +206,10 @@ TQString TagGuesser::capitalizeWords(const TQString &s)
     result[ 0 ] = result[ 0 ].upper();
 
     const TQRegExp wordRegExp("\\s\\w");
-    int i = result.find( wordRegExp );
+    int i = result.tqfind( wordRegExp );
     while ( i > -1 ) {
         result[ i + 1 ] = result[ i + 1 ].upper();
-        i = result.find( wordRegExp, ++i );
+        i = result.tqfind( wordRegExp, ++i );
     }
 
     return result;