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

diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp
index 7b884853..b1e03b7a 100644
--- a/noatun/modules/kjofol-skin/kjsliders.cpp
+++ b/noatun/modules/kjofol-skin/kjsliders.cpp
@@ -44,8 +44,8 @@ KJVolumeBar::KJVolumeBar(const TQStringList &i, KJLoader *p)
 
 //	kdDebug(66666) << "x: " << x << " y: " << y << " w: " << xs << " h: " << ys << endl;
 
-	mBack   = parent()->pixmap(parser()["backgroundimage"][1]);
-	mSlider = parent()->pixmap(parser()["volumecontrolimage"][1]);
+	mBack   = tqparent()->pixmap(parser()["backgroundimage"][1]);
+	mSlider = tqparent()->pixmap(parser()["volumecontrolimage"][1]);
 }
 
 TQString KJVolumeBar::tip()
@@ -71,7 +71,7 @@ void KJVolumeBar::paint(TQPainter *p, const TQRect &)
 			rect().y() /*- hotSpot.y()*/,
 			rect().width()  /*+ (2*hotSpot.x())*/,
 			rect().height() /*+ (2*hotSpot.y())*/,
-		Qt::CopyROP);
+		TQt::CopyROP);
 
 	// draw our slider
 	bitBlt(
@@ -83,17 +83,17 @@ void KJVolumeBar::paint(TQPainter *p, const TQRect &)
 			0,
 			mSlider.width(),
 			mSlider.height(),
-		Qt::CopyROP);
+		TQt::CopyROP);
 
 	if (mText)
-		mText->repaint();
+		mText->tqrepaint();
 }
 
 bool KJVolumeBar::mousePress(const TQPoint &pos)
 {
 	mVolume = (pos.x()*100) / rect().width();
 //	kdDebug(66666) << "volume: " << mVolume << endl;
-	repaint();
+	tqrepaint();
 	napp->player()->setVolume(mVolume);
 	return true;
 }
@@ -112,7 +112,7 @@ void KJVolumeBar::mouseMove(const TQPoint &pos, bool in)
 void KJVolumeBar::timeUpdate(int)
 {
 	mVolume = napp->player()->volume();
-	repaint();
+	tqrepaint();
 }
 
 
@@ -133,8 +133,8 @@ KJVolumeBMP::KJVolumeBMP(const TQStringList &i, KJLoader *p)
 	mWidth = parser()["volumecontrolimagexsize"][1].toInt();
 	mCount = parser()["volumecontrolimagenb"][1].toInt()-1;
 
-	mImages = parent()->pixmap(parser()["volumecontrolimage"][1]);
-	mPos = parent()->image(parser()["volumecontrolimageposition"][1]);
+	mImages = tqparent()->pixmap(parser()["volumecontrolimage"][1]);
+	mPos = tqparent()->image(parser()["volumecontrolimageposition"][1]);
 	timeUpdate(0);
 }
 
@@ -146,14 +146,14 @@ TQString KJVolumeBMP::tip()
 void KJVolumeBMP::paint(TQPainter *p, const TQRect &)
 {
 	TQRect from(mVolume*mCount/100*mWidth, 0, mWidth, mImages.height());
-	bitBlt(p->device(), rect().topLeft(), &mImages, from, Qt::CopyROP);
+	bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP);
 	if (mText)
-		mText->repaint();
+		mText->tqrepaint();
 }
 
 bool KJVolumeBMP::mousePress(const TQPoint &pos)
 {
-	QRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() );
+	TQRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() );
 
 	if (!isGray(color))
 		return false;
@@ -162,7 +162,7 @@ bool KJVolumeBMP::mousePress(const TQPoint &pos)
 //	kdDebug(66666) << "gray  : " << grayRgb(color) << endl;
 //	kdDebug(66666) << "volume: " << mVolume << endl;
 
-	repaint();
+	tqrepaint();
 
 	napp->player()->setVolume(mVolume);
 
@@ -187,7 +187,7 @@ void KJVolumeBMP::timeUpdate(int)
 
 	mOldVolume = mVolume;
 
-	repaint();
+	tqrepaint();
 }
 
 
@@ -208,12 +208,12 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p)
 	mWidth = parser()["pitchcontrolimagexsize"][1].toInt();
 	mCount = parser()["pitchcontrolimagenb"][1].toInt()-1;
 
-	mImages = parent()->pixmap(parser()["pitchcontrolimage"][1]);
-	mPos = parent()->image(parser()["pitchcontrolimageposition"][1]);
+	mImages = tqparent()->pixmap(parser()["pitchcontrolimage"][1]);
+	mPos = tqparent()->image(parser()["pitchcontrolimageposition"][1]);
 
 	// makes all pixels with rgb(255,0,255) transparent
 	TQImage ibackground;
-	ibackground = parent()->image(parser()["pitchcontrolimage"][1]);
+	ibackground = tqparent()->image(parser()["pitchcontrolimage"][1]);
 	mImages.setMask( getMask(ibackground) );
 
 	Arts::PlayObject playobject = napp->player()->engine()->playObject();
@@ -236,7 +236,7 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p)
 	readConfig();
 
 	if (mText)
-		mText->repaint();
+		mText->tqrepaint();
 }
 
 TQString KJPitchBMP::tip()
@@ -250,15 +250,15 @@ void KJPitchBMP::paint(TQPainter *p, const TQRect &)
 
 	TQRect from( (int)xPos, 0, mWidth, mImages.height());
 
-	bitBlt(p->device(), rect().topLeft(), &mImages, from, Qt::CopyROP);
+	bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP);
 
 	if (mText)
-		mText->repaint();
+		mText->tqrepaint();
 }
 
 bool KJPitchBMP::mousePress(const TQPoint &pos)
 {
-	QRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() );
+	TQRgb color = mPos.pixel ( rect().topLeft().x()+pos.x(), rect().topLeft().y()+pos.y() );
 
 	if (!isGray(color))
 		return false;
@@ -266,7 +266,7 @@ bool KJPitchBMP::mousePress(const TQPoint &pos)
 	mCurrentPitch = mMinPitch + ( (grayRgb(color)*(mMaxPitch-mMinPitch)) / 255 );
 //	kdDebug(66666) << "[KJPitchBMP] mousePress()  mCurrentPitch: " << mCurrentPitch << endl;
 
-	repaint();
+	tqrepaint();
 
 	newFile(); // wrong naming, in fact it just sets pitch
 
@@ -300,7 +300,7 @@ void KJPitchBMP::timeUpdate(int)
 
 	mOldPitch = mCurrentPitch;
 
-	repaint();
+	tqrepaint();
 }
 
 void KJPitchBMP::newFile()