Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 65 insertions, 65 deletions

diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index f91bfd3..362e5c7 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -77,32 +77,32 @@ DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*
   m_rootListView = m_listView;
 
   m_pureCheckBox->setChecked(m_bPure);
-  connect(m_pureCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPureToggled(bool)));
+  connect(m_pureCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPureToggled(bool)));
 
   m_showAttributesCheckBox->setChecked(m_bShowAttributes);
-  connect(m_showAttributesCheckBox, TQT_SIGNAL(toggled(bool)), this,
-         TQT_SLOT(slotShowAttributesToggled(bool)));
+  connect(m_showAttributesCheckBox, TQ_SIGNAL(toggled(bool)), this,
+         TQ_SLOT(slotShowAttributesToggled(bool)));
 
   m_highlightHTMLCheckBox->setChecked(m_bHighlightHTML);
-  connect(m_highlightHTMLCheckBox, TQT_SIGNAL(toggled(bool)), this,
-         TQT_SLOT(slotHighlightHTMLToggled(bool)));
+  connect(m_highlightHTMLCheckBox, TQ_SIGNAL(toggled(bool)), this,
+         TQ_SLOT(slotHighlightHTMLToggled(bool)));
 
-  connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem *)), this,
-	  TQT_SLOT(slotItemClicked(TQListViewItem *)));
-  connect(m_listView, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
-  	TQT_SLOT(showDOMTreeContextMenu(TQListViewItem *, const TQPoint &, int)));
-  connect(m_listView, TQT_SIGNAL(moved(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &)),
-        TQT_SLOT(slotMovedItems(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &)));
+  connect(m_listView, TQ_SIGNAL(clicked(TQListViewItem *)), this,
+	  TQ_SLOT(slotItemClicked(TQListViewItem *)));
+  connect(m_listView, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+  	TQ_SLOT(showDOMTreeContextMenu(TQListViewItem *, const TQPoint &, int)));
+  connect(m_listView, TQ_SIGNAL(moved(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &)),
+        TQ_SLOT(slotMovedItems(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &)));
 
   // set up message line
   messageLinePane->hide();
-  connect(messageHideBtn, TQT_SIGNAL(clicked()), TQT_SLOT(hideMessageLine()));
-  connect(messageListBtn, TQT_SIGNAL(clicked()), mainWindow(), TQT_SLOT(showMessageLog()));
+  connect(messageHideBtn, TQ_SIGNAL(clicked()), TQ_SLOT(hideMessageLine()));
+  connect(messageListBtn, TQ_SIGNAL(clicked()), mainWindow(), TQ_SLOT(showMessageLog()));
 
   installEventFilter(m_listView);
 
-  ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(slotRefreshNode(const DOM::Node &)));
-  ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), this, TQT_SLOT(refresh()));
+  ManipulationCommand::connect(TQ_SIGNAL(nodeChanged(const DOM::Node &)), this, TQ_SLOT(slotRefreshNode(const DOM::Node &)));
+  ManipulationCommand::connect(TQ_SIGNAL(structureChanged()), this, TQ_SLOT(refresh()));
 
   initDOMNodeInfo();
 
@@ -126,7 +126,7 @@ void DOMTreeView::setHtmlPart(TDEHTMLPart *_part)
 
   parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") );
 
-  TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotSetHtmlPartDelayed()));
 }
 
 DOMTreeWindow *DOMTreeView::mainWindow() const
@@ -436,7 +436,7 @@ void DOMTreeView::slotFindClicked()
 {
   if (m_findDialog == 0) {
     m_findDialog = new KEdFind(this);
-    connect(m_findDialog, TQT_SIGNAL(search()), this, TQT_SLOT(slotSearch()));
+    connect(m_findDialog, TQ_SIGNAL(search()), this, TQ_SLOT(slotSearch()));
   }
   m_findDialog->show();
 }
@@ -652,7 +652,7 @@ void DOMTreeView::refresh()
   m_listView->setUpdatesEnabled(false);
   slotShowTree(part->document());
 
