TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

1 files changed, 48 insertions, 48 deletions

diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index 99b69cb3..72c67d1c 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -21,8 +21,8 @@
 namespace NoatunStdAction
 {
 /////////////////////////////////////////////////////
-PlayAction::PlayAction(TQObject *parent, const char *name)
-	: KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name)
+PlayAction::PlayAction(TQObject *tqparent, const char *name)
+	: KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), tqparent, name)
 {
 	connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing()));
 	connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying()));
@@ -46,8 +46,8 @@ void PlayAction::notplaying()
 }
 /////////////////////////////////////////////////////
 
-PlaylistAction::PlaylistAction(TQObject *parent, const char *name)
-	: KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name)
+PlaylistAction::PlaylistAction(TQObject *tqparent, const char *name)
+	: KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), tqparent, name)
 {
         setCheckedState(i18n("Hide Playlist"));
 	connect(napp->player(), TQT_SIGNAL(playlistShown()),  TQT_SLOT(shown()));
@@ -67,8 +67,8 @@ void PlaylistAction::hidden()
 
 ////////////////////////////////////////////////////
 
-PluginActionMenu::PluginActionMenu(TQObject *parent, const char *name)
-	: KActionMenu(i18n("&Actions"), parent, name)
+PluginActionMenu::PluginActionMenu(TQObject *tqparent, const char *name)
+	: KActionMenu(i18n("&Actions"), tqparent, name)
 {
 // 	kdDebug(66666) << k_funcinfo << "called" << endl;
 	setEnabled(false);
@@ -111,11 +111,11 @@ void PluginActionMenu::menuRemove(int id)
 
 ////////////////////////////////////////////////////
 
-VisActionMenu::VisActionMenu(TQObject *parent, const char *name)
-	: KActionMenu(i18n("&Visualizations"), parent, name)
+VisActionMenu::VisActionMenu(TQObject *tqparent, const char *name)
+	: KActionMenu(i18n("&Visualizations"), tqparent, name)
 {
-	connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillPopup()));
-	connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleVisPlugin(int)));
+	connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup()));
+	connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int)));
 }
 
 void VisActionMenu::fillPopup()
@@ -133,14 +133,14 @@ void VisActionMenu::fillPopup()
 		{
 			id = popupMenu()->insertItem((*i).name);
 			mSpecMap[id] = (*i).specfile;
-			popupMenu()->setItemChecked(id, loaded.contains(*i));
+			popupMenu()->setItemChecked(id, loaded.tqcontains(*i));
 		}
 	}
 }
 
 void VisActionMenu::toggleVisPlugin(int id)
 {
-	if(!mSpecMap.contains(id))
+	if(!mSpecMap.tqcontains(id))
 		return;
 
 	TQString specfile = mSpecMap[id];
@@ -159,30 +159,30 @@ void VisActionMenu::toggleVisPlugin(int id)
 
 ////////////////////////////////////////////////////
 
-LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name)
-	: KActionMenu(i18n("&Loop"), parent, name)
+LoopActionMenu::LoopActionMenu(TQObject *tqparent, const char *name)
+	: KActionMenu(i18n("&Loop"), tqparent, name)
 {
 	mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"),
-		0, this, TQT_SLOT(loopNoneSelected()), this, "loop_none");
+		0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none");
 	mLoopNone->setExclusiveGroup("loopType");
 	insert(mLoopNone);
 
 	mLoopSong = new KRadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"),
-		0, this, TQT_SLOT(loopSongSelected()), this, "loop_song");
+		0, TQT_TQOBJECT(this), TQT_SLOT(loopSongSelected()), TQT_TQOBJECT(this), "loop_song");
 	mLoopSong->setExclusiveGroup("loopType");
 	insert(mLoopSong);
 
 	mLoopPlaylist = new KRadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"),
-		0, this, TQT_SLOT(loopPlaylistSelected()), this, "loop_playlist");
+		0, TQT_TQOBJECT(this), TQT_SLOT(loopPlaylistSelected()), TQT_TQOBJECT(this), "loop_playlist");
 	mLoopPlaylist->setExclusiveGroup("loopType");
 	insert(mLoopPlaylist);
 
 	mLoopRandom = new KRadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"),
-		0, this, TQT_SLOT(loopRandomSelected()), this, "loop_random");
+		0, TQT_TQOBJECT(this), TQT_SLOT(loopRandomSelected()), TQT_TQOBJECT(this), "loop_random");
 	mLoopRandom->setExclusiveGroup("loopType");
 	insert(mLoopRandom);
 
-	connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(updateLooping(int)));
+	connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_TQOBJECT(this), TQT_SLOT(updateLooping(int)));
 
 	updateLooping(static_cast<int>(napp->player()->loopStyle()));
 }
