Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 931991843ab3b6b0b0157dd433c226f7fc2ebc1b)

4 files changed, 41 insertions, 41 deletions

diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp
index 1c5c572d..6c74b132 100644
--- a/quanta/parts/kafka/domtreeview.cpp
+++ b/quanta/parts/kafka/domtreeview.cpp
@@ -38,8 +38,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char
     addColumn("");
     setSorting(-1);
     part = currentpart;
-    connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, TQT_SLOT(showTree(const DOM::Node &)));
-    connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotItemClicked(TQListViewItem *)));
+    connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, TQ_SLOT(showTree(const DOM::Node &)));
+    connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotItemClicked(TQListViewItem *)));
     m_nodedict.setAutoDelete(true);
     title = "";
     titleItem = new TQListViewItem(static_cast<TQListView *>(this), title, "");
diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp
index 18cf44da..ce078a8c 100644
--- a/quanta/parts/kafka/htmldocumentproperties.cpp
+++ b/quanta/parts/kafka/htmldocumentproperties.cpp
@@ -230,20 +230,20 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse
         cancel->setIconSet(SmallIconSet("button_cancel"));
 
 	//connect buttons
-	connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
-	connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
-	connect(cssRulesAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(newCSSRule()));
-	connect(cssRulesEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editCSSRule()));
-	connect (cssRulesDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentCSSRule()));
-	connect(metaItemsAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(newMetaItem()));
-	connect(metaItemsDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentMetaItem()));
-	connect(title, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(titleChanged(const TQString &)));
-	connect(metaItems, TQT_SIGNAL(itemModified( TQListViewItem * )),
-		this, TQT_SLOT(metaChanged(TQListViewItem * )));
-	connect(cssRules, TQT_SIGNAL(itemModified( TQListViewItem * )),
-		this, TQT_SLOT(CSSChanged(TQListViewItem * )));
-	connect(cssStylesheet, TQT_SIGNAL(textChanged(const TQString &)),
-		this, TQT_SLOT(linkChanged( const TQString& )));
+	connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
+	connect(cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
+	connect(cssRulesAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(newCSSRule()));
+	connect(cssRulesEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(editCSSRule()));
+	connect (cssRulesDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentCSSRule()));
+	connect(metaItemsAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(newMetaItem()));
+	connect(metaItemsDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentMetaItem()));
+	connect(title, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(titleChanged(const TQString &)));
+	connect(metaItems, TQ_SIGNAL(itemModified( TQListViewItem * )),
+		this, TQ_SLOT(metaChanged(TQListViewItem * )));
+	connect(cssRules, TQ_SIGNAL(itemModified( TQListViewItem * )),
+		this, TQ_SLOT(CSSChanged(TQListViewItem * )));
+	connect(cssStylesheet, TQ_SIGNAL(textChanged(const TQString &)),
+		this, TQ_SLOT(linkChanged( const TQString& )));
 }
 
 htmlDocumentProperties::~htmlDocumentProperties()
diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp
index ad300f88..fc0460ad 100644
--- a/quanta/parts/kafka/kafkahtmlpart.cpp
+++ b/quanta/parts/kafka/kafkahtmlpart.cpp
@@ -104,12 +104,12 @@ KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument
     // With the mix of Leo Savernik's caret Mode and the current editing
     // functions, it will be kind of VERY messy
     setCaretMode(true);
-    connect(this, TQT_SIGNAL(caretPositionChanged(const DOM::Node &, long)),
-            this, TQT_SLOT(slotNewCursorPos(const DOM::Node &, long)));
+    connect(this, TQ_SIGNAL(caretPositionChanged(const DOM::Node &, long)),
+            this, TQ_SLOT(slotNewCursorPos(const DOM::Node &, long)));
     setCaretDisplayPolicyNonFocused(TDEHTMLPart::CaretVisible);
     
-    connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
-            this, TQT_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&)));
+    connect(this, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
+            this, TQ_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&)));
 
     view()->setMouseTracking(true);
     view()->installEventFilter(this);
@@ -186,7 +186,7 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position)
             kdDebug(25001) << "KafkaWidget::insertText() - added text - 1" << endl;
 #endif
 
-            TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition()));
+            TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition()));
             return;
         }
     }
@@ -263,7 +263,7 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position)
 
     }
     //document().updateRendering();
-    TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition()));
 }
 
 void KafkaWidget::slotDelayedSetCaretPosition()
@@ -467,7 +467,7 @@ void KafkaWidget::keyReturn(bool specialPressed)
 
     kdDebug(25001)<< "CURNODE : " << m_currentNode.nodeName().string() << ":"
     << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl;