-  TQTimer::singleShot(0, this, TQT_SLOT(slotRestoreScrollOffset()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotRestoreScrollOffset()));
   _refreshed = true;
 }
 
@@ -805,9 +805,9 @@ void DOMTreeView::disconnectFromTornDownPart()
 void DOMTreeView::connectToPart()
 {
   if (part) {
-    connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this,
-	  TQT_SLOT(activateNode(const DOM::Node &)));
-    connect(part, TQT_SIGNAL(completed()), this, TQT_SLOT(refresh()));
+    connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this,
+	  TQ_SLOT(activateNode(const DOM::Node &)));
+    connect(part, TQ_SIGNAL(completed()), this, TQ_SLOT(refresh()));
 
     // insert a style rule to indicate activated nodes
     try {
@@ -871,7 +871,7 @@ void DOMTreeView::slotAddElementDlg()
 
   {
     ElementEditDialog dlg(this, "ElementEditDialog", true);
-    connect(dlg.insBeforeBtn, TQT_SIGNAL(clicked()), &addBefore, TQT_SLOT(slot()));
+    connect(dlg.insBeforeBtn, TQ_SIGNAL(clicked()), &addBefore, TQ_SLOT(slot()));
 
     // ### activate when namespaces are supported
     dlg.elemNamespace->setEnabled(false);
@@ -911,7 +911,7 @@ void DOMTreeView::slotAddTextDlg()
 
   {
     TextEditDialog dlg(this, "TextEditDialog", true);
-    connect(dlg.insBeforeBtn, TQT_SIGNAL(clicked()), &addBefore, TQT_SLOT(slot()));
+    connect(dlg.insBeforeBtn, TQ_SIGNAL(clicked()), &addBefore, TQ_SLOT(slot()));
 
     if (dlg.exec() != TQDialog::Accepted) return;
 
@@ -1003,19 +1003,19 @@ protected:
 
 void DOMTreeView::initDOMNodeInfo()
 {
-  connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem *)),
-	  TQT_SLOT(initializeOptionsFromListItem(TQListViewItem *)));
+  connect(m_listView, TQ_SIGNAL(clicked(TQListViewItem *)),
+	  TQ_SLOT(initializeOptionsFromListItem(TQListViewItem *)));
 
-  connect(nodeAttributes, TQT_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)),
-	TQT_SLOT(slotItemRenamed(TQListViewItem *, const TQString &, int)));
-  connect(nodeAttributes, TQT_SIGNAL(executed(TQListViewItem *, const TQPoint &, int)),
-	  TQT_SLOT(slotEditAttribute(TQListViewItem *, const TQPoint &, int)));
-  connect(nodeAttributes, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
-  	TQT_SLOT(showInfoPanelContextMenu(TQListViewItem *, const TQPoint &, int)));
+  connect(nodeAttributes, TQ_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)),
+	TQ_SLOT(slotItemRenamed(TQListViewItem *, const TQString &, int)));
+  connect(nodeAttributes, TQ_SIGNAL(executed(TQListViewItem *, const TQPoint &, int)),
+	  TQ_SLOT(slotEditAttribute(TQListViewItem *, const TQPoint &, int)));
+  connect(nodeAttributes, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+  	TQ_SLOT(showInfoPanelContextMenu(TQListViewItem *, const TQPoint &, int)));
 
-  connect(applyContent, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyContent()));
+  connect(applyContent, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyContent()));
 
-  ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(initializeOptionsFromNode(const DOM::Node &)));
+  ManipulationCommand::connect(TQ_SIGNAL(nodeChanged(const DOM::Node &)), this, TQ_SLOT(initializeOptionsFromNode(const DOM::Node &)));
 
   nodeAttributes->setRenameable(0, true);
   nodeAttributes->setRenameable(1, true);
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 1b59ba3..e7f6bb0 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -84,16 +84,16 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
 
     // allow the view to change the statusbar and caption
 #if 0
