Replace various '#define' strings - part 6

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

2 files changed, 17 insertions, 17 deletions

diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 8f698f3..f91bfd3 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -101,8 +101,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*
 
   installEventFilter(m_listView);
 
-  ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), TQT_TQOBJECT(this), TQT_SLOT(slotRefreshNode(const DOM::Node &)));
-  ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), TQT_TQOBJECT(this), TQT_SLOT(refresh()));
+  ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(slotRefreshNode(const DOM::Node &)));
+  ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), this, TQT_SLOT(refresh()));
 
   initDOMNodeInfo();
 
@@ -1015,7 +1015,7 @@ void DOMTreeView::initDOMNodeInfo()
 
   connect(applyContent, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyContent()));
 
-  ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), TQT_TQOBJECT(this), TQT_SLOT(initializeOptionsFromNode(const DOM::Node &)));
+  ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_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 59628b4..1b59ba3 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -93,7 +93,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
     		TQT_SLOT(slotHtmlPartChanged(TDEHTMLPart *)));
 
     ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)),
-    				TQT_TQOBJECT(this), TQT_SLOT(addMessage(int, const TQString &)));
+    				this, TQT_SLOT(addMessage(int, const TQString &)));
 
     infopanel_ctx = createInfoPanelAttrContextMenu();
     domtree_ctx = createDOMTreeViewContextMenu();
@@ -119,17 +119,17 @@ void DOMTreeWindow::executeAndAddCommand(ManipulationCommand *cmd)
 
 void DOMTreeWindow::setupActions()
 {
-    KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+    KStdAction::close(this, TQT_SLOT(close()), actionCollection());
 
-    KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection())->setEnabled(false);
-    KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false);
-    KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false);
+    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);
 
     m_commandHistory = new KCommandHistory(actionCollection());
 
-    KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection());
+    KStdAction::find(this, TQT_SLOT(slotFind()), actionCollection());
 
-    KStdAction::redisplay(TQT_TQOBJECT(m_view), TQT_SLOT(refresh()), actionCollection());
+    KStdAction::redisplay(m_view, TQT_SLOT(refresh()), actionCollection());
 
     // toggle manipulation dialog
     TDEAction *showMsgDlg = new TDEAction(i18n("Show Message Log"),
@@ -141,14 +141,14 @@ void DOMTreeWindow::setupActions()
 //                                   actionCollection(), "custom_action");
 
     // actions for the dom tree list view toolbar
-    KStdAction::up(TQT_TQOBJECT(view()), TQT_SLOT(moveToParent()), actionCollection(), "tree_up");
+    KStdAction::up(view(), TQT_SLOT(moveToParent()), actionCollection(), "tree_up");
     TDEAction *tree_inc_level = new TDEAction(i18n("Expand"),
-			"1rightarrow", CTRL+Key_Greater, TQT_TQOBJECT(view()),
+			"1rightarrow", CTRL+Key_Greater, view(),
 			TQT_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, TQT_TQOBJECT(view()),
+			"1leftarrow", CTRL+Key_Less, view(),
 			TQT_SLOT(decreaseExpansionDepth()), actionCollection(),
 			"tree_dec_level");
     tree_dec_level->setToolTip(i18n("Decrease expansion level"));
@@ -156,20 +156,20 @@ void DOMTreeWindow::setupActions()
     // actions for the dom tree list view context menu
 
     del_tree = new TDEAction(i18n("&Delete"), "edit-delete",
-    			Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()),
+    			Key_Delete, view(), TQT_SLOT(deleteNodes()),
 			actionCollection(), "tree_delete");
     del_tree->setToolTip(i18n("Delete nodes"));
     /*TDEAction *new_elem = */new TDEAction(i18n("New &Element ..."),
-			"bookmark", TDEShortcut(), TQT_TQOBJECT(view()),
+			"bookmark", TDEShortcut(), view(),
 			TQT_SLOT(slotAddElementDlg()), actionCollection(),
 			"tree_add_element");
     /*TDEAction *new_text = */new TDEAction(i18n("New &Text Node ..."),
-			"text", TDEShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()),
+			"text", TDEShortcut(), view(), TQT_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, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()),
+    			Key_Delete, view(), TQT_SLOT(deleteAttributes()),
 			actionCollection(), "attr_delete");
     del_attr->setToolTip(i18n("Delete attributes"));