Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>

13 files changed, 48 insertions, 48 deletions

diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 540a3abc..0d844671 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -67,12 +67,12 @@ Excellent::Excellent()
 {
 	setAcceptDrops(true);
 
-	KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection());
-	KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection());
+	KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
+	KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection());
 	setStandardToolBarMenuEnabled(true);
 
-	menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection());
-	KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection());
+	menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection());
+	KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection());
 
 	// buttons
 	NoatunStdAction::back(actionCollection(), "back");
@@ -82,7 +82,7 @@ Excellent::Excellent()
 	NoatunStdAction::forward(actionCollection(), "forward");
 	NoatunStdAction::playlist(actionCollection(), "show_playlist");
 
-	volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
+	volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, this, TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
 	volumeAction->setCheckedState(i18n("Hide &Volume Control"));
 	NoatunStdAction::effects(actionCollection(), "effects");
 	NoatunStdAction::equalizer(actionCollection(), "equalizer");
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index 1e4da725..b380e438 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -1405,8 +1405,8 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e )
                 return true;
             }
 
-            TQPoint mousePos( m->x()+TQT_TQWIDGET(o)->x(),
-                             m->y()+TQT_TQWIDGET(o)->y() );
+            TQPoint mousePos( m->x()+static_cast<TQWidget*>(o)->x(),
+                             m->y()+static_cast<TQWidget*>(o)->y() );
             TQWidget *slider = 0;
 
             /* find slider that is under the mouse position */
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 9f502178..c63c5d0f 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -112,7 +112,7 @@ Kaiman::Kaiman()
 	if( napp->player()->isPlaying() )
 		newSong();
 
-	new KaimanPrefDlg(TQT_TQOBJECT(this));
+	new KaimanPrefDlg(this);
 
 	show();
 }
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index 420ccd01..9ee32b90 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -47,13 +47,13 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0)
                          player, TQT_SLOT( toggleListView() ));
         s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString(),
                          CTRL+ALT+Key_O, KKey::QtWIN+CTRL+Key_O,
-                         TQT_TQOBJECT(napp), TQT_SLOT( fileOpen() ));
+                         napp, TQT_SLOT( fileOpen() ));
         s_accel->insert( "Effects", i18n("Effects Configuration"), TQString(),
                          CTRL+ALT+Key_E, KKey::QtWIN+CTRL+Key_E,
-                         TQT_TQOBJECT(napp), TQT_SLOT( effectView() ));
+                         napp, TQT_SLOT( effectView() ));
         s_accel->insert( "Preferences", i18n("Preferences"), TQString(),
                          CTRL+ALT+Key_F, KKey::QtWIN+CTRL+Key_F,
-                         TQT_TQOBJECT(napp), TQT_SLOT( preferences() ));
+                         napp, TQT_SLOT( preferences() ));
         s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString(),
                          CTRL+ALT+SHIFT+Key_Up, KKey::QtWIN+CTRL+SHIFT+Key_Up,
                          this, TQT_SLOT( slotVolumeUp() ));
@@ -81,7 +81,7 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0)
 
         s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString(),
                          CTRL+ALT+Key_W, KKey::QtWIN+CTRL+Key_W,
-                         TQT_TQOBJECT(napp), TQT_SLOT( toggleInterfaces() ));
+                         napp, TQT_SLOT( toggleInterfaces() ));
 
         s_accel->readSettings();
         s_accel->updateConnections();
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index ce9c88c8..e23c47a7 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -131,7 +131,7 @@ KJLoader::KJLoader()
 
 	subwidgets.setAutoDelete(true);
 
-	mPrefs = new KJPrefs(TQT_TQOBJECT(this));
+	mPrefs = new KJPrefs(this);
 	connect ( mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()) );
 
 	TQString skin = mPrefs->skin();
diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index 72064a4a..4ff6a9e0 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -182,7 +182,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
 
     // Get the correct validator
     if ( info && !groupName.isNull() )
-        validator = info->createValidator( groupName, key, TQT_TQOBJECT(parent) );
+        validator = info->createValidator( groupName, key, parent );
 
     // meta_widget is used for book-keeping internally
     meta_widget = new MetaWidget;
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index 7ab51333..702424af 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -41,7 +41,7 @@ Monoscope::~Monoscope()
 void Monoscope::init()
 {
 	mAction = new TDEToggleAction(i18n("Toggle Monoscope"), 0, 0,
-		TQT_TQOBJECT(this), TQT_SLOT(toggle()), TQT_TQOBJECT(this), "togglemonoscope");
+		this, TQT_SLOT(toggle()), this, "togglemonoscope");
 	mAction->setChecked(!isHidden());
 	napp->pluginActionMenu()->insert(mAction);
 }
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index 929ada84..e06feca5 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -126,10 +126,10 @@ SimpleUI::~SimpleUI()
 
 void SimpleUI::setupActions()
 {
-    KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
-    new TDEAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()),
+    KStdAction::open( napp, TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
+    new TDEAction( i18n("&Properties"), 0, propertiesDialog, TQT_SLOT(show()),
         actionCollection(), "_file_properties" );
-    KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit");
+    KStdAction::quit( napp, TQT_SLOT(quit()), actionCollection(), "_file_quit");
 
      NoatunStdAction::playlist( actionCollection(), "view_playlist" );
     actionCollection()->insert(video->action( "half_size" ));
@@ -139,14 +139,14 @@ void SimpleUI::setupActions()
 
     actionCollection()->insert(napp->pluginActionMenu());
 
-    menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()),
+    menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()),
         actionCollection());
