3 files changed, 14 insertions, 14 deletions

diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index 0bca2cf2..57a8e84c 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -85,7 +85,7 @@ void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, con
 {
   line++;
   TQString s = i18n("Line %1: %2").tqarg(line).tqarg(annotation.first);
-  s.tqreplace('\n', ' ');
+  s.replace('\n', ' ');
   m_currentFileAnnotations->showMessage(line, 1, fileName, s);
 }
 
@@ -148,13 +148,13 @@ void AnnotationOutput::readAnnotations()
     KURL u = baseURL;
     QuantaCommon::setUrl(u, fileName);
     u = QExtFileInfo::toAbsolute(u, baseURL);
-    if (Project::ref()->tqcontains(u))
+    if (Project::ref()->contains(u))
     {
       bool ok;
       int line = el.attribute("line").toInt(&ok, 10);
       TQString text = el.attribute("text");
       TQString receiver = el.attribute("receiver");
-      text.tqreplace('\n',' ');
+      text.replace('\n',' ');
       TQString lineText = TQString("%1").tqarg(line);
       if (lineText.length() < 20)
       {
@@ -170,12 +170,12 @@ void AnnotationOutput::readAnnotations()
         m_fileNames[fileIt] = u.url();
       }
       KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText);
-      if (openedItems.tqcontains(fileName))
+      if (openedItems.contains(fileName))
         fileIt->setOpen(true);
       m_fileNames[it] = u.url();
       m_lines[it] = line;
    
-      if (!yourself.isEmpty() && (receiver == yourself || roles.tqcontains(receiver)))
+      if (!yourself.isEmpty() && (receiver == yourself || roles.contains(receiver)))
       {
         m_yourAnnotationsNum++;
         KListViewItem *fileIt = m_yourFileItems[fileName];
@@ -186,7 +186,7 @@ void AnnotationOutput::readAnnotations()
           m_yourFileNames[fileIt] = u.url();
         }
         KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText);
-        if (yourOpenedItems.tqcontains(fileName))
+        if (yourOpenedItems.contains(fileName))
           fileIt->setOpen(true);
         m_yourFileNames[it] = u.url();
         m_yourLines[it] = line;
@@ -234,7 +234,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui
       TQString text = el.attribute("text");
       bool ok;
       int line = el.attribute("line").toInt(&ok, 10);
-      if (!annotations.tqcontains(line) || (annotations[line].first != text))
+      if (!annotations.contains(line) || (annotations[line].first != text))
       {
         n.parentNode().removeChild(n);
         modified = true;
@@ -307,7 +307,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url)
       while (!stream.atEnd())
       {
         line = stream.readLine();
-        int pos = line.tqfind("@annotation");
+        int pos = line.find("@annotation");
         if (pos != -1)
         {
           TQString receiver;
@@ -315,7 +315,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url)
           if (line[pos] == '(')
           {
             int p = pos;
-            pos = line.tqfind(')');
+            pos = line.find(')');
             if (pos != -1)
             {
               receiver = line.mid(p + 1, pos - p - 1);
@@ -323,7 +323,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url)
             }
           } else
             pos++;
-          int pos2 = line.tqfind(rx);
+          int pos2 = line.find(rx);
           annotations.insert(i, tqMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver));
         }
         ++i;
diff --git a/quanta/messages/messageitem.cpp b/quanta/messages/messageitem.cpp
index ab8c1ef1..dc1c7ad8 100644
--- a/quanta/messages/messageitem.cpp
+++ b/quanta/messages/messageitem.cpp
@@ -31,7 +31,7 @@ int MessageItem::line()
   }
   else {  // try to find first number in text
     TQString s = text();
-    int pos = s.tqfind( TQRegExp("[0-9]"));
+    int pos = s.find( TQRegExp("[0-9]"));
     if ( pos == -1 )
       return lineNumber;
     int pos2 = pos;
@@ -70,10 +70,10 @@ TQString MessageItem::fileName()
   {
     TQString fname;
     TQString s = text();
-    int pos = s.tqfind(i18n("File: "));
+    int pos = s.find(i18n("File: "));
     if (pos != -1)
     {
-      int pos2 = s.tqfind(i18n(", "), pos);
+      int pos2 = s.find(i18n(", "), pos);
       if (pos2 != -1)
         fname = s.mid(pos, pos2-pos);
       else
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index 666d98d3..43050d55 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -85,7 +85,7 @@ void MessageOutput::showMessage(int line, int col, const TQString &fileName, con
   int endPos;
   if ( !count() || (!append && !text(count()-1).stripWhiteSpace().isEmpty()) )
     it = insertItem("");
-  while ( ( endPos = message.tqfind('\n') ) != -1 ) {
+  while ( ( endPos = message.find('\n') ) != -1 ) {
     if (it)
     {
       it->setLine(line);