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, 8 insertions, 8 deletions

diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp
index 94646315..e009b044 100644
--- a/noatun/library/video.cpp
+++ b/noatun/library/video.cpp
@@ -24,8 +24,8 @@ struct VideoFrame::Private
 };
 
 
-VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char*name, WFlags f)
-	: KVideoWidget(clientParent, parent, name, f)
+VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent, const char*name, WFlags f)
+	: KVideoWidget(clientParent, tqparent, name, f)
 {
 	d = new Private;
 	connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed()));
@@ -33,8 +33,8 @@ VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char
 	frames.append(this);
 }
 
-VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f)
-	 : KVideoWidget(parent, name, f)
+VideoFrame::VideoFrame(TQWidget *tqparent, const char *name, WFlags f)
+	 : KVideoWidget(tqparent, name, f)
 {
 	d = new Private;
 	connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed()));
@@ -62,9 +62,9 @@ VideoFrame *VideoFrame::playing()
 	return whose;
 }
 
-TQPopupMenu *VideoFrame::popupMenu(TQWidget *parent)
+TQPopupMenu *VideoFrame::popupMenu(TQWidget *tqparent)
 {
-    TQPopupMenu *view = new TQPopupMenu(parent);
+    TQPopupMenu *view = new TQPopupMenu(tqparent);
     action( "half_size" )->plug( view );
     action( "normal_size" )->plug( view );
     action( "double_size" )->plug( view );
@@ -122,7 +122,7 @@ GlobalVideo::GlobalVideo()
 	menu = video->popupMenu(this);
 
 	// FIXME: How to obtain minimum size for top-level widgets?
-//	video->setMinimumSize(minimumSizeHint());
+//	video->setMinimumSize(tqminimumSizeHint());
 //	video->setMinimumSize(101,35);
 	video->setMinimumSize(128,96);
 
@@ -151,7 +151,7 @@ void GlobalVideo::hide()
 
 void GlobalVideo::mouseReleaseEvent(TQMouseEvent *e)
 {
-	if (e->button() == RightButton)
+	if (e->button() == Qt::RightButton)
 	{
 		menu->exec(mapToGlobal(e->pos()));
 	}