2 files changed, 9 insertions, 9 deletions
diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index 543fe734..1d97652e 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -17,7 +17,7 @@
 #include <tqmap.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 
 #include <kdebug.h>
@@ -84,7 +84,7 @@ void AnnotationOutput::tabChanged(TQWidget *w)
 void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const TQPair<TQString, TQString>& annotation)
 {
   line++;
-  TQString s = i18n("Line %1: %2").tqarg(line).tqarg(annotation.first);
+  TQString s = i18n("Line %1: %2").arg(line).arg(annotation.first);
   s.replace('\n', ' ');
   m_currentFileAnnotations->showMessage(line, 1, fileName, s);
 }
@@ -155,7 +155,7 @@ void AnnotationOutput::readAnnotations()
       TQString text = el.attribute("text");
       TQString receiver = el.attribute("receiver");
       text.replace('\n',' ');
-      TQString lineText = TQString("%1").tqarg(line);
+      TQString lineText = TQString("%1").arg(line);
       if (lineText.length() < 20)
       {
         TQString s;
@@ -198,7 +198,7 @@ void AnnotationOutput::readAnnotations()
   }
   if (m_yourAnnotationsNum > 0)
   {
-    setTabLabel(m_yourAnnotations, i18n("For You: %1").tqarg(m_yourAnnotationsNum));
+    setTabLabel(m_yourAnnotations, i18n("For You: %1").arg(m_yourAnnotationsNum));
   } else
   {
     setTabLabel(m_yourAnnotations, i18n("For You"));
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index 94bfecfb..ef9e2058 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -25,9 +25,9 @@
 #include <kiconloader.h>
 
 // TQt includes
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "messageoutput.h"
 #include "messageitem.h"
@@ -146,7 +146,7 @@ TQString MessageOutput::content()
 
 void MessageOutput::copyContent()
 {
-  kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard);
+  kapp->clipboard()->setText(content(), TQClipboard::Clipboard);
 }
 
 void MessageOutput::saveContent()
@@ -159,13 +159,13 @@ void MessageOutput::saveContent()
   TQFileInfo fileinfo(url.path());
   if (fileinfo.exists() && KMessageBox::warningContinueCancel(0,
       i18n("<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>")
-      .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
+      .arg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
     return;
 
   TQFile file(url.path());
   if (!file.open(IO_WriteOnly)) {
      KMessageBox::error(0, i18n("<qt>Cannot save log file<br><b>%1</b></qt>")
-         .tqarg(url.url()));
+         .arg(url.url()));
      return;
    }