TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 18 insertions, 18 deletions

diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 0dd6d7f..6790e5a 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -72,7 +72,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
 
     // message window dialog
     msgdlg = new MessageDialog(0, "MessageDialog");
-    msgdlg->messagePane->setPaletteBackgroundColor(palette().active().base());
+    msgdlg->messagePane->setPaletteBackgroundColor(tqpalette().active().base());
 // msgdlg->show();
 
     // then, setup our actions
@@ -93,7 +93,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
     		TQT_SLOT(slotHtmlPartChanged(KHTMLPart *)));
 
     ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)),
-    				this, TQT_SLOT(addMessage(int, const TQString &)));
+    				TQT_TQOBJECT(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(this, TQT_SLOT(close()), actionCollection());
+    KStdAction::close(TQT_TQOBJECT(this), TQT_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(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);
 
     m_commandHistory = new KCommandHistory(actionCollection());
 
-    KStdAction::find(this, TQT_SLOT(slotFind()), actionCollection());
+    KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection());
 
-    KStdAction::redisplay(m_view, TQT_SLOT(refresh()), actionCollection());
+    KStdAction::redisplay(TQT_TQOBJECT(m_view), TQT_SLOT(refresh()), actionCollection());
 
     // toggle manipulation dialog
     KAction *showMsgDlg = new KAction(i18n("Show Message Log"),
@@ -141,14 +141,14 @@ void DOMTreeWindow::setupActions()
 //                                   actionCollection(), "custom_action");
 
     // actions for the dom tree list view toolbar
-    KStdAction::up(view(), TQT_SLOT(moveToParent()), actionCollection(), "tree_up");
+    KStdAction::up(TQT_TQOBJECT(view()), TQT_SLOT(moveToParent()), actionCollection(), "tree_up");
     KAction *tree_inc_level = new KAction(i18n("Expand"),
-			"1rightarrow", CTRL+Key_Greater, view(),
+			"1rightarrow", CTRL+Key_Greater, TQT_TQOBJECT(view()),
 			TQT_SLOT(increaseExpansionDepth()), actionCollection(),
 			"tree_inc_level");
     tree_inc_level->setToolTip(i18n("Increase expansion level"));
     KAction *tree_dec_level = new KAction(i18n("Collapse"),
-			"1leftarrow", CTRL+Key_Less, view(),
+			"1leftarrow", CTRL+Key_Less, TQT_TQOBJECT(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 KAction(i18n("&Delete"), "editdelete",
-    			Key_Delete, view(), TQT_SLOT(deleteNodes()),
+    			Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()),
 			actionCollection(), "tree_delete");
     del_tree->setToolTip(i18n("Delete nodes"));
     /*KAction *new_elem = */new KAction(i18n("New &Element ..."),
-			"bookmark", KShortcut(), view(),
+			"bookmark", KShortcut(), TQT_TQOBJECT(view()),
 			TQT_SLOT(slotAddElementDlg()), actionCollection(),
 			"tree_add_element");
     /*KAction *new_text = */new KAction(i18n("New &Text Node ..."),
-			"text", KShortcut(), view(), TQT_SLOT(slotAddTextDlg()),
+			"text", KShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()),
 			actionCollection(), "tree_add_text");
 
     // actions for the info panel attribute list context menu
     del_attr = new KAction(i18n("&Delete"), "editdelete",
-    			Key_Delete, view(), TQT_SLOT(deleteAttributes()),
+    			Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()),
 			actionCollection(), "attr_delete");
     del_attr->setToolTip(i18n("Delete attributes"));
 
@@ -230,7 +230,7 @@ void DOMTreeWindow::dragEnterEvent(TQDragEnterEvent *event)
 void DOMTreeWindow::dropEvent(TQDropEvent *event)
 {
     // this is a very simplistic implementation of a drop event.  we
-    // will only accept a dropped URL.  the Qt dnd code can do *much*
+    // will only accept a dropped URL.  the TQt dnd code can do *much*
     // much more, so please read the docs there
     KURL::List urls;
 
@@ -248,7 +248,7 @@ void DOMTreeWindow::dropEvent(TQDropEvent *event)
 
 void DOMTreeWindow::addMessage(int msg_id, const TQString &msg)
 {
-  TQDateTime t(TQDateTime::currentDateTime());
+  TQDateTime t(TQDateTime::tqcurrentDateTime());
   TQString fullmsg = t.toString();
   fullmsg += ":";
 
@@ -356,7 +356,7 @@ void DOMTreeWindow::slotActivePartChanged(KParts::Part *p)
 
   m_commandHistory->clear();
   view()->disconnectFromTornDownPart();
-  view()->setHtmlPart(::qt_cast<KHTMLPart *>(p));
+  view()->setHtmlPart(::tqqt_cast<KHTMLPart *>(p));
 }
 
 void DOMTreeWindow::slotPartRemoved(KParts::Part *p)