-    statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()),
+    statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()),
         actionCollection());
     NoatunStdAction::effects( actionCollection(), "effects" );
     NoatunStdAction::equalizer( actionCollection(), "equalizer" );
     NoatunStdAction::loop( actionCollection(), "loop_style" );
-    KStdAction::preferences( TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection() );
+    KStdAction::preferences( napp, TQT_SLOT(preferences()), actionCollection() );
 }
 
 void SimpleUI::showMenubar()
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index b7481125..b0179b88 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -49,7 +49,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
 	addRef();
 	setUrl(text);
 
-	static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+	static_cast<TDEListView*>(parent)->moveItem(this, 0, after);
 	setOn(true);
 
 	// is this really needed, it makes the listview too wide for me :(
@@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
 		}
 	}
 
-	static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+	static_cast<TDEListView*>(parent)->moveItem(this, 0, after);
 	modified();
 
 	if (!streamable() && enqueue(url()))
@@ -355,10 +355,10 @@ List::List(View *parent)
 	setDragEnabled(true);
 	setItemsMovable(true);
 	setSelectionMode(TQListView::Extended);
-	connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*)));
-	connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(move()));
-	connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting()));
-	connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected()));
+	connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*)));
+	connect(this, TQT_SIGNAL(moved()), TQT_SLOT(move()));
+	connect(this, TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting()));
+	connect(this, TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected()));
 }
 
 List::~List()
@@ -377,7 +377,7 @@ bool List::acceptDrag(TQDropEvent *event) const
 
 void List::dropEvent(TQDropEvent *event, TQListViewItem *after)
 {
-	static_cast<View*>(TQT_TQWIDGET(parent()))->setNoSorting();
+	static_cast<View*>(parent())->setNoSorting();
 	KURL::List textlist;
 	if (!KURLDrag::decode(event, textlist)) return;
 	event->acceptAction();
@@ -638,25 +638,25 @@ View::View(SplitPlaylist *)
 {
 	list=new List(this);
 	setCentralWidget(list);
-	connect(list, TQT_SIGNAL(modified(void)), TQT_TQOBJECT(this), TQT_SLOT(setModified(void)) );
+	connect(list, TQT_SIGNAL(modified(void)), this, TQT_SLOT(setModified(void)) );
 	// connect the click on the header with sorting
 	connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) );
 
-	mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
-	(void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()),  actionCollection(), "add_dir");
-	mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()),  actionCollection(), "delete");
+	mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files");
+	(void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()),  actionCollection(), "add_dir");
+	mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, this, TQT_SLOT(deleteSelected()),  actionCollection(), "delete");
 
-	mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
-	mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
+	mClose=KStdAction::close(this, TQT_SLOT(close()), actionCollection());
+	mFind=KStdAction::find(this, TQT_SLOT(find()), actionCollection());
 
-	(void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
-	mOpenNew=KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection());
-	mOpenpl=KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
-	mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
-	mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
+	(void) KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection());
+	mOpenNew=KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection());
+	mOpenpl=KStdAction::open(this, TQT_SLOT(open()), actionCollection());
+	mSave=KStdAction::save(this, TQT_SLOT(save()), actionCollection());
+	mSaveAs=KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
 
-	(void) new TDEAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle");
-	(void) new TDEAction(i18n("Clear"), "edit-clear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
+	(void) new TDEAction(i18n("Shuffle"), "misc", 0, SPL, TQT_SLOT( randomize() ), actionCollection(), "shuffle");
+	(void) new TDEAction(i18n("Clear"), "edit-clear", 0, list, TQT_SLOT( clear() ), actionCollection(), "clear");
 
 	createGUI("splui.rc");
 
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 2a7953d3..a1270076 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(),
 
 	removeCover(); // make sure any old temp cover is gone
 
-	KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection());
-	KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection());
-	KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection());
+	KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
+	KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection());
+	KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection());
 	NoatunStdAction::back(actionCollection(), "back");
 	NoatunStdAction::stop(actionCollection(), "stop");
 	NoatunStdAction::playpause(actionCollection(), "play");
@@ -145,7 +145,7 @@ NoatunSystray::~NoatunSystray()
 
 void NoatunSystray::init()
 {
-	YHModule *cmod = new YHModule(TQT_TQOBJECT(this));
+	YHModule *cmod = new YHModule(this);
 	connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings()));
 	slotLoadSettings();
 }
diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp
index c0b1c859..4cfe5d21 100644
--- a/noatun/modules/voiceprint/voiceprint.cpp
+++ b/noatun/modules/voiceprint/voiceprint.cpp
@@ -35,7 +35,7 @@ VoicePrint::~VoicePrint()
 
 void VoicePrint::init()
 {
-	Prefs *p=new Prefs(TQT_TQOBJECT(this));
+	Prefs *p=new Prefs(this);
 	p->reopen();
 	p->save();
 	resizeEvent(0);
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index a1ff8cdc..d5413414 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
@@ -138,7 +138,7 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode)
     {
         if (!winSkinVis)
         {
-            winSkinVis=new WinSkinVis(TQT_TQOBJECT(this),"WinSkinVis");
+            winSkinVis=new WinSkinVis(this,"WinSkinVis");
             connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks()));
         }
     }
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 961ed457..7e49da08 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -27,7 +27,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
         CModule(i18n("Winskin"),
 	        i18n("Skin Selection for the Winskin Plugin"),
 	        "style",
-	        TQT_TQOBJECT(parent))
+	        parent)
 {
     // Make a token horizontal layout box
     vbox = new TQVBoxLayout(this);