-    connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
-            this,   TQT_SLOT(changeStatusbar(const TQString&)));
-    connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)),
-            this,   TQT_SLOT(changeCaption(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)),
+            this,   TQ_SLOT(changeStatusbar(const TQString&)));
+    connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)),
+            this,   TQ_SLOT(changeCaption(const TQString&)));
 #endif
-    connect(view(), TQT_SIGNAL(htmlPartChanged(TDEHTMLPart *)),
-    		TQT_SLOT(slotHtmlPartChanged(TDEHTMLPart *)));
+    connect(view(), TQ_SIGNAL(htmlPartChanged(TDEHTMLPart *)),
+    		TQ_SLOT(slotHtmlPartChanged(TDEHTMLPart *)));
 
-    ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)),
-    				this, TQT_SLOT(addMessage(int, const TQString &)));
+    ManipulationCommand::connect(TQ_SIGNAL(error(int, const TQString &)),
+    				this, TQ_SLOT(addMessage(int, const TQString &)));
 
     infopanel_ctx = createInfoPanelAttrContextMenu();
     domtree_ctx = createDOMTreeViewContextMenu();
@@ -119,57 +119,57 @@ void DOMTreeWindow::executeAndAddCommand(ManipulationCommand *cmd)
 
 void DOMTreeWindow::setupActions()
 {
-    KStdAction::close(this, TQT_SLOT(close()), actionCollection());
+    KStdAction::close(this, TQ_SLOT(close()), actionCollection());
 
-    KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection())->setEnabled(false);
-    KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false);
-    KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false);
+    KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection())->setEnabled(false);
+    KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection())->setEnabled(false);
+    KStdAction::paste(this, TQ_SLOT(slotPaste()), actionCollection())->setEnabled(false);
 
     m_commandHistory = new KCommandHistory(actionCollection());
 
-    KStdAction::find(this, TQT_SLOT(slotFind()), actionCollection());
+    KStdAction::find(this, TQ_SLOT(slotFind()), actionCollection());
 
-    KStdAction::redisplay(m_view, TQT_SLOT(refresh()), actionCollection());
+    KStdAction::redisplay(m_view, TQ_SLOT(refresh()), actionCollection());
 
     // toggle manipulation dialog
     TDEAction *showMsgDlg = new TDEAction(i18n("Show Message Log"),
     			CTRL+Key_E, actionCollection(), "show_msg_dlg");
-    connect(showMsgDlg, TQT_SIGNAL(activated()), TQT_SLOT(showMessageLog()));
+    connect(showMsgDlg, TQ_SIGNAL(activated()), TQ_SLOT(showMessageLog()));
 
 //     TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0,
-//                                   this, TQT_SLOT(optionsPreferences()),
+//                                   this, TQ_SLOT(optionsPreferences()),
 //                                   actionCollection(), "custom_action");
 
     // actions for the dom tree list view toolbar
-    KStdAction::up(view(), TQT_SLOT(moveToParent()), actionCollection(), "tree_up");
+    KStdAction::up(view(), TQ_SLOT(moveToParent()), actionCollection(), "tree_up");
     TDEAction *tree_inc_level = new TDEAction(i18n("Expand"),
 			"1rightarrow", CTRL+Key_Greater, view(),
-			TQT_SLOT(increaseExpansionDepth()), actionCollection(),
+			TQ_SLOT(increaseExpansionDepth()), actionCollection(),
 			"tree_inc_level");
     tree_inc_level->setToolTip(i18n("Increase expansion level"));
     TDEAction *tree_dec_level = new TDEAction(i18n("Collapse"),
 			"1leftarrow", CTRL+Key_Less, view(),
-			TQT_SLOT(decreaseExpansionDepth()), actionCollection(),
+			TQ_SLOT(decreaseExpansionDepth()), actionCollection(),
 			"tree_dec_level");
     tree_dec_level->setToolTip(i18n("Decrease expansion level"));
 
     // actions for the dom tree list view context menu
 
     del_tree = new TDEAction(i18n("&Delete"), "edit-delete",
-    			Key_Delete, view(), TQT_SLOT(deleteNodes()),
+    			Key_Delete, view(), TQ_SLOT(deleteNodes()),
 			actionCollection(), "tree_delete");
     del_tree->setToolTip(i18n("Delete nodes"));
     /*TDEAction *new_elem = */new TDEAction(i18n("New &Element ..."),
 			"bookmark", TDEShortcut(), view(),
-			TQT_SLOT(slotAddElementDlg()), actionCollection(),
+			TQ_SLOT(slotAddElementDlg()), actionCollection(),
 			"tree_add_element");
     /*TDEAction *new_text = */new TDEAction(i18n("New &Text Node ..."),
-			"text", TDEShortcut(), view(), TQT_SLOT(slotAddTextDlg()),
+			"text", TDEShortcut(), view(), TQ_SLOT(slotAddTextDlg()),
 			actionCollection(), "tree_add_text");
 
     // actions for the info panel attribute list context menu
     del_attr = new TDEAction(i18n("&Delete"), "edit-delete",
-    			Key_Delete, view(), TQT_SLOT(deleteAttributes()),
+    			Key_Delete, view(), TQ_SLOT(deleteAttributes()),
 			actionCollection(), "attr_delete");
     del_attr->setToolTip(i18n("Delete attributes"));
 
@@ -292,7 +292,7 @@ void DOMTreeWindow::optionsConfigureToolbars()
     // use the standard toolbar editor
     saveMainWindowSettings( config(), autoSaveGroup() );
     KEditToolbar dlg(actionCollection());
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig()));
     dlg.exec();
 }
 
@@ -339,13 +339,13 @@ void DOMTreeWindow::slotHtmlPartChanged(TDEHTMLPart *p)
 
     part_manager = p->manager();
 
-    connect(part_manager, TQT_SIGNAL(activePartChanged(KParts::Part *)),
-    	TQT_SLOT(slotActivePartChanged(KParts::Part *)));
-    connect(part_manager, TQT_SIGNAL(partRemoved(KParts::Part *)),
-    	TQT_SLOT(slotPartRemoved(KParts::Part *)));
+    connect(part_manager, TQ_SIGNAL(activePartChanged(KParts::Part *)),
+    	TQ_SLOT(slotActivePartChanged(KParts::Part *)));
+    connect(part_manager, TQ_SIGNAL(partRemoved(KParts::Part *)),
+    	TQ_SLOT(slotPartRemoved(KParts::Part *)));
 
     // set up browser extension connections
-    connect(p, TQT_SIGNAL(docCreated()), TQT_SLOT(slotClosePart()));
+    connect(p, TQ_SIGNAL(docCreated()), TQ_SLOT(slotClosePart()));
   }
 }
 
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index d0e8862..958c2ca 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -21,7 +21,7 @@ PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name,
 {
   (void) new TDEAction( i18n("Show &DOM Tree"),
                       "domtreeviewer", 0,
-                      this, TQT_SLOT(slotShowDOMTree()),
+                      this, TQ_SLOT(slotShowDOMTree()),
                       actionCollection(), "viewdomtree" );
 }
 
@@ -41,7 +41,7 @@ void PluginDomtreeviewer::slotShowDOMTree()
   if (TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(parent()))
   {
     m_dialog = new DOMTreeWindow(this);
-    connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( m_dialog, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
     m_dialog->view()->setHtmlPart(part);
     m_dialog->show();
   }
diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h
index 7f66842..d550cc0 100644
--- a/konq-plugins/domtreeviewer/signalreceiver.h
+++ b/konq-plugins/domtreeviewer/signalreceiver.h
@@ -32,7 +32,7 @@
  * Use as follows:
  * \code
  * SignalReceiver sr;
- * sr.connect(some_obj, TQT_SIGNAL(someSignal()), TQT_SLOT(slot()));
+ * sr.connect(some_obj, TQ_SIGNAL(someSignal()), TQ_SLOT(slot()));
  * <do something with some_obj> ...
  * if (sr.receivedSignal()) { // yes, signal was received
  * }