-    TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition()));
     kdDebug(25001)<< "CURNODE : " << m_currentNode.nodeName().string() << ":"
     << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl;
     //emit domNodeNewCursorPos(m_currentNode, d->m_cursorOffset);
@@ -478,7 +478,7 @@ void KafkaWidget::keyReturn(bool specialPressed)
     << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl;
 #endif
 
-    TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition()));
 }
 
 bool KafkaWidget::eventFilter(TQObject *, TQEvent *event)
@@ -1533,7 +1533,7 @@ void KafkaWidget::keyBackspace()
                     emit domNodeModified(temp, m_modifs);
 
                     if(boolTmp)
-                        TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition()));
+                        TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition()));
                 }
 
             }
@@ -1599,7 +1599,7 @@ void KafkaWidget::keyBackspace()
                     {
                         m_currentNode = _nodePrev;
                         d->m_cursorOffset += (static_cast<DOM::CharacterData>(_nodePrev)).length();
-                        TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition()));
+                        TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition()));
                     }
                     _nodePrev.setNodeValue(_nodePrev.nodeValue() + _node.nodeValue());
                     emit domNodeModified(_nodePrev, m_modifs);
@@ -1620,7 +1620,7 @@ void KafkaWidget::keyBackspace()
                         m_currentNode = m_currentNode.previousSibling();
                         d->m_cursorOffset = 0;
                         
-                        TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition()));
+                        TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition()));
                     }
                     else if(!m_currentNode.nextSibling().isNull())
                     {
@@ -2090,7 +2090,7 @@ void KafkaWidget::setCurrentNode(DOM::Node node, int offset)
     d->m_cursorOffset = offset;
     makeCursorVisible();
     if(!m_currentNode.isNull() && m_currentNode.nodeName().string() != "#document")
-        TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition()));
     //setCaretPosition(m_currentNode, (long)d->m_cursorOffset);
 }
 
@@ -2141,7 +2141,7 @@ void KafkaWidget::putCursorAtFirstAvailableLocation()
     }
     m_currentNode = node;
     d->m_cursorOffset = 0;
-    TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition()));
 
 #ifdef LIGHT_DEBUG
 
@@ -2238,7 +2238,7 @@ void KafkaWidget::removeSelection()
     
     setCurrentNode(m_currentNode, domNodeCursorOffset);
     
-    TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition()));
     
     NodeSelection* cursorPos = new NodeSelection();
     cursorPos->setCursorNode(cursorNode);
diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp
index 8cb3c05c..483454ee 100644
--- a/quanta/parts/kafka/wkafkapart.cpp
+++ b/quanta/parts/kafka/wkafkapart.cpp
@@ -116,17 +116,17 @@ TQString ab = i18n("Ident all");
 		file.close();
 	}
 
-	connect(m_kafkaPart, TQT_SIGNAL(domNodeInserted(DOM::Node, bool, NodeModifsSet*)),
-		this, TQT_SLOT(slotDomNodeInserted(DOM::Node, bool, NodeModifsSet*)));
-	connect(m_kafkaPart, TQT_SIGNAL(domNodeModified(DOM::Node, NodeModifsSet*)),
-		this, TQT_SLOT(slotDomNodeModified(DOM::Node, NodeModifsSet*)));
-	connect(m_kafkaPart, TQT_SIGNAL(domNodeIsAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)),
-		this, TQT_SLOT(slotDomNodeAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)));
-	connect(m_kafkaPart, TQT_SIGNAL(domNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)),
-		this, TQT_SLOT(slotDomNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)));
-
-	connect(m_kafkaPart, TQT_SIGNAL(domNodeNewCursorPos(DOM::Node, int)),
-		this, TQT_SLOT(slotdomNodeNewCursorPos(DOM::Node, int)));
+	connect(m_kafkaPart, TQ_SIGNAL(domNodeInserted(DOM::Node, bool, NodeModifsSet*)),
+		this, TQ_SLOT(slotDomNodeInserted(DOM::Node, bool, NodeModifsSet*)));
+	connect(m_kafkaPart, TQ_SIGNAL(domNodeModified(DOM::Node, NodeModifsSet*)),
+		this, TQ_SLOT(slotDomNodeModified(DOM::Node, NodeModifsSet*)));
+	connect(m_kafkaPart, TQ_SIGNAL(domNodeIsAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)),
+		this, TQ_SLOT(slotDomNodeAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)));
+	connect(m_kafkaPart, TQ_SIGNAL(domNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)),
+		this, TQ_SLOT(slotDomNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)));
+
+	connect(m_kafkaPart, TQ_SIGNAL(domNodeNewCursorPos(DOM::Node, int)),
+		this, TQ_SLOT(slotdomNodeNewCursorPos(DOM::Node, int)));
 
 }