TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

1 files changed, 10 insertions, 10 deletions

diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index f329c4f..cc53b06 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -118,7 +118,7 @@ AlsaPlayer::AlsaPlayer()
 
 	connect
 		(
-		 new AlsaPlayerConfigModule(this),
+		 new AlsaPlayerConfigModule(TQT_TQOBJECT(this)),
 		 TQT_SIGNAL(saved()),
 		 TQT_SLOT(slotConfigChanged())
 		);
@@ -155,7 +155,7 @@ AlsaPlayer::AlsaPlayer()
 
 	loadConfig();
 
-	resize(sizeHint().width(), minimumSizeHint().height());
+	resize(tqsizeHint().width(), tqminimumSizeHint().height());
 
 	show();
 }
@@ -196,7 +196,7 @@ void AlsaPlayer::setTitleText(const TQString & s)
 
 void AlsaPlayer::slotPlaying()
 {
-	setTitleText(TQString::null);
+	setTitleText(TQString());
 
 	playButton->setOn(true);
 	stopButton->setEnabled(true);
@@ -212,7 +212,7 @@ void AlsaPlayer::slotStopped()
 
 void AlsaPlayer::slotPaused()
 {
-	setTitleText(TQString::null);
+	setTitleText(TQString());
 
 	stopButton->setEnabled(true);
 	playButton->setOn(false);
@@ -223,11 +223,11 @@ bool AlsaPlayer::eventFilter(TQObject *o, TQEvent *e)
 	switch (e->type())
 	{
 		case TQEvent::MouseButtonPress:
-			mousePressEvent(static_cast<TQMouseEvent *>(e));
+			mousePressEvent(TQT_TQMOUSEEVENT(e));
 			break;
 
 		case TQEvent::Wheel:
-			wheelEvent(static_cast<TQWheelEvent*>(e));
+			wheelEvent(TQT_TQWHEELEVENT(e));
 			return true;
 			break;
 
@@ -250,7 +250,7 @@ void AlsaPlayer::slotPlayListHidden()
 
 void AlsaPlayer::mousePressEvent(TQMouseEvent * e)
 {
-	if (e->button() == RightButton)
+	if (e->button() == Qt::RightButton)
 	{
 		NoatunStdAction::ContextMenu::showContextMenu();
 		return;
@@ -273,7 +273,7 @@ void AlsaPlayer::slotConfigChanged()
 void AlsaPlayer::slotVolumeChanged(int i)
 {
 	TQString text("%1%");
-	volumeLabel->setText(text.arg(i));
+	volumeLabel->setText(text.tqarg(i));
 	volumeSlider->setValue(i);
 }
 
@@ -284,7 +284,7 @@ void AlsaPlayer::slotTimeout()
 	if (!napp->player()->current())
 		return;
 
-	setTitleText(TQString::null);
+	setTitleText(TQString());
 
 	TQString lengthText(napp->player()->lengthString());
 
@@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed)
 	speed_ = newSpeed;
 
 	pauseButton->setEnabled(0 != speed_);
-	speedLabel->setText(TQString("%1%").arg(speed_));
+	speedLabel->setText(TQString("%1%").tqarg(speed_));
 
 	Arts::PlayObject playobject(napp->player()->engine()->playObject());
 	Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject);