Remove various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 09d3e49e01a4b798762fd505810b092fd0c77b47)

8 files changed, 45 insertions, 45 deletions

diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp
index 25cf9f2..1bc6dcc 100644
--- a/apps/ktorrent/groups/groupview.cpp
+++ b/apps/ktorrent/groups/groupview.cpp
@@ -136,16 +136,16 @@ namespace kt
 		menu = new TDEPopupMenu(this);
 		
 		new_group = new TDEAction(i18n("New Group"),"document-new",0,
-							 TQT_TQOBJECT(this), TQT_SLOT(addGroup()),col, "New Group");
+							 this, TQT_SLOT(addGroup()),col, "New Group");
 		
 		edit_group = new TDEAction(i18n("Edit Name"),"edit",0,
-							 TQT_TQOBJECT(this), TQT_SLOT(editGroupName()),col,"Edit Group Name");
+							 this, TQT_SLOT(editGroupName()),col,"Edit Group Name");
 		
 		remove_group = new TDEAction(i18n("Remove Group"),"remove",0,
-							 TQT_TQOBJECT(this), TQT_SLOT(removeGroup()),col,"Remove Group");
+							 this, TQT_SLOT(removeGroup()),col,"Remove Group");
 		
 		open_in_new_tab = new TDEAction(i18n("Open Tab"),"document-open",0,
-							 TQT_TQOBJECT(this) ,TQT_SLOT(openView()),col,"Open Tab");
+							 this ,TQT_SLOT(openView()),col,"Open Tab");
 		
 		open_in_new_tab->plug(menu);
 		menu->insertSeparator();
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index 02df83a..191e6ce 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -119,7 +119,7 @@ KTorrent::KTorrent()
 	//setToolviewStyle(KMdi::TextAndIcon);
 	connect(this,TQT_SIGNAL(widgetChanged(TQWidget*)),this,TQT_SLOT(currentTabChanged(TQWidget*)));
 	
-	m_view_man = new ViewManager(TQT_TQOBJECT(this));
+	m_view_man = new ViewManager(this);
 	m_group_view = new kt::GroupView(m_view_man,actionCollection());
 	connect(m_group_view,TQT_SIGNAL(openNewTab(kt::Group*)),this,TQT_SLOT(openView(kt::Group*)));
 	
@@ -191,7 +191,7 @@ KTorrent::KTorrent()
 	m_core->loadTorrents();
 	m_core->loadPlugins();
 
-	connect(&m_gui_update_timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updatedStats()));
+	connect(&m_gui_update_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatedStats()));
 	//Apply GUI update interval
 	int val = 500;
 	switch(Settings::guiUpdateInterval())
@@ -497,51 +497,51 @@ void KTorrent::currentTorrentChanged(kt::TorrentInterface* tc)
 
 void KTorrent::setupActions()
 {
-	KStdAction::openNew(TQT_TQOBJECT(this),TQT_SLOT(fileNew()),actionCollection());
-	KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
-	KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+	KStdAction::openNew(this,TQT_SLOT(fileNew()),actionCollection());
+	KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+	KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
 	
-	KStdAction::paste(TQT_TQOBJECT(kapp),TQT_SLOT(paste()),actionCollection());
+	KStdAction::paste(kapp,TQT_SLOT(paste()),actionCollection());
 
-	m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
-	m_menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowMenubar()), actionCollection()); 
+	m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
+	m_menubarAction = KStdAction::showMenubar(this, TQT_SLOT(optionsShowMenubar()), actionCollection()); 
 
-	KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
-	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+	KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
+	KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 
-	TDEAction* pref = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
+	TDEAction* pref = KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
 	m_start = new TDEAction(
-			i18n("to start", "Start"), "ktstart",0,TQT_TQOBJECT(this), TQT_SLOT(startDownload()),
+			i18n("to start", "Start"), "ktstart",0,this, TQT_SLOT(startDownload()),
 			actionCollection(), "Start");
 
 	m_stop = new TDEAction(
-			i18n("to stop", "Stop"), "ktstop",0,TQT_TQOBJECT(this), TQT_SLOT(stopDownload()),
+			i18n("to stop", "Stop"), "ktstop",0,this, TQT_SLOT(stopDownload()),
 			actionCollection(), "Stop");
 
 	m_remove = new TDEAction(
-			i18n("Remove"), "ktremove",0,TQT_TQOBJECT(this), TQT_SLOT(removeDownload()),
+			i18n("Remove"), "ktremove",0,this, TQT_SLOT(removeDownload()),
 			actionCollection(), "Remove");
 	
 	m_startall = new TDEAction(
-			i18n("to start all", "Start All"), "ktstart_all",0,TQT_TQOBJECT(this), TQT_SLOT(startAllDownloadsCurrentView()),
+			i18n("to start all", "Start All"), "ktstart_all",0,this, TQT_SLOT(startAllDownloadsCurrentView()),
 			actionCollection(), "Start all");
 	
