1 files changed, 15 insertions, 15 deletions

diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 0f0d9933..68fe11e9 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -26,8 +26,8 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqlineedit.h>
-#include <tqtextcodec.h>
-#include <tqtextstream.h>
+#include <textcodec.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <tqradiobutton.h>
 
@@ -409,7 +409,7 @@ void Document::insertFile(const KURL& url)
   {
     if (!KIO::NetAccess::download(url, fileName, this))
     {
-      KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").tqarg( url.prettyURL(0, KURL::StripFileProtocol)));
+      KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").arg( url.prettyURL(0, KURL::StripFileProtocol)));
       return;
     }
   }
@@ -421,7 +421,7 @@ void Document::insertFile(const KURL& url)
     insertText(stream.read());
     file.close();
   } else
-    KMessageBox::error(this, i18n("<qt>Cannot open <b>%1</b> for reading.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(this, i18n("<qt>Cannot open <b>%1</b> for reading.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
 }
 
 /** Inserts text at the current cursor position */
@@ -858,7 +858,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri
       {
         m_replaceLine = line;
         m_replaceCol = column;
-        m_replaceStr = QuantaCommon::encodedChar(string[0].tqunicode());
+        m_replaceStr = QuantaCommon::encodedChar(string[0].unicode());
         TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar()));
         return;
       }
@@ -866,7 +866,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri
   }
   if (qConfig.replaceAccented)
   {
-    uint c = string[0].tqunicode();
+    uint c = string[0].unicode();
     if (c > 191)
     {
       m_replaceLine = line;
@@ -1303,7 +1303,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
       {
         if (!parentTQTag || (parentTQTag && parentTQTag->isChild(tagName)))
         {
-          tagName = tag->name() + TQString("%1").tqarg(i, 10);
+          tagName = tag->name() + TQString("%1").arg(i, 10);
           tagNameList += tagName;
           comments.insert(tagName, tag->comment);
           i++;
@@ -1319,7 +1319,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
     if ((tag->className == classStr ||
          isDerivatedFrom(classStr, tag->className)) && tag->name().upper().startsWith(word))
     {
-      tagName = tag->name() + TQString("%1").tqarg(i, 10);
+      tagName = tag->name() + TQString("%1").arg(i, 10);
       tagNameList += tagName;
       comments.insert(tagName, tag->comment);
       
@@ -2212,7 +2212,7 @@ void Document::slotCompletionAborted()
 }
 
 /** Ask for user confirmation if the file was changed outside. */
-void Document::checkDirtytqStatus()
+void Document::checkDirtyStatus()
 {
   TQString fileName;
   if (url().isLocalFile())
@@ -2576,9 +2576,9 @@ bool Document::hasChanged()
   return b;
 }
 
-void Document::setChanged(bool newtqStatus)
+void Document::setChanged(bool newStatus)
 {
-  changed = newtqStatus;
+  changed = newStatus;
 }
 
 void Document::paste()
@@ -2614,7 +2614,7 @@ TQStringList Document::tagAreas(const TQString& tag, bool includeCoordinates, bo
         TQString s = text(bl, bc, el, ec);
         if (includeCoordinates)
         {
-          s.prepend(TQString("%1,%2,%3,%4\n").tqarg(bl).tqarg(bc).tqarg(el).tqarg(ec));
+          s.prepend(TQString("%1,%2,%3,%4\n").arg(bl).arg(bc).arg(el).arg(ec));
         }
         result += s;
         if (skipFoundContent)
@@ -3043,7 +3043,7 @@ void Document::processDTD(const TQString& documentType)
 
   if (!isUntitled())
   {
-    quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").tqarg(DTDs::ref()->getDTDNickNameFromName(dtdName)).tqarg(url().prettyURL(0, KURL::StripFileProtocol)));
+    quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").arg(DTDs::ref()->getDTDNickNameFromName(dtdName)).arg(url().prettyURL(0, KURL::StripFileProtocol)));
   }
   quantaApp->slotLoadToolbarForDTD(dtdName);
   StructTreeView::ref()->useOpenLevelSetting = true;
@@ -3056,10 +3056,10 @@ void Document::slotFileDirty(const TQString& fileName)
 {
   if ( url().path() == fileName && !dirty() )
   {
-    setDirtytqStatus(true);
+    setDirtyStatus(true);
     if (this == ViewManager::ref()->activeDocument())
     {
-      checkDirtytqStatus();
+      checkDirtyStatus();
     }
   }
 }