Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 6 insertions, 6 deletions

diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index 418f7f17..58b3044e 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -324,7 +324,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url)
           } else
             pos++;
           int pos2 = line.find(rx);
-          annotations.insert(i, tqMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver));
+          annotations.insert(i, qMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver));
         }
         ++i;
       }
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index c5530dae..a659d9cf 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -3115,7 +3115,7 @@ void Document::setAnnotationText(uint line, const TQString& text)
       markIf->removeMark(line, KTextEditor::MarkInterface::markType08);
   } else
   {
-    m_annotations.insert(line, tqMakePair(text, TQString("")));
+    m_annotations.insert(line, qMakePair(text, TQString("")));
     if (markIf)
       markIf->setMark(line, KTextEditor::MarkInterface::markType08);
     uint line, column;
@@ -3147,7 +3147,7 @@ void Document::setAnnotationText(uint line, const TQString& text)
     s.prepend(commentBegin + " ");
     s.append(" " + commentEnd + "\n");
     insertText(s, true, true);
-    emit showAnnotation(line, "", tqMakePair(text, TQString("")));
+    emit showAnnotation(line, "", qMakePair(text, TQString("")));
   }
 }
 
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index c3e3713f..f0df2bb7 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -1794,7 +1794,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
   if ( element.tagName().lower() == "toolbar" && !tabname.isEmpty())
   {
 //avoid TQToolBar warning in the log
-    TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
+    TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar );
     ToolbarTabWidget *toolbarTab = ToolbarTabWidget::ref();
     TQWidget *w = new TQWidget(toolbarTab, TQString("ToolbarHoldingWidget" + element.attribute("name")).ascii());
     QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name").ascii(), true, true);
@@ -1817,7 +1817,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
    kdDebug(24000) << "toolbarTab->tabHeight() " << toolbarTab->tabHeight() << endl;
 */
     toolbarTab->insertTab(tb, tabname, idStr);
-    tqInstallMsgHandler( oldHandler );
+    qInstallMsgHandler( oldHandler );
 
     connect(tb, TQT_SIGNAL(removeAction(const TQString&, const TQString&)),
                 TQT_SLOT(slotRemoveAction(const TQString&, const TQString&)));
@@ -4047,7 +4047,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly)
             n->next->tag->beginPos(l, c);
           else
             n->tag->endPos(l, c);
-          commentTag->write()->addAnnotation(l, tqMakePair(text, receiver));
+          commentTag->write()->addAnnotation(l, qMakePair(text, receiver));
         }
       }
       node = node->nextSibling();