Rename obsolete tq methods to standard names

7 files changed, 24 insertions, 24 deletions

diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 346e9cb6..c8a84ef4 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -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;
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 212bc68f..b39b0c46 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -80,12 +80,12 @@ KQApplication::KQApplication()
      KConfig *config = kapp->config();
      config->setGroup("General Options");
      int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode);
-     TQString tqlayout = config->readEntry("Window tqlayout", "Default");
-     if (tqlayout == "Default" || args->isSet("resettqlayout"))
+     TQString layout = config->readEntry("Window layout", "Default");
+     if (layout == "Default" || args->isSet("resetlayout"))
      {
          mdiMode = KMdi::IDEAlMode;
          config->writeEntry("MDI mode", KMdi::IDEAlMode);
-         config->writeEntry("Window tqlayout", "Default");
+         config->writeEntry("Window layout", "Default");
      }
      quantaApp = new QuantaApp(mdiMode);
      config->setGroup("General Options");
@@ -151,11 +151,11 @@ int KQUniqueApplication::newInstance()
     KConfig *config = kapp->config();
     config->setGroup("General Options");
     int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode);
-    TQString tqlayout = config->readEntry("Window tqlayout", "Default");
-    if (tqlayout == "Default" || args->isSet("resettqlayout"))
+    TQString layout = config->readEntry("Window layout", "Default");
+    if (layout == "Default" || args->isSet("resetlayout"))
     {
         mdiMode = KMdi::IDEAlMode;
-        config->writeEntry("Window tqlayout", "Default");
+        config->writeEntry("Window layout", "Default");
         config->writeEntry("MDI mode", KMdi::IDEAlMode);
     }
     quantaApp = new QuantaApp(mdiMode);
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 75d6918e..3e11bacb 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -56,7 +56,7 @@ static KCmdLineOptions options[] =
   { "+[File]", I18N_NOOP("File to open"), 0 },
   { "unique", I18N_NOOP("Whether we start as a one-instance application"), 0 },
   { "nologo", I18N_NOOP("Do not show the nice logo during startup"), 0 },
-  { "resettqlayout", I18N_NOOP("Reset the tqlayout of the user interface to the default"), 0},
+  { "resetlayout", I18N_NOOP("Reset the layout of the user interface to the default"), 0},
   KCmdLineLastOption
   // INSERT YOUR COMMANDLINE OPTIONS HERE
 };
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 64597e60..1d7567ab 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -1348,7 +1348,7 @@ void QuantaApp::slotOptions()
     if (previewSettingsChanged)
       slotShowPreviewWidget(true);
     qConfig.docPosition = uiOptions->docPosition();
-    qConfig.windowLayout = uiOptions->tqlayout();
+    qConfig.windowLayout = uiOptions->layout();
 
     m_htmlPart->closeURL();
     m_htmlPart->begin( Project::ref()->projectBaseURL());
@@ -4200,7 +4200,7 @@ void QuantaApp::saveOptions()
 
     m_config->writeEntry("Smart Tag Insertion", qConfig.smartTagInsertion);
 
-    m_config->writeEntry("Window tqlayout", qConfig.windowLayout);
+    m_config->writeEntry("Window layout", qConfig.windowLayout);
     m_config->writeEntry("Follow Cursor", StructTreeView::ref()->followCursor() );
     //If user choose the timer interval, it needs to restart the timer too
     m_config->writeEntry("Autosave interval", qConfig.autosaveInterval);
@@ -4840,7 +4840,7 @@ void QuantaApp::slotPasteHTMLQuoted()
   Document *w = ViewManager::ref()->activeDocument();
   if (w)
   {
-    TQClipboard *cb = tqApp->tqclipboard();
+    TQClipboard *cb = tqApp->clipboard();
     TQString text = cb->text();
 
     if ( ( !text.isNull() ) && (!text.isEmpty() ) )
@@ -4885,7 +4885,7 @@ void QuantaApp::slotPasteURLEncoded()
  Document *w = ViewManager::ref()->activeDocument();
   if (w)
   {
-    TQClipboard *cb = tqApp->tqclipboard();
+    TQClipboard *cb = tqApp->clipboard();
     TQString text = cb->text();
 
     if ( ( !text.isNull() ) && (!text.isEmpty() ) )
@@ -5004,14 +5004,14 @@ void QuantaApp::slotCopy()
   if (m_htmlPart->view()->hasFocus())
   {
     TQString selection = m_htmlPart->selectedText();
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     cb->setText(selection, TQClipboard::Clipboard);
   }
   else
   if (m_htmlPartDoc->view()->hasFocus())
   {
     TQString selection = m_htmlPartDoc->selectedText();
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     cb->setText(selection, TQClipboard::Clipboard);
   }
 
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 4595a7f4..9a582e79 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -191,13 +191,13 @@ void QuantaInit::initQuanta()
   m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("info"), KDockWidget::DockBottom);
   m_quanta->m_annotationOutputView = addToolTreeView(m_quanta->m_annotationOutput, i18n("Annotations"), SmallIcon("stamp"), KDockWidget::DockBottom);
 
-  // Restore the dock tqlayout
+  // Restore the dock layout
   m_config->setGroup  ("General Options");
-  TQString tqlayout = m_config->readEntry("Window tqlayout", "Default");
+  TQString layout = m_config->readEntry("Window layout", "Default");
   int mdiMode = m_config->readNumEntry("MDI mode", -1);
-  if (mdiMode != -1 && tqlayout != "Default")
+  if (mdiMode != -1 && layout != "Default")
   {
-      m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window tqlayout...
+      m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window layout...
       if (mdiMode != KMdi::IDEAlMode)
         m_quanta->setToolviewStyle(qConfig.toolviewTabs);
   }
@@ -301,7 +301,7 @@ void QuantaInit::initQuanta()
           continue;
       int length = s.find(";)") - begin + 1;
       TQString s2 = s.mid(begin, length - 1);
-      replacementMap[s[0].tqunicode()] = s2;
+      replacementMap[s[0].unicode()] = s2;
     }
     file.close();
   }
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index 7609b112..d6f771bf 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -208,7 +208,7 @@ void QuantaView::addDocument(Document *document)
 
   reloadUpdateTimers();
 
-   m_currentViewsLayout = -1; //force loading of this tqlayout
+   m_currentViewsLayout = -1; //force loading of this layout
    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 tqlayout
+  m_currentViewsLayout = -1; //force loading of this layout
   switch (currentViewsLayout)
   {
         case SourceOnly:
diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h
index bf80aff1..3e34c43a 100644
--- a/quanta/src/quantaview.h
+++ b/quanta/src/quantaview.h
@@ -105,7 +105,7 @@ public:
   void reloadVPLView(bool force = false);
   /** reload the Quanta view from the Node Tree. Set force to true if you want to reload even if not necessary. */
   void reloadSourceView(bool force = false);
-  /** Return the curren views tqlayout*/
+  /** Return the curren views layout*/
   int currentViewsLayout() {return m_currentViewsLayout;}
 
   void reloadLayout();
@@ -221,7 +221,7 @@ private:
   TQGuardedPtr<KafkaDocument> m_kafkaDocument;
   TQSplitter *m_splitter;
   TQGridLayout *m_viewLayout;
-  int m_currentViewsLayout; ///< holds the current tqlayout, which can be SourceOnly, VPLOnly or SourceAndVPL
+  int m_currentViewsLayout; ///< holds the current layout, which can be SourceOnly, VPLOnly or SourceAndVPL
   int m_currentFocus;
   bool m_saveResult;
   bool m_eventLoopStarted;