-	m_startall_systray = new TDEAction(i18n("to start all", "Start All"), "ktstart_all",0,TQT_TQOBJECT(this), TQT_SLOT(startAllDownloads()),actionCollection());
+	m_startall_systray = new TDEAction(i18n("to start all", "Start All"), "ktstart_all",0,this, TQT_SLOT(startAllDownloads()),actionCollection());
 	
 	m_stopall = new TDEAction(
-			i18n("to stop all", "Stop All"), "ktstop_all",0,TQT_TQOBJECT(this), TQT_SLOT(stopAllDownloadsCurrentView()),
+			i18n("to stop all", "Stop All"), "ktstop_all",0,this, TQT_SLOT(stopAllDownloadsCurrentView()),
 			actionCollection(), "Stop all");
 	
-	m_stopall_systray = new TDEAction(i18n("to stop all", "Stop All"), "ktstop_all",0,TQT_TQOBJECT(this), TQT_SLOT(stopAllDownloads()),actionCollection());
+	m_stopall_systray = new TDEAction(i18n("to stop all", "Stop All"), "ktstop_all",0,this, TQT_SLOT(stopAllDownloads()),actionCollection());
 	
 	m_pasteurl = new TDEAction(
-			i18n("to paste torrent URL", "Paste Torrent URL..."), "ktstart",0,TQT_TQOBJECT(this), TQT_SLOT(torrentPaste()),
+			i18n("to paste torrent URL", "Paste Torrent URL..."), "ktstart",0,this, TQT_SLOT(torrentPaste()),
 			actionCollection(), "paste_url");
 	
 	m_queuemgr = new TDEAction(
 			i18n("to open Queue Manager", "Open Queue Manager..."),
-			"ktqueuemanager", 0, TQT_TQOBJECT(this), TQT_SLOT(queueManagerShow()),
+			"ktqueuemanager", 0, this, TQT_SLOT(queueManagerShow()),
 			actionCollection(), "Queue manager");
 	
 	m_queueaction = new TDEAction(
@@ -551,14 +551,14 @@ void KTorrent::setupActions()
 	
 	m_ipfilter = new TDEAction(
 			i18n("IPFilter"),
-			"filter", 0, TQT_TQOBJECT(this), TQT_SLOT(showIPFilter()),
+			"filter", 0, this, TQT_SLOT(showIPFilter()),
 			actionCollection(), "ipfilter_action");
 	
 	m_datacheck = new TDEAction(
 			i18n("Check Data Integrity"),
 	TQString(),0,m_view_man,TQT_SLOT(checkDataIntegrity()),actionCollection(),"check_data");
 	
-	m_find = KStdAction::find(TQT_TQOBJECT(this),TQT_SLOT(find()),actionCollection());
+	m_find = KStdAction::find(this,TQT_SLOT(find()),actionCollection());
 	
 	//Plug actions to systemtray context menu
 	m_startall_systray->plug(m_systray_icon->contextMenu());
diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp
index c520d60..6b35c44 100644
--- a/apps/ktorrent/ktorrentcore.cpp
+++ b/apps/ktorrent/ktorrentcore.cpp
@@ -70,7 +70,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin
 	UpdateCurrentTime();
 	
 	qman = new QueueManager();
-	connect(qman, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*,bool)), TQT_TQOBJECT(this), TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*,bool)));
+	connect(qman, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*,bool)), this, TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*,bool)));
 	
 	
 	data_dir = Settings::tempDir();
@@ -1100,17 +1100,17 @@ void KTorrentCore::connectSignals(kt::TorrentInterface* tc)
 	connect(tc,TQT_SIGNAL(finished(kt::TorrentInterface*)),
 			this,TQT_SLOT(torrentFinished(kt::TorrentInterface* )));
 	connect(tc, TQT_SIGNAL(stoppedByError(kt::TorrentInterface*, TQString )),
-			TQT_TQOBJECT(this), TQT_SLOT(slotStoppedByError(kt::TorrentInterface*, TQString )));
+			this, TQT_SLOT(slotStoppedByError(kt::TorrentInterface*, TQString )));
 	connect(tc, TQT_SIGNAL(seedingAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)),
-			TQT_TQOBJECT(this), TQT_SLOT(torrentSeedAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)));
+			this, TQT_SLOT(torrentSeedAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)));
 	connect(tc,TQT_SIGNAL(aboutToBeStarted( kt::TorrentInterface*,bool & )),
-			TQT_TQOBJECT(this), TQT_SLOT(aboutToBeStarted( kt::TorrentInterface*,bool & )));
+			this, TQT_SLOT(aboutToBeStarted( kt::TorrentInterface*,bool & )));
 	connect(tc,TQT_SIGNAL(corruptedDataFound( kt::TorrentInterface* )),
-			TQT_TQOBJECT(this), TQT_SLOT(emitCorruptedData( kt::TorrentInterface* )));
+			this, TQT_SLOT(emitCorruptedData( kt::TorrentInterface* )));
 	connect(qman, TQT_SIGNAL(queuingNotPossible(kt::TorrentInterface*)),
-			TQT_TQOBJECT(this), TQT_SLOT(enqueueTorrentOverMaxRatio( kt::TorrentInterface* )));
+			this, TQT_SLOT(enqueueTorrentOverMaxRatio( kt::TorrentInterface* )));
 	connect(qman, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)),
-			TQT_TQOBJECT(this), TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool)));
+			this, TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool)));
 	
 }
 
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index 89ed258..7e54e7a 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -56,9 +56,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
     TQToolTip::add(this, m_realText);
 
     m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0,
-        TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this));
+        this, TQT_SLOT(assignAccel()), this);
     m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0,
-        TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this));
+        this, TQT_SLOT(clearAccel()), this);
 
     TDEConfig *config = kapp->config();
     config->setGroup("UI");
diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
index dd875b4..5866aa3 100644
--- a/apps/ktorrent/newui/ddockwindow.cpp
+++ b/apps/ktorrent/newui/ddockwindow.cpp
@@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
     m_widgetStack = new TQWidgetStack(this);
     m_internalLayout->addWidget(m_widgetStack);
 
-    m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) );
-    m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) );
-    m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) );
+    m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQT_SLOT(moveToDockLeft()), this );
+    m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQT_SLOT(moveToDockRight()), this );
+    m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQT_SLOT(moveToDockBottom()), this );
 
     setVisible(m_visible);
 
@@ -192,8 +192,8 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
     m_bar->addButton(button);
 
     m_widgetStack->addWidget(widget);
-    connect(button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(selectWidget()));
-    connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQPopupMenu*)) );
+    connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget()));
+    connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) );
 
     if (!skipActivation)
     {
diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp
index b2df871..ffab197 100644
--- a/apps/ktorrent/newui/dmainwindow.cpp
+++ b/apps/ktorrent/newui/dmainwindow.cpp
@@ -306,7 +306,7 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view)
 
 void DMainWindow::widgetDestroyed()
 {
-    TQWidget *w = TQT_TQWIDGET(const_cast<TQObject*>(sender()));
+    TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender()));
 
     if (m_docks.contains(w))
     {
diff --git a/plugins/infowidget/floatspinbox.cpp b/plugins/infowidget/floatspinbox.cpp
index 111070b..ed435ed 100644
--- a/plugins/infowidget/floatspinbox.cpp
+++ b/plugins/infowidget/floatspinbox.cpp
@@ -42,7 +42,7 @@ kt::FloatSpinBox::FloatSpinBox(
 	TQSpinBox::setValue(0);
 	setStep( 0.25f );
 	connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int )));
-	setValidator( new LocaleFloatValidator( TQT_TQOBJECT(dynamic_cast<TQSpinBox * > (this)) ));
+	setValidator( new LocaleFloatValidator( dynamic_cast<TQSpinBox * > (this) ));
 	editor()->setAlignment(TQt::AlignRight);
 }
 
@@ -62,7 +62,7 @@ kt::FloatSpinBox::FloatSpinBox(
 	TQSpinBox::setValue(0);
 	setStep( 0.25 );
 	connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int )));
-	setValidator( new LocaleFloatValidator( TQT_TQOBJECT(dynamic_cast<TQSpinBox * > (this)) ));
+	setValidator( new LocaleFloatValidator( dynamic_cast<TQSpinBox * > (this) ));
 }
 
 
@@ -86,7 +86,7 @@ kt::FloatSpinBox::FloatSpinBox(
 	setValue(0.0f);
 	setStep( step );
 	connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int )));
-	setValidator( new LocaleFloatValidator( TQT_TQOBJECT(this) ));
+	setValidator( new LocaleFloatValidator( this ));
 
 }
 
diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
index e1126f5..a45e474 100644
--- a/plugins/search/searchplugin.cpp
+++ b/plugins/search/searchplugin.cpp
@@ -118,7 +118,7 @@ namespace kt
 		SearchWidget* search = new SearchWidget(this);
 		getGUI()->addTabPage(search,iload->loadIconSet("viewmag", TDEIcon::Small),text,this);
 		
-		TDEAction* copy_act = KStdAction::copy(TQT_TQOBJECT(search),TQT_SLOT(copy()),actionCollection());
+		TDEAction* copy_act = KStdAction::copy(search,TQT_SLOT(copy()),actionCollection());
 		copy_act->plug(search->rightClickMenu(),0);
 		searches.append(search);