Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076.

1 files changed, 9 insertions, 9 deletions

diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index f9a0dc06..cb4c8ef9 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -21,7 +21,7 @@
 #include <tqtabbar.h>
 #include <tqtabwidget.h>
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidgetstack.h>
 #include <tqdom.h>
 #include <tqfile.h>
@@ -208,7 +208,7 @@ void QuantaView::addDocument(Document *document)
 
   reloadUpdateTimers();
 
-   m_currentViewsLayout = -1; //force loading of this layout
+   m_currentViewsLayout = -1; //force loading of this tqlayout
    slotSetSourceLayout();
 }
 
@@ -263,7 +263,7 @@ void QuantaView::addCustomWidget(TQWidget *widget, const TQString &label)
 void QuantaView::reloadLayout()
 {
   int currentViewsLayout = m_currentViewsLayout;
-  m_currentViewsLayout = -1; //force loading of this layout
+  m_currentViewsLayout = -1; //force loading of this tqlayout
   switch (currentViewsLayout)
   {
         case SourceOnly:
@@ -395,7 +395,7 @@ void QuantaView::slotSetSourceAndVPLLayout()
 
    if (m_document->defaultDTD()->name.contains("HTML", false) == 0)
    {
-      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName));
+      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName));
       KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
       if (ta2)
           ta2->setChecked(true);
@@ -444,7 +444,7 @@ void QuantaView::slotSetVPLOnlyLayout()
 
    if (m_document->defaultDTD()->name.contains("HTML", false) == 0)
    {
-      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName));
+      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName));
       KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
       if (ta2)
           ta2->setChecked(true);
@@ -1021,7 +1021,7 @@ void QuantaView::activated()
   ToolbarTabWidget::ref()->reparent(this, 0, TQPoint(), qConfig.enableDTDToolbar);
   m_viewLayout->addWidget(ToolbarTabWidget::ref(), 0 , 0);
   quantaApp->partManager()->setActivePart(m_document->doc(), m_document->view());
-  m_document->checkDirtyStatus();
+  m_document->checkDirtytqStatus();
   StructTreeView::ref()->useOpenLevelSetting = true;
   quantaApp->slotLoadToolbarForDTD(m_document->getDTDIdentifier());
 
@@ -1064,7 +1064,7 @@ bool QuantaView::saveModified(bool ask)
     int want_save;
     if (ask)
       want_save = KMessageBox::warningYesNoCancel(this,
-          i18n("The file \"%1\" has been modified.\nDo you want to save it?").arg(fileName),
+          i18n("The file \"%1\" has been modified.\nDo you want to save it?").tqarg(fileName),
           i18n("Warning"), KStdGuiItem::save(), KStdGuiItem::discard());
     else
       want_save = KMessageBox::Yes;
@@ -1125,7 +1125,7 @@ bool QuantaView::saveDocument(const KURL& url)
       return false; //saving to a local file failed
     } else //successful saving to a local file
     {
-      m_document->setDirtyStatus(false);
+      m_document->setDirtytqStatus(false);
       m_document->removeBackup(quantaApp->config());
       fileWatcher->addFile(m_document->url().path());
 //      kdDebug(24000) << "addFile[saveDocument, 2]: " << m_document->url().path() << endl;
@@ -1176,7 +1176,7 @@ void QuantaView::slotSavingFailed(const TQString &error)
 void QuantaView::slotSavingCompleted()
 {
   m_saveResult = true;
-  m_document->setDirtyStatus(false);
+  m_document->setDirtytqStatus(false);
   m_document->removeBackup(quantaApp->config());
   if (m_eventLoopStarted)
     tqApp->exit_loop();