1 files changed, 12 insertions, 12 deletions

diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 797c1172..3585cdb8 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -21,7 +21,7 @@
 #include <tqwidget.h>
 #include <tqtabwidget.h>
 #include <tqtabbar.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdragobject.h>
 #include <tqobject.h>
 
@@ -132,7 +132,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting )
   else // select opened
   if (switchToExisting)
   {
-    view->document()->checkDirtytqStatus();
+    view->document()->checkDirtyStatus();
     if (view != ViewManager::ref()->activeView())
     {
       view->activate();
@@ -147,7 +147,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting )
 void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
                              bool switchToExisting, bool readOnly)
 {
-  bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
+  bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false);
   KURL url = urlToOpen;
   if (url.isLocalFile())
   {
@@ -158,7 +158,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
   TQString encoding = a_encoding;
   if (!newDocument(url, switchToExisting))
   {
-     quantaApp->slotEnableIdleTimer(idleTimertqStatus);
+     quantaApp->slotEnableIdleTimer(idleTimerStatus);
      return;
   }
   Document *w = ViewManager::ref()->activeDocument();
@@ -211,23 +211,23 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
             highlightIf->setHlMode(htmlIdx);
       }
     }
-    emit newtqStatus();
+    emit newStatus();
   }
-  quantaApp->slotEnableIdleTimer(idleTimertqStatus);
+  quantaApp->slotEnableIdleTimer(idleTimerStatus);
 }
 
 void QuantaDoc::slotOpeningFailed(const KURL &url)
 {
     Q_UNUSED(url);
-    bool signaltqStatus = signalsBlocked();
+    bool signalStatus = signalsBlocked();
     blockSignals(false);
     emit hideSplash();
     //Seems to be not needed anymore since KDE 3.2, but keep until it's completely verified
 /*
-    KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
 */
     ViewManager::ref()->removeActiveView();
-    blockSignals(signaltqStatus);
+    blockSignals(signalStatus);
 }
 
 void QuantaDoc::slotOpeningCompleted(const KURL &url)
@@ -240,7 +240,7 @@ void QuantaDoc::slotOpeningCompleted(const KURL &url)
   quantaApp->reparse(true);
   if (url.isLocalFile())
     quantaApp->debugger()->fileOpened(url.prettyURL(0, KURL::StripFileProtocol));
-  quantaApp->slotNewtqStatus();
+  quantaApp->slotNewStatus();
   quantaApp->setTitle(url.prettyURL(0, KURL::StripFileProtocol));
   Project::ref()->loadCursorPosition(w->url(), dynamic_cast<KTextEditor::ViewCursorInterface*>(w->view()));
   emit eventHappened("after_open", url.url(), TQString());
@@ -272,7 +272,7 @@ void QuantaDoc::slotAttribPopup()
 
     if ( QuantaCommon::isKnownTag(w->getDTDIdentifier(),tagName) )
     {
-      TQString caption = i18n("Attributes of <%1>").tqarg(tagName);
+      TQString caption = i18n("Attributes of <%1>").arg(tagName);
       attribMenu->insertTitle( caption );
 
       AttributeList *list = QuantaCommon::tagAttributes(w->getDTDIdentifier(),tagName );
@@ -317,7 +317,7 @@ void QuantaDoc::slotAttribPopup()
       }
     }
     else {
-      TQString message = i18n("Unknown tag: %1").tqarg(tagName);
+      TQString message = i18n("Unknown tag: %1").arg(tagName);
       quantaApp->slotStatusMsg( message );
     }
   }