@@ -232,29 +232,29 @@ void LoopActionMenu::loopRandomSelected()
 
 ////////////////////////////////////////////////////
 
-KAction *playpause(TQObject *parent, const char *name)
+KAction *playpause(TQObject *tqparent, const char *name)
 {
-	return new PlayAction(parent, name);
+	return new PlayAction(tqparent, name);
 }
 
-KAction *effects(TQObject *parent, const char *name)
+KAction *effects(TQObject *tqparent, const char *name)
 {
-	return new KAction(i18n("&Effects..."), "effect", 0, napp, TQT_SLOT(effectView()), parent, name);
+	return new KAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), tqparent, name);
 }
 
-KAction *equalizer(TQObject *parent, const char *name)
+KAction *equalizer(TQObject *tqparent, const char *name)
 {
-	return new KAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQT_SLOT(equalizerView()), parent, name);
+	return new KAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), tqparent, name);
 }
 
-KAction *back(TQObject *parent, const char *name)
+KAction *back(TQObject *tqparent, const char *name)
 {
-	return new KAction(i18n("&Back"), "player_start", 0, napp->player(), TQT_SLOT(back()), parent, name);
+	return new KAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), tqparent, name);
 }
 
-KAction *stop(TQObject *parent, const char *name)
+KAction *stop(TQObject *tqparent, const char *name)
 {
-	StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), parent, name);
+	StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), tqparent, name);
 	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable()));
@@ -265,14 +265,14 @@ KAction *stop(TQObject *parent, const char *name)
 	return action;
 }
 
-KAction *forward(TQObject *parent, const char *name)
+KAction *forward(TQObject *tqparent, const char *name)
 {
-	return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name);
+	return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), tqparent, name);
 }
 
-KAction *play(TQObject *parent, const char *name)
+KAction *play(TQObject *tqparent, const char *name)
 {
-	StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
+	StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name);
 	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable()));
@@ -283,9 +283,9 @@ KAction *play(TQObject *parent, const char *name)
 	return action;
 }
 
-KAction *pause(TQObject *parent, const char *name)
+KAction *pause(TQObject *tqparent, const char *name)
 {
-	StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
+	StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name);
 	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable()));
 	TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable()));
@@ -296,9 +296,9 @@ KAction *pause(TQObject *parent, const char *name)
 	return action;
 }
 
-LoopActionMenu *loop(TQObject *parent, const char *name)
+LoopActionMenu *loop(TQObject *tqparent, const char *name)
 {
-	return new LoopActionMenu(parent, name);
+	return new LoopActionMenu(tqparent, name);
 }
 
 PluginActionMenu *actions()
@@ -307,14 +307,14 @@ PluginActionMenu *actions()
 	return napp->pluginActionMenu();
 }
 
-VisActionMenu *visualizations(TQObject *parent, const char *name)
+VisActionMenu *visualizations(TQObject *tqparent, const char *name)
 {
-	return new VisActionMenu(parent, name);
+	return new VisActionMenu(tqparent, name);
 }
 
-KToggleAction *playlist(TQObject *parent, const char *name)
+KToggleAction *playlist(TQObject *tqparent, const char *name)
 {
-	return new PlaylistAction(parent, name);
+	return new PlaylistAction(tqparent, name);
 }
 
 KPopupMenu *ContextMenu::mContextMenu = 0;
@@ -333,15 +333,15 @@ KPopupMenu *ContextMenu::createContextMenu(TQWidget *p)
 	KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false);
 	KActionCollection* actions = new KActionCollection(helpmenu);
 
-	KStdAction::open(napp, TQT_SLOT(fileOpen()), actions)->plug(contextMenu);
-	KStdAction::quit(napp, TQT_SLOT(quit()), actions)->plug(contextMenu);
+	KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actions)->plug(contextMenu);
+	KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actions)->plug(contextMenu);
 	contextMenu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), helpmenu->menu());
 	contextMenu->insertSeparator();
-	KStdAction::preferences(napp, TQT_SLOT(preferences()), actions)->plug(contextMenu);
-	NoatunStdAction::playlist(contextMenu)->plug(contextMenu);
-	NoatunStdAction::effects(contextMenu)->plug(contextMenu);
-	NoatunStdAction::equalizer(napp)->plug(contextMenu);
-	NoatunStdAction::visualizations(napp)->plug(contextMenu);
+	KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actions)->plug(contextMenu);
+	NoatunStdAction::playlist(TQT_TQOBJECT(contextMenu))->plug(contextMenu);
+	NoatunStdAction::effects(TQT_TQOBJECT(contextMenu))->plug(contextMenu);
+	NoatunStdAction::equalizer(TQT_TQOBJECT(napp))->plug(contextMenu);
+	NoatunStdAction::visualizations(TQT_TQOBJECT(napp))->plug(contextMenu);
 	napp->pluginActionMenu()->plug(contextMenu);
 
 	return contextMenu;