TQt4 port Katapult

This enables compilation under both Qt3 and Qt4


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

1 files changed, 17 insertions, 17 deletions

diff --git a/katapult/plugins/catalogs/amarokcatalog/song.cpp b/katapult/plugins/catalogs/amarokcatalog/song.cpp
index 78b69fb..ebad14a 100644
--- a/katapult/plugins/catalogs/amarokcatalog/song.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/song.cpp
@@ -21,35 +21,35 @@
 #include <kglobal.h>
 #include <kiconloader.h> 
 #include <kurl.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qstring.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqstring.h>
 #include <amarokcatalog.h>
 
 #include "song.h"
 
-Song::Song(const QString&)
+Song::Song(const TQString&)
 	: KatapultItem()
 {
-	setName(QString());
-	setArtist(QString());
+	setName(TQString());
+	setArtist(TQString());
 	setURL(KURL());
-	setIcon(QString());
-	setAlbum(QString::null);
+	setIcon(TQString());
+	setAlbum(TQString());
 }
 
-void Song::setArtist(const QString& artist)
+void Song::setArtist(const TQString& artist)
 {
 	_artist = artist;
 	cover.setArtist(artist);
 }
 
-void Song::setName(const QString& name)
+void Song::setName(const TQString& name)
 {
 	_name = name;
 }
 
-void Song::setAlbum(const QString& album)
+void Song::setAlbum(const TQString& album)
 {
 	cover.setAlbum(album);
 }
@@ -59,22 +59,22 @@ void Song::setURL(const KURL url)
 	_url = url;
 }
 
-void Song::setIcon(const QString icon)
+void Song::setIcon(const TQString icon)
 {
 	cover.setURL(icon);
 }
 
-QPixmap Song::icon(int size) const
+TQPixmap Song::icon(int size) const
 {
-	QImage image = cover.load(size);
+	TQImage image = cover.load(size);
 	if ( image.isNull() )
 		return KGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, size);
-	return QPixmap(image);
+	return TQPixmap(image);
 }
 
-QString Song::text() const
+TQString Song::text() const
 {
-	QString text;
+	TQString text;
 	if( !_artist.isEmpty() ) {
 		text.append(_artist);
 		text.append(": ");