Replace various '#define' strings - part 6

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

9 files changed, 28 insertions, 28 deletions

diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index dd6ec3c..93453e0 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -66,7 +66,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
     TDEHTMLView* view = 0L;
           
     if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("TDEHTMLView"))
-            view = static_cast<TDEHTMLView*>(TQT_TQWIDGET(popupmenu->parent()));
+            view = static_cast<TDEHTMLView*>(popupmenu->parent());
     
     if (view)
         m_part = view->part();
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"));
 
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 35fe9c8..6b98470 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -50,7 +50,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
 
     TQFileInfo fileInfo(path);
     if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable())
-        action = new TDEAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this));
+        action = new TDEAction(name, 0, this, TQT_SLOT(new_slot( ) ), this);
 }
 KDirMenu::~KDirMenu( ) {
     delete action;
diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp
index 3a8ecd4..aaec725 100644
--- a/konq-plugins/kuick/kmetamenu.cpp
+++ b/konq-plugins/kuick/kmetamenu.cpp
@@ -111,7 +111,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
     }
 
 
-     m_browse = new TDEAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) );
+     m_browse = new TDEAction(i18n("&Browse..."), 0, this, TQT_SLOT(slotBrowse()), this );
      m_browse->plug(this);
      // read the last chosen dirs
      // first set the group according to our parameter
@@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
              continue;
          }
          TQString escapedDir = *it;
-         TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this));
+         TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, this, TQT_SLOT(slotFastPath()), this);
          action->plug(this );
          actions.append( action );
          ++it;
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 397215f..65eba0b 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -94,7 +94,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
 
 	configurationChanged();
 
-	KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(TQT_TQWIDGET(parent));
+	KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(parent);
 
 	//Grab the part manager. Don't know of any other way, and neither does Tronical, so..
 	KParts::PartManager *partMan = static_cast<KParts::PartManager*>(mainWin->child(0, "KParts::PartManager"));
@@ -413,7 +413,7 @@ void SearchBarPlugin::showSelectionMenu()
 		}
 
 		m_popupMenu->insertSeparator();
-		m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectGoogleSuggestMode()), TQT_TQOBJECT(m_popupMenu));
+		m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQT_SLOT(selectGoogleSuggestMode()), m_popupMenu);
 		TQStringList google_modes;
                 google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never");
 		m_googleMenu->setItems(google_modes);
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
index ad20c07..f0945a9 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
@@ -34,7 +34,7 @@
 
 KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent)
 {
-	player = new Player(TQT_TQOBJECT(this));
+	player = new Player(this);
 	empty();
 
 	TQFont labelFont = time->font();
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 0a3c271..0645745 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -101,7 +101,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   connect(html, TQT_SIGNAL(completed()), this, TQT_SLOT(loadCompleted()));
   connect(html, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotShowPopup(const TQString&, const TQPoint &)));
   
-  functions = new MetabarFunctions(html, TQT_TQOBJECT(this));
+  functions = new MetabarFunctions(html, this);
   
   currentPlugin = 0;
   defaultPlugin = new DefaultPlugin(html, functions);  
@@ -118,10 +118,10 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   layout->addWidget(html->view());
   
   popup = new TDEPopupMenu(0);
-  TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
+  TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), this, TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
   configAction->plug(popup);
   
-  TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload");
+  TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), this, TQT_SLOT(setTheme()), html->actionCollection(), "reload");
   reloadAction->plug(popup);
 
   setTheme();
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index 06a913a..b5186ab 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -168,7 +168,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
           for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){
           
             if(usePopup){
-              TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8());
+              TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), this, TQT_SLOT(runAction()), popup, idString.utf8());
               action->plug(popup);
             }
             else{