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

diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index 7a9d70c4..fca8b6bb 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-	kjloader.cpp  -  The KJöfol-GUI itself
+	kjloader.cpp  -  The KJ�fol-GUI itself
 	--------------------------------------
 	Maintainer: Stefan Gehn <sgehn@gmx.net>
 
@@ -69,11 +69,11 @@
 #include <kwin.h>
 #include <kiconloader.h>
 
-class KJToolTip : public QToolTip
+class KJToolTip : public TQToolTip
 {
 public:
-	KJToolTip(KJLoader *parent)
-		: TQToolTip(parent), mParent(parent)
+	KJToolTip(KJLoader *tqparent)
+		: TQToolTip(tqparent), mParent(tqparent)
 	{}
 
 protected:
@@ -131,7 +131,7 @@ KJLoader::KJLoader()
 
 	subwidgets.setAutoDelete(true);
 
-	mPrefs = new KJPrefs(this);
+	mPrefs = new KJPrefs(TQT_TQOBJECT(this));
 	connect ( mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()) );
 
 	TQString skin = mPrefs->skin();
@@ -142,7 +142,7 @@ KJLoader::KJLoader()
 	else
 	{
 		KNotifyClient::event(winId(), "warning",
-			i18n("There was trouble loading skin %1. Please select another skin file.").arg(skin));
+			i18n("There was trouble loading skin %1. Please select another skin file.").tqarg(skin));
 		napp->preferences();
 	}
 
@@ -163,7 +163,7 @@ TQPtrList<KJWidget> KJLoader::widgetsAt(const TQPoint &pt) const
 {
 	TQPtrList<KJWidget> things;
 	for ( TQPtrListIterator<KJWidget> i(subwidgets); i.current(); ++i )
-		if ( (*i)->rect().contains(pt) )
+		if ( (*i)->rect().tqcontains(pt) )
 			things.append((*i));
 
 	return things;
@@ -173,7 +173,7 @@ void KJLoader::removeChild(KJWidget *c)
 {
 	if ( mClickedIn == c )
 		mClickedIn = 0;
-	if (subwidgets.findRef(c) != -1)
+	if (subwidgets.tqfindRef(c) != -1)
 		subwidgets.take();
 }
 
@@ -219,7 +219,7 @@ void KJLoader::loadSkin(const TQString &file)
 		if ( exist("dockmodercfile") )
 		{
 			// set path to dockmode rc-file (its not always skinname.dck)
-			mCurrentDockModeSkin = file.left(file.findRev("/")+1) + (item("dockmodercfile")[1]);
+			mCurrentDockModeSkin = file.left(file.tqfindRev("/")+1) + (item("dockmodercfile")[1]);
 			mDockPosition  = item("dockmodeposition")[1].toInt();
 			mDockPositionX = item("dockmodepositionxy")[1].toInt();
 			mDockPositionY = item("dockmodepositionxy")[2].toInt();
@@ -228,7 +228,7 @@ void KJLoader::loadSkin(const TQString &file)
 			mCurrentDockModeSkin="";
 
 		if ( exist("winshademodercfile") )
-			mCurrentWinshadeModeSkin = file.left(file.findRev("/")+1) + (item("winshademodercfile")[1]);
+			mCurrentWinshadeModeSkin = file.left(file.tqfindRev("/")+1) + (item("winshademodercfile")[1]);
 		else	// no WinshadeMode
 			mCurrentWinshadeModeSkin="";
 	}
@@ -377,7 +377,7 @@ void KJLoader::loadSkin(const TQString &file)
 	for (TQDictIterator<TQStringList> i(*this); i.current(); ++i)
 	{
 		TQString d=i.currentKey();
-		if(d.contains("button") &&
+		if(d.tqcontains("button") &&
 			!d.startsWith("playlistwindow") && // don't add buttons that belong to the playlistwindow
 			d != "pitchcontrolbutton" &&  // both already handled above as they aren't buttons but sliders
 			d != "volumecontrolbutton" &&
@@ -392,7 +392,7 @@ void KJLoader::loadSkin(const TQString &file)
 	show();
 	conserveMemory();
 
-	repaint();
+	tqrepaint();
 
 	// update displays if we are already playing
 	// This happens while changing skins
@@ -728,11 +728,11 @@ void KJLoader::mouseMoveEvent(TQMouseEvent *e)
 
 //	TQWidget::mouseMoveEvent(e);
 	// not on background but on a widget: pass event to subwidget
-	if ( !moving && mClickedIn && subwidgets.findRef(mClickedIn) != -1 )
+	if ( !moving && mClickedIn && subwidgets.tqfindRef(mClickedIn) != -1 )
 	{
 		mClickedIn->mouseMove (
 			e->pos()-mClickedIn->rect().topLeft(),
-			mClickedIn->rect().contains(mapFromGlobal(TQCursor::pos())) );
+			mClickedIn->rect().tqcontains(mapFromGlobal(TQCursor::pos())) );
 	}
 }
 
@@ -742,14 +742,14 @@ void KJLoader::mousePressEvent(TQMouseEvent *e)
 
 //	TQWidget::mousePressEvent(e);
 
-	if ( e->button()==RightButton )
+	if ( e->button()==Qt::RightButton )
 		NoatunStdAction::ContextMenu::showContextMenu();
 	else /* if ( e->button()==LeftButton ) */
 	{
 		mMousePoint = mapFromGlobal(TQCursor::pos());
 		// try to find a KJWidget that is here
 		for (KJWidget* i=subwidgets.first(); i!=0; i=subwidgets.next())
-			if (i->rect().contains(mMousePoint))
+			if (i->rect().tqcontains(mMousePoint))
 			{
 				if (i->mousePress(mMousePoint-i->rect().topLeft()))
 				{
@@ -769,11 +769,11 @@ void KJLoader::mouseReleaseEvent(TQMouseEvent */*e*/)
 
 //	TQWidget::mouseReleaseEvent(e);
 
-	if (!moving && mClickedIn && subwidgets.findRef(mClickedIn)!=-1)
+	if (!moving && mClickedIn && subwidgets.tqfindRef(mClickedIn)!=-1)
 	{
 		mClickedIn->mouseRelease(mapFromGlobal(TQCursor::pos())-
 		                                       mClickedIn->rect().topLeft(),
-		                         mClickedIn->rect().contains(
+		                         mClickedIn->rect().tqcontains(
 			                         mapFromGlobal(TQCursor::pos())));
 		mClickedIn=0;
 	}
@@ -812,7 +812,7 @@ void KJLoader::showSplash()
 	splashScreen->setBackgroundMode ( NoBackground );
 	splashScreen->setMask( KJWidget::getMask(image(item("splashscreen")[1])) );
 
-	TQSize sh = splashScreen->sizeHint();
+	TQSize sh = splashScreen->tqsizeHint();
 
 	TQRect desk = KGlobalSettings::splashScreenDesktopGeometry();
 	splashScreen->move (desk.x() + (desk.width() - sh.width())/2,