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

26 files changed, 341 insertions, 346 deletions

diff --git a/noatun/modules/kjofol-skin/ChangeLog b/noatun/modules/kjofol-skin/ChangeLog
index 537de012..b93bb4ee 100644
--- a/noatun/modules/kjofol-skin/ChangeLog
+++ b/noatun/modules/kjofol-skin/ChangeLog
@@ -46,12 +46,12 @@ ChangeLog (only lists MY changes)
 2001-10-04 Stefan Gehn <sgehn@gmx.net>
 * Still fighting with analyzer and osci visualizations,
   now both are buffered and flicker-free
-* fixed stupid bug in isGray(qRgb), now RGB(0,0,0) is treated as gray again :)
+* fixed stupid bug in isGray(tqRgb), now RGB(0,0,0) is treated as gray again :)
 * commented out (hopefully) unneded debug-messages
 * added splash-screen for skins supporting it (only skin I know of: K-Nine)
 
 2001-09-30 Stefan Gehn <sgehn@gmx.net>
-* ignore alpha-channel of loaded files, they break applying masks to QPixmaps,
+* ignore alpha-channel of loaded files, they break applying tqmasks to QPixmaps,
   result of this is text without transparency
   (this happened for two skins: adagio and xbs)
 
@@ -62,7 +62,7 @@ ChangeLog (only lists MY changes)
   most fileformats in a proper way?)
 
 2001-09-22 Stefan Gehn <sgehn@gmx.net>
-* isGray(qRgb) is more tolerant, colors like rgb(162,163,162) are treated as gray too
+* isGray(tqRgb) is more tolerant, colors like rgb(162,163,162) are treated as gray too
   This fixes some volume/pitch-sliders and makes using them a lot easier
 * made titletext move again (works with and without transparent text)
 
@@ -72,7 +72,7 @@ ChangeLog (only lists MY changes)
 2001-09-04 Stefan Gehn <sgehn@gmx.net>
 * added support for transparent fonts (a skin named steelforged still got problems though)
   for the moment this disables moving of titletext,
-  I have to find a new way to move it (bitblt on a masked QPixmap is tricky)
+  I have to find a new way to move it (bitblt on a tqmasked QPixmap is tricky)
 
 2001-09-03 Stefan Gehn <sgehn@gmx.net>
 * added support for pitch-slider and its textlabel
diff --git a/noatun/modules/kjofol-skin/helpers.cpp b/noatun/modules/kjofol-skin/helpers.cpp
index 0a2a9e67..473c0e80 100644
--- a/noatun/modules/kjofol-skin/helpers.cpp
+++ b/noatun/modules/kjofol-skin/helpers.cpp
@@ -9,22 +9,22 @@
 #ifndef KJHELPERS_CPP
 #define KJHELPERS_CPP
 
-static int grayRgb(QRgb r)
+static int grayRgb(TQRgb r)
 {
-	return qGray(qRed(r), qGreen(r), qBlue(r));
+	return tqGray(tqRed(r), tqGreen(r), tqBlue(r));
 }
 
-static int isGray(QRgb r)
+static int isGray(TQRgb r)
 {
 // this is more tolerant than the old version
 // i.e. RGB 162 163 162 is treated as gray too
 // too many broken skins around having such colors
 
-//	cerr << "r("<<qRed(r)<<","<<qGreen(r)<<","<<qBlue(r)<<")"<<endl;
+//	cerr << "r("<<tqRed(r)<<","<<tqGreen(r)<<","<<tqBlue(r)<<")"<<endl;
 
-	if ( (qRed(r)==qGreen(r)) || (qRed(r)+1==qGreen(r)) || (qRed(r)-1==qGreen(r)))
+	if ( (tqRed(r)==tqGreen(r)) || (tqRed(r)+1==tqGreen(r)) || (tqRed(r)-1==tqGreen(r)))
 	{
-		if ( (qRed(r)==qBlue(r)) || (qRed(r)+1==qBlue(r)) || (qRed(r)-1==qBlue(r)))
+		if ( (tqRed(r)==tqBlue(r)) || (tqRed(r)+1==tqBlue(r)) || (tqRed(r)-1==tqBlue(r)))
 		{
 			// looks a bit like gray, so return true
 			return (1);
@@ -35,7 +35,7 @@ static int isGray(QRgb r)
 
 /*
 	// mETz: wrong braces in the code below ??
-	return (qRed(r)==qGreen(r)) && (qRed(r) == qBlue(r));
+	return (tqRed(r)==tqGreen(r)) && (tqRed(r) == tqBlue(r));
 */
 }
 
diff --git a/noatun/modules/kjofol-skin/kjbackground.cpp b/noatun/modules/kjofol-skin/kjbackground.cpp
index 1c99b6ff..543d92cc 100644
--- a/noatun/modules/kjofol-skin/kjbackground.cpp
+++ b/noatun/modules/kjofol-skin/kjbackground.cpp
@@ -9,21 +9,21 @@
 
 #include "kjbackground.h"
 
-KJBackground::KJBackground(KJLoader *parent)
-	: KJWidget(parent)
+KJBackground::KJBackground(KJLoader *tqparent)
+	: KJWidget(tqparent)
 {
 	TQImage ibackground;
 
-	mBackground = parent->pixmap(parser()["backgroundimage"][1]);
-	ibackground = parent->image(parser()["backgroundimage"][1]);
+	mBackground = tqparent->pixmap(parser()["backgroundimage"][1]);
+	ibackground = tqparent->image(parser()["backgroundimage"][1]);
 
-	parent->setMask( getMask(ibackground) );
-	parent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) );
+	tqparent->setMask( getMask(ibackground) );
+	tqparent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) );
 
-	setRect(0,0,parent->width(),parent->height());
+	setRect(0,0,tqparent->width(),tqparent->height());
 }
 
 void KJBackground::paint(TQPainter *painter, const TQRect &rect)
 {
-	bitBlt(painter->device(), rect.topLeft(), &mBackground, rect, Qt::CopyROP);
+	bitBlt(painter->device(), rect.topLeft(), &mBackground, rect, TQt::CopyROP);
 }
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index d051777e..7dbd9d99 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -30,8 +30,8 @@
  * KJButton
  *******************************************/
 
-KJButton::KJButton(const TQStringList &i, KJLoader *parent)
-	: TQObject(0), KJWidget(parent), mTitle(i[0]), mShowPressed(false)
+KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
+	: TQObject(0), KJWidget(tqparent), mTitle(i[0]), mShowPressed(false)
 {
 //	kdDebug(66666) << k_funcinfo << "new button: " << i[0].latin1() << endl;
 	mPushedPixmap = (i.count() >= 7);
@@ -53,12 +53,12 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent)
 	bool gotBack = false; // in case any of these keys is duplicated
 	for(TQStringList::Iterator it = temp.begin(); it != temp.end(); ++it)
 	{
-		if((*it).contains("bmp"))
+		if((*it).tqcontains("bmp"))
 		{
 			TQString pressedTmp = backgroundPressed((*it));
 			if(!pressedTmp.isEmpty())
 			{
-				mPressed = parent->pixmap(pressedTmp);
+				mPressed = tqparent->pixmap(pressedTmp);
 				gotBack = true;
 			}
 		}
@@ -67,7 +67,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent)
 			// take background and darken the buttons rectangle
 			// FIXME: what KPixmapEffect causes the desired effect?
 			//        intensity is the wrong one
-			KPixmap temp = parent->pixmap(parser()["backgroundimage"][1]);
+			KPixmap temp = tqparent->pixmap(parser()["backgroundimage"][1]);
 			mPressed = (TQPixmap)KPixmapEffect::intensity ( temp, 1.2f );
 			gotBack = true;
 		}
@@ -79,7 +79,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent)
 	{
 		kdDebug(66666) << k_funcinfo << "Couldn't find valid background for button '" <<
 			mTitle << "', dafulting to backgroundimage" << endl;
-		mPressed = parent->pixmap(parser()["backgroundimage"][1]);
+		mPressed = tqparent->pixmap(parser()["backgroundimage"][1]);
 	}
 
 	// playlistbutton has to show if playlistwindow is open
@@ -152,12 +152,12 @@ TQString KJButton::tip()
 void KJButton::paint(TQPainter *, const TQRect &)
 {
 	if (mShowPressed)
-		bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), Qt::CopyROP);
+		bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
 }
 
 bool KJButton::mousePress(const TQPoint &)
 {
-	bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), Qt::CopyROP);
+	bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
 	return true;
 }
 
@@ -165,9 +165,9 @@ void KJButton::showPressed(bool b)
 {
 	mShowPressed = b;
 	if ( mShowPressed )
-		repaint(true); // repaint with selected image
+		tqrepaint(true); // tqrepaint with selected image
 	else
-		repaint(false); // repaint with default image (player-background)
+		tqrepaint(false); // tqrepaint with default image (player-background)
 }
 
 void KJButton::slotPlaylistShown(void)
@@ -193,19 +193,19 @@ void KJButton::slotEqEnabled(bool on)
 
 void KJButton::mouseRelease(const TQPoint &, bool in)
 {
-	// repaint with default image (player-background)
-	repaint(false);
+	// tqrepaint with default image (player-background)
+	tqrepaint(false);
 
 	if (!in) // only do something if users is still inside the button
 		return;
 
 	// now, find what widget I am and do the proper action
 	if (mTitle=="closebutton")
-		KJWidget::parent()->close();
+		KJWidget::tqparent()->close();
 	else if (mTitle=="minimizebutton")
-		KJWidget::parent()->minimize();
+		KJWidget::tqparent()->minimize();
 	else if (mTitle=="aboutbutton")
-		KJWidget::parent()->helpMenu()->aboutApplication();
+		KJWidget::tqparent()->helpMenu()->aboutApplication();
 	else if (mTitle=="stopbutton")
 		napp->player()->stop();
 	else if (mTitle=="playbutton")
@@ -214,7 +214,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
 		napp->player()->playpause();
 	else if (mTitle=="openfilebutton")
 	{
-		KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::parent(), i18n("Select File to Play")));
+		KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::tqparent(), i18n("Select File to Play")));
 		if (file.isValid())
 			napp->player()->openFile(file);
 	}
@@ -222,7 +222,7 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
 		napp->player()->toggleListView();
 	else if (mTitle=="repeatbutton")
 	{
-		KPopupMenu *loopMenu = new KPopupMenu(KJWidget::parent(),"loopMenu");
+		KPopupMenu *loopMenu = new KPopupMenu(KJWidget::tqparent(),"loopMenu");
 		int selectedItem = 0;
 
 		loopMenu->setCheckable(true);
@@ -291,11 +291,11 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
 	else if (mTitle=="rewindbutton")
 		napp->player()->skipTo(napp->player()->getTime()-10000);
 	else if (mTitle=="preferencesbutton")
-		napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::parent()->prefs()));
+		napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::tqparent()->prefs()));
 	else if (mTitle=="dockmodebutton")
-		KJWidget::parent()->switchToDockmode();
+		KJWidget::tqparent()->switchToDockmode();
 	else if (mTitle=="undockmodebutton")
-		KJWidget::parent()->returnFromDockmode();
+		KJWidget::tqparent()->returnFromDockmode();
 	else
 		kdDebug(66666) << "unknown buttontype: " << mTitle.latin1() << endl;
 }
diff --git a/noatun/modules/kjofol-skin/kjbutton.h b/noatun/modules/kjofol-skin/kjbutton.h
index e995c533..c0eba625 100644
--- a/noatun/modules/kjofol-skin/kjbutton.h
+++ b/noatun/modules/kjofol-skin/kjbutton.h
@@ -8,6 +8,7 @@ class KJLoader;
 class KJButton : public TQObject, public KJWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	KJButton(const TQStringList&, KJLoader *);
 
diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp
index 51d50e97..4b260f6f 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.cpp
+++ b/noatun/modules/kjofol-skin/kjequalizer.cpp
@@ -34,7 +34,7 @@ KJEqualizer::KJEqualizer(const TQStringList &l, KJLoader *p)
 	// needed to only blit onto screen ONCE and not for every band
 	TQPixmap tmp = p->pixmap(p->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	// buffer for view
 	mView = new TQPixmap ( xs, ys );
@@ -76,19 +76,19 @@ void KJEqualizer::paint(TQPainter *p, const TQRect &)
 {
 	TQPixmap temp(rect().width(), rect().height());
 	// draw background into buffer
-	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP );
+	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
 	// draw band sliders into buffer
-	bitBlt( &temp, 0, 0, mView, 0, 0, rect().width(), rect().height(), Qt::CopyROP);
+	bitBlt( &temp, 0, 0, mView, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 	// and draw it on screen
-	bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), Qt::CopyROP);
+	bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), TQt::CopyROP);
 }
 
 void KJEqualizer::slotUpdateBuffer()
 {
 //	kdDebug(66666) << "[KJEqualizer] slotUpdateBuffer() called." << endl;
 
-	TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent mask
-	TQPainter mask( &regionMask );
+	TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent tqmask
+	TQPainter tqmask( &regionMask );
 
 	TQPoint destX = TQPoint(0, 0);
 
@@ -102,15 +102,15 @@ void KJEqualizer::slotUpdateBuffer()
 
 //		kdDebug(66666) << "[KJEqualizer] band=" << band << ", level=" << level << ", picNum=" << picNum << " @ xpos=" << xPos << "." << endl;
 
-		bitBlt(mView, destX, &mBars, TQRect(xPos,0,mBandWidth,rect().height()), Qt::CopyROP);
-		// make slider opaque in mask so you see something on screen
-		mask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), Qt::color1 );
+		bitBlt(mView, destX, &mBars, TQRect(xPos,0,mBandWidth,rect().height()), TQt::CopyROP);
+		// make slider opaque in tqmask so you see something on screen
+		tqmask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 );
 		destX += TQPoint(mXSpace,0);
 
 	} // for()
-	// whole thingy has been drawn, now set the mask
+	// whole thingy has been drawn, now set the tqmask
 	mView->setMask( regionMask );
-	repaint();
+	tqrepaint();
 }
 
 void KJEqualizer::mouseMove(const TQPoint &p, bool in)
diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h
index be5535eb..f2e85678 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.h
+++ b/noatun/modules/kjofol-skin/kjequalizer.h
@@ -1,5 +1,5 @@
-#ifndef KJEQUALIZER_H
-#define KJEQUALIZER_H
+#ifndef KJETQUALIZER_H
+#define KJETQUALIZER_H
 
 #include "kjwidget.h"
 //#include "kjloader.h"
@@ -11,8 +11,9 @@ class VInterpolation;
 class KJEqualizer : public TQObject, public KJWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	KJEqualizer(const TQStringList &, KJLoader *parent);
+	KJEqualizer(const TQStringList &, KJLoader *tqparent);
 	~KJEqualizer(void);
 
 	virtual void mouseMove(const TQPoint &pos, bool);
@@ -31,7 +32,7 @@ private:
 	int mBandWidth;
 	int mBandHalfHeight;
 	TQPixmap mBars; // holds all slider images
-	TQPixmap *mBack; // holds background of EQ for easy repaint
+	TQPixmap *mBack; // holds background of EQ for easy tqrepaint
 	TQPixmap *mView; // holds prepared img of all sliders
 	VInterpolation *mInterpEq;
 };
diff --git a/noatun/modules/kjofol-skin/kjfont.cpp b/noatun/modules/kjofol-skin/kjfont.cpp
index c6b16b77..cf82fa43 100644
--- a/noatun/modules/kjofol-skin/kjfont.cpp
+++ b/noatun/modules/kjofol-skin/kjfont.cpp
@@ -23,9 +23,9 @@
  * KJFont
  *******************************************/
 
-KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransparentRGB(0)
+KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTransparentRGB(0)
 {
-//	kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *parent)" << prefix.latin1() << endl;
+//	kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *tqparent)" << prefix.latin1() << endl;
 
 	if (prefix=="timefont")
 	{
@@ -47,12 +47,12 @@ KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransp
 		mNullChar=' ';
 	}
 
-	mText = parent->pixmap(parent->item(prefix+"image")[1]);
+	mText = tqparent->pixmap(tqparent->item(prefix+"image")[1]);
 
-	if ( parent->exist(prefix+"size") )
+	if ( tqparent->exist(prefix+"size") )
 	{
-		mWidth = parent->item(prefix+"size")[1].toInt();
-		mHeight = parent->item(prefix+"size")[2].toInt();
+		mWidth = tqparent->item(prefix+"size")[1].toInt();
+		mHeight = tqparent->item(prefix+"size")[2].toInt();
 	}
 	else // try to load the font even we are missing important settings
 	{	// this still can cause crashes!
@@ -73,13 +73,13 @@ KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransp
 		mHeight = mText.height();
 
 	// Stupid Skin authors tend to forget keys :/
-	if ( parent->exist(prefix+"spacing") )
-		mSpacing = parent->item(prefix+"spacing")[1].toInt();
+	if ( tqparent->exist(prefix+"spacing") )
+		mSpacing = tqparent->item(prefix+"spacing")[1].toInt();
 	else
 		mSpacing = 0; // FIXME: What's default for this in kjöfol???
 
-	if ( parent->exist(prefix+"transparent") )
-		mTransparent = (bool)parent->item(prefix+"transparent")[1].toInt();
+	if ( tqparent->exist(prefix+"transparent") )
+		mTransparent = (bool)tqparent->item(prefix+"transparent")[1].toInt();
 	else
 		mTransparent = true; // transparency seems to be default in kjöfol
 
@@ -88,7 +88,7 @@ KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransp
 	{
 		TQImage ibackground = mText.convertToImage();
 		mTransparentRGB = ibackground.pixel( ibackground.width()-1, ibackground.height()-1 );
-//		kdDebug(66666) << "color (" << qRed(mTransparentRGB) << "," << qGreen(mTransparentRGB) << "," << qBlue(mTransparentRGB) << ") will be transparent for " << prefix.latin1() << endl;
+//		kdDebug(66666) << "color (" << tqRed(mTransparentRGB) << "," << tqGreen(mTransparentRGB) << "," << tqBlue(mTransparentRGB) << ") will be transparent for " << prefix.latin1() << endl;
 		mTextMask = KJWidget::getMask(ibackground,mTransparentRGB);
 	}
 
@@ -153,8 +153,8 @@ TQPixmap KJFont::drawSysFont(const TQCString &s, int wide, const TQPoint &pos) c
 
 	TQBitmap regionMask(
 		(stringWidth > wide ? stringWidth : wide),
-		mHeight, true); // fully transparent mask
-	TQPainter mp(&regionMask); // mask painter
+		mHeight, true); // fully transparent tqmask
+	TQPainter mp(&regionMask); // tqmask painter
 
 //	kdDebug(66666) << "region; w=" << region.width() << ", h=" << region.height() << endl;
 
@@ -163,25 +163,25 @@ TQPixmap KJFont::drawSysFont(const TQCString &s, int wide, const TQPoint &pos) c
 	if ( stringWidth < wide )
 	{
 		freeSpace = wide - stringWidth;
-		mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 );
+		mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
 		to += TQPoint ( (freeSpace/2), 0 );
 //		kdDebug(66666) << "centering text, freeSpace=" << freeSpace << endl;
 	}
 
 	rp.setFont(sysFont);
 	rp.setPen(sysFontColor);
-	rp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, Qt::AlignLeft|Qt::AlignTop, string);
+	rp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, TQt::AlignLeft|TQt::AlignTop, string);
 
 	mp.setFont(sysFont);
-	mp.setPen(Qt::color1);
-	mp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, Qt::AlignLeft|Qt::AlignTop, string);
+	mp.setPen(TQt::color1);
+	mp.drawText(to.x(), to.y(), region.width()-freeSpace, mHeight, TQt::AlignLeft|TQt::AlignTop, string);
 
 	to += TQPoint(region.width()-freeSpace,0);
 //	kdDebug(66666) << "text width=" << region.width()-freeSpace << endl;
 
 	if (freeSpace > 0)
 	{
-		mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 );
+		mp.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
 		to += TQPoint ( (freeSpace/2), 0 );
 //		kdDebug(66666) << "centering text, freeSpace=" << freeSpace << endl;
 	}
@@ -206,8 +206,8 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p
 	TQBitmap regionMask(
 			 (string.length()*mWidth+string.length()*mSpacing > (unsigned int)wide
 			? string.length()*mWidth+string.length()*mSpacing : wide),
-			 mHeight, true); // fully transparent mask
-	TQPainter mask( &regionMask );
+			 mHeight, true); // fully transparent tqmask
+	TQPainter tqmask( &regionMask );
 
 //	kdDebug(66666) << "draw: {" << str << "}" << endl;
 
@@ -216,7 +216,7 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p
 	if ( string.length()*mWidth+string.length()*mSpacing < (unsigned int)wide )
 	{
 		freeSpace = wide - string.length()*mWidth+string.length()*mSpacing;
-		mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 );
+		tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
 		to += TQPoint ( (freeSpace/2), 0 );
 	}
 
@@ -234,14 +234,14 @@ TQPixmap KJFont::drawPixmapFont(const TQCString &str, int wide, const TQPoint &p
 		// draw according to "spacing"
 		if ( (charPos < string.length()-1) && mSpacing > 0 )
 		{	// make the spacing-area transparent
-			mask.fillRect ( to.x(), 0, mSpacing, mHeight, Qt::color0 );
+			tqmask.fillRect ( to.x(), 0, mSpacing, mHeight, TQt::color0 );
 			to += TQPoint ( mSpacing, 0 );
 		}
 	}
 
 	if (freeSpace > 0)
 	{
-		mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, Qt::color0 );
+		tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
 		to += TQPoint ( (freeSpace/2), 0 );
 	}
 
@@ -258,17 +258,17 @@ void KJFont::drawCharacter(TQPixmap *dev, TQBitmap *devMask, const TQPoint &to,
 	int xs=mWidth;
 	int ys=mHeight;
 
-	bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), Qt::CopyROP);
+	bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), TQt::CopyROP);
 
-	// bitBlt mask for transparency
+	// bitBlt tqmask for transparency
 	if ( mTransparent )
 	{
-		bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), Qt::OrROP);
+		bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), TQt::OrROP);
 	}
-	else // fill mask
+	else // fill tqmask
 	{
 		TQPainter tempPainter (devMask);
-		tempPainter.fillRect ( to.x(), 0, xs,ys, Qt::color1 );
+		tempPainter.fillRect ( to.x(), 0, xs,ys, TQt::color1 );
 	}
 }
 
diff --git a/noatun/modules/kjofol-skin/kjfont.h b/noatun/modules/kjofol-skin/kjfont.h
index a40e7854..626ed027 100644
--- a/noatun/modules/kjofol-skin/kjfont.h
+++ b/noatun/modules/kjofol-skin/kjfont.h
@@ -11,7 +11,7 @@ class KJLoader;
 class KJFont
 {
 public:
-	KJFont(const TQString &prefix, KJLoader *parent);
+	KJFont(const TQString &prefix, KJLoader *tqparent);
 	// draw the string str to dev at position pos, within rectangle limit in relation to pos
 	TQPixmap draw(const TQCString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const;
 	TQPixmap draw(const TQString &str, int wide, const TQPoint &pt=TQPoint(0,0)) const
@@ -35,7 +35,7 @@ protected:
 private:
 	TQPixmap mText;
 	TQBitmap mTextMask;
-	QRgb mTransparentRGB; // this color will be transparent
+	TQRgb mTransparentRGB; // this color will be transparent
 	int mSpacing;
 	int mWidth, mHeight;
 	bool mTransparent; // indicates wether there's transparency
diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
index e2b4f784..ab787975 100644
--- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui
+++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>KJGuiSettings</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KJGuiSettings</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout7</cstring>
             </property>
@@ -30,7 +30,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>ButtonGroup1</cstring>
                     </property>
@@ -47,7 +47,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>visScope</cstring>
                             </property>
@@ -55,7 +55,7 @@
                                 <string>Oscillo&amp;scope</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>visAnalyzer</cstring>
                             </property>
@@ -63,7 +63,7 @@
                                 <string>&amp;Analyzer</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>visNone</cstring>
                             </property>
@@ -71,7 +71,7 @@
                                 <string>&amp;None</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout5</cstring>
                             </property>
@@ -85,7 +85,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabel1_3</cstring>
                                     </property>
@@ -125,7 +125,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>GroupBox1</cstring>
                     </property>
@@ -142,7 +142,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout4</cstring>
                             </property>
@@ -156,7 +156,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabel1_2</cstring>
                                     </property>
@@ -194,7 +194,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout3</cstring>
                             </property>
@@ -208,7 +208,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabel1_2_2</cstring>
                                     </property>
@@ -250,7 +250,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>displayTooltips</cstring>
             </property>
@@ -258,7 +258,7 @@
                 <string>Display &amp;tooltips</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>displaySplash</cstring>
             </property>
@@ -276,14 +276,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -297,7 +297,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -308,7 +308,7 @@
                         <cstring>titleScrollSpeed</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -316,11 +316,11 @@
                         <string>Slow</string>
                     </property>
                 </widget>
-                <widget class="QSlider">
+                <widget class="TQSlider">
                     <property name="name">
                         <cstring>titleScrollSpeed</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>80</width>
                             <height>0</height>
@@ -348,7 +348,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
@@ -358,7 +358,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="3" column="0">
+        <widget class="TQGroupBox" row="3" column="0">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -381,7 +381,7 @@
                         </color>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>txtFontColor</cstring>
                     </property>
@@ -389,7 +389,7 @@
                         <string>Color:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>txtFont</cstring>
                     </property>
@@ -408,7 +408,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>useSysFont</cstring>
                     </property>
@@ -428,7 +428,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>140</width>
                     <height>21</height>
@@ -453,7 +453,7 @@
     <tabstop>cmbSysFontColor</tabstop>
     <tabstop>titleScrollSpeed</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
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,
diff --git a/noatun/modules/kjofol-skin/kjloader.h b/noatun/modules/kjofol-skin/kjloader.h
index 6fec9f05..94ab729a 100644
--- a/noatun/modules/kjofol-skin/kjloader.h
+++ b/noatun/modules/kjofol-skin/kjloader.h
@@ -33,6 +33,7 @@ class KJPrefs;
 class KJLoader :  public TQWidget, public UserInterface, public Parser
 {
 Q_OBJECT
+  TQ_OBJECT
 NOATUNPLUGIND
 
 	friend class KJWidget;
@@ -43,7 +44,7 @@ public:
 public:
 	void minimize();
 	KHelpMenu *helpMenu() const { return mHelpMenu; }
-	TQStringList &item(const TQString &key) { return *Parser::find(key); }
+	TQStringList &item(const TQString &key) { return *Parser::tqfind(key); }
 
 	// returns path to currently loaded configfile
 	// can be either a newly loaded one or one of the three below
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index 4231d0ff..b8e6e4bf 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -45,8 +45,8 @@
 
 static TQString expand(TQString s);
 
-KJPrefs::KJPrefs(TQObject* parent)
-	: CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", parent)
+KJPrefs::KJPrefs(TQObject* tqparent)
+	: CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", tqparent)
 {
 	cfg = KGlobal::config();
 
@@ -151,7 +151,7 @@ void KJPrefs::reopen() // reload config and set stuff in dialog
 	skins.sort();
 
 	TQString loaded = cfg->readEntry("SkinResource", locate("data", "noatun/skins/kjofol/kjofol/kjofol.rc") );
-	loaded = loaded.mid(loaded.findRev("/")+1);  // remove path
+	loaded = loaded.mid(loaded.tqfindRev("/")+1);  // remove path
 	loaded = loaded.left( loaded.length() - 3 ); // remove ".rc"
 
 	mSkinselectorWidget->mSkins->clear();
@@ -454,7 +454,7 @@ void KJPrefs::installNewSkin( void )
 		{
 			// skindir is named like the archive without extension (FIXME: extension is not stripped from name)
 
-			int dotPos = srcFile.fileName().findRev('.');
+			int dotPos = srcFile.fileName().tqfindRev('.');
 			if ( dotPos > 0 ) // found a dot -> (hopefully) strip the extension
 			{
 				dst.addPath( srcFile.fileName().left(dotPos) );
diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h
index a8f52e29..a0849d17 100644
--- a/noatun/modules/kjofol-skin/kjprefs.h
+++ b/noatun/modules/kjofol-skin/kjprefs.h
@@ -25,8 +25,9 @@ class KJLoader;
 class KJPrefs : public CModule
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	KJPrefs(TQObject* parent);
+	KJPrefs(TQObject* tqparent);
 
 	// Save which Skin is currently selected
 	virtual void save();
diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp
index b9b441b1..0d30e506 100644
--- a/noatun/modules/kjofol-skin/kjseeker.cpp
+++ b/noatun/modules/kjofol-skin/kjseeker.cpp
@@ -22,62 +22,57 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
 	{
 		kdDebug(66666) << k_funcinfo << "No pressed background found for seeker," <<
 			" using default background!" << endl;
-		parent()->image(parser()["backgroundimage"][1]);
+		tqparent()->image(parser()["backgroundimage"][1]);
 	}
 	else
-		mActive = parent()->image(activeBg);
+		mActive = tqparent()->image(activeBg);
 
-	mScale = parent()->image(parser()["seekimage"][1]);
-	TQImage pixmapNoPress = parent()->image(parser()["backgroundimage"][1]);
+	mScale = tqparent()->image(parser()["seekimage"][1]);
+	TQImage pixmapNoPress = tqparent()->image(parser()["backgroundimage"][1]);
 
-	// generate transparent mask
+	// generate transparent tqmask
 	int x, y, xs, ys;
 	x=i[1].toInt();
 	y=i[2].toInt();
 	xs=i[3].toInt()-x;
 	ys=i[4].toInt()-y;
 	setRect(x,y,xs,ys);
-	TQImage transmask(xs, ys, 1, 2, TQImage::LittleEndian);
-#if QT_VERSION < 0x030300
-	transmask.setColor(0, qRgb(0,0,0));
-	transmask.setColor(1, qRgb(255,255,255));
-#else
-	transmask.setColor(1, qRgb(0,0,0));
-	transmask.setColor(0, qRgb(255,255,255));
-#endif
+	TQImage transtqmask(xs, ys, 1, 2, TQImage::LittleEndian);
+	transtqmask.setColor(1, tqRgb(0,0,0));
+	transtqmask.setColor(0, tqRgb(255,255,255));
 
 	// clear the pointers
 	memset(barmodeImages, 0, 256*sizeof(TQImage*));
 	memset(barmode, 0, 256*sizeof(TQPixmap*));
 
-	// Now do the pixel føking
+	// Now do the pixel f�king
 //	kdDebug(66666) << "creating Pixmaps for Seeker" << endl;
 	for (int iy=y;iy<y+ys; iy++)
 	{
 		for (int ix=x;ix<x+xs; ix++)
 		{
-			QRgb checkmScale = mScale.pixel(ix, iy);
+			TQRgb checkmScale = mScale.pixel(ix, iy);
 			// am I transparent?
 			if (!isGray(checkmScale))
 			{
-				setPixel1BPP(transmask, ix-x, iy-y, 0);
+				setPixel1BPP(transtqmask, ix-x, iy-y, 0);
 				continue;
 			}
-			setPixel1BPP(transmask, ix-x, iy-y, 1);
+			setPixel1BPP(transtqmask, ix-x, iy-y, 1);
 
 			// what is the level
 			int level=grayRgb(checkmScale)+1;
 			if (level>255) level=255;
 			// allocate the pixmap of the level proper
 			// copy the color to the surface proper
-			QRgb activeColor=mActive.pixel(ix,iy);
-			QRgb inactiveColor=pixmapNoPress.pixel(ix,iy);
+			TQRgb activeColor=mActive.pixel(ix,iy);
+			TQRgb inactiveColor=pixmapNoPress.pixel(ix,iy);
 			// set this pixel and everything before it
 			for(int i=0; i<level; i++)
 			{
 				if (!barmodeImages[i])
 					barmodeImages[i]=new TQImage(xs,ys, 32);
-				QRgb *l=(QRgb*)barmodeImages[i]->scanLine(iy-y);
+				TQRgb *l=(TQRgb*)barmodeImages[i]->scanLine(iy-y);
 				l[ix-x]=inactiveColor;
 			}
 
@@ -85,7 +80,7 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
 			{
 				if (!barmodeImages[level])
 					barmodeImages[level]=new TQImage(xs,ys, 32);
-				QRgb *l=(QRgb*)barmodeImages[level]->scanLine(iy-y);
+				TQRgb *l=(TQRgb*)barmodeImages[level]->scanLine(iy-y);
 				l[ix-x]=activeColor;
 			} while (level++<255);
 		}
@@ -94,10 +89,10 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
 
 	// create the blank one
 	barmode[0]=new TQPixmap(xs, ys);
-	TQPixmap px=parent()->pixmap(parser()["backgroundimage"][1]);
-	bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, Qt::CopyROP);
-	px.convertFromImage(transmask);
-	barModeMask=px;
+	TQPixmap px=tqparent()->pixmap(parser()["backgroundimage"][1]);
+	bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, TQt::CopyROP);
+	px.convertFromImage(transtqmask);
+	barModeMask=TQBitmap(px);
 
 //	kdDebug(66666) << "END KJSeeker constructor" << endl;
 }
@@ -135,7 +130,7 @@ void KJSeeker::paint(TQPainter *p, const TQRect &)
 	TQPixmap *pixmap = toPixmap(g);
 	pixmap->setMask(barModeMask);
 	bitBlt(p->device(), rect().topLeft().x(), rect().topLeft().y(),
-		pixmap, 0, 0, rect().width(), rect().height(), Qt::CopyROP);
+		pixmap, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 }
 
 bool KJSeeker::mousePress(const TQPoint &pos)
@@ -154,14 +149,14 @@ void KJSeeker::mouseRelease(const TQPoint &pos, bool in)
 	if(!mScale.valid(x, y))
 	   return;
 
-	QRgb color=mScale.pixel(x, y);
+	TQRgb color=mScale.pixel(x, y);
 
 	// user released mousebutton outside of the seeker-area (which is gray)
 	if ( (!isGray(color)) || (!in) )
 		return;
 
 	g = grayRgb(color);
-	repaint();
+	tqrepaint();
 
 //	kdDebug(66666) << "length : " << napp->player()->getLength() << endl;
 //	kdDebug(66666) << "skip to: " << ((long long)g*(long long)napp->player()->getLength())/255 << endl;
@@ -185,7 +180,7 @@ void KJSeeker::timeUpdate(int sec)
 
 	g = sec * 255 / length;
 	//kdDebug(66666) << "sec: " << sec << " len: " << length << " g: " << g << endl;
-	TQPainter p(parent());
+	TQPainter p(tqparent());
 	paint(&p, rect());
 }
 
diff --git a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
index 1540ad5e..66f3462a 100644
--- a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
+++ b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>KJSkinselector</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KJSkinselector</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QComboBox">
+        <widget class="TQComboBox">
             <property name="name">
                 <cstring>mSkins</cstring>
             </property>
@@ -35,7 +35,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>previewGroup</cstring>
             </property>
@@ -70,7 +70,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>31</height>
@@ -87,7 +87,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>51</width>
                             <height>21</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>41</height>
@@ -121,21 +121,21 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>31</width>
                             <height>21</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="1" column="1" rowspan="2" colspan="1">
+                <widget class="TQLabel" row="1" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>mPreview</cstring>
                     </property>
                     <property name="scaledContents">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -145,7 +145,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -153,7 +153,7 @@
                 <string>About skin:</string>
             </property>
         </widget>
-        <widget class="QTextBrowser">
+        <widget class="TQTextBrowser">
             <property name="name">
                 <cstring>mAboutText</cstring>
             </property>
@@ -170,7 +170,7 @@
 It can be several lines and usually does not contain anything interesting but still this will be shown.</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -197,7 +197,7 @@ It can be several lines and usually does not contain anything interesting but st
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>installButton</cstring>
                     </property>
@@ -205,7 +205,7 @@ It can be several lines and usually does not contain anything interesting but st
                         <string>Install Skin</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>mRemoveButton</cstring>
                     </property>
@@ -219,7 +219,7 @@ It can be several lines and usually does not contain anything interesting but st
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
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()
diff --git a/noatun/modules/kjofol-skin/kjsliders.h b/noatun/modules/kjofol-skin/kjsliders.h
index bd3c3324..131261c7 100644
--- a/noatun/modules/kjofol-skin/kjsliders.h
+++ b/noatun/modules/kjofol-skin/kjsliders.h
@@ -12,7 +12,7 @@ class KJVolumeText;
 class KJVolumeBMP : public KJWidget
 {
 public:
-	KJVolumeBMP(const TQStringList &, KJLoader *parent);
+	KJVolumeBMP(const TQStringList &, KJLoader *tqparent);
 
 	virtual void paint(TQPainter *, const TQRect &rect);
 	virtual bool mousePress(const TQPoint &pos);
@@ -36,7 +36,7 @@ private:
 class KJVolumeBar : public KJWidget
 {
 public:
-	KJVolumeBar(const TQStringList &, KJLoader *parent);
+	KJVolumeBar(const TQStringList &, KJLoader *tqparent);
 
 	virtual void paint(TQPainter *, const TQRect &rect);
 	virtual bool mousePress(const TQPoint &pos);
@@ -59,7 +59,7 @@ private:
 class KJPitchBMP : public KJWidget
 {
 public:
-	KJPitchBMP(const TQStringList &, KJLoader *parent);
+	KJPitchBMP(const TQStringList &, KJLoader *tqparent);
 
 	virtual void paint(TQPainter *, const TQRect &rect);
 	virtual bool mousePress(const TQPoint &pos);
diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
index c1a17139..42d546a0 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
@@ -52,7 +52,7 @@ KJFilename::KJFilename(const TQStringList &l, KJLoader *p)
 	// background under filename-scroller
 	TQPixmap tmp  = p->pixmap(p->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	setRect(x,y,xs,ys);
 
@@ -77,12 +77,12 @@ void KJFilename::paint(TQPainter *p, const TQRect &)
 	TQPixmap temp ( rect().width(), rect().height() );
 
 	// draw background into buffer
-	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP );
+	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
 	// draw font into buffer
-	bitBlt( &temp, 0, 0, &mView, 0, 0, rect().width(), rect().height(), Qt::CopyROP);
+	bitBlt( &temp, 0, 0, &mView, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 	// and draw it on screen
 	bitBlt(p->device(), rect().topLeft(), &temp,
-	       TQRect(0,0,-1,-1), Qt::CopyROP);
+	       TQRect(0,0,-1,-1), TQt::CopyROP);
 }
 
 void KJFilename::timerEvent(TQTimerEvent *)
@@ -90,25 +90,25 @@ void KJFilename::timerEvent(TQTimerEvent *)
 	int height = mView.height();
 	int width = mView.width();
 
-	TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the mask
+	TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the tqmask
 	TQPixmap cycle ( mDistance, height );	// temporary-space for moving parts of the pixmap
-	TQBitmap newMask ( *mView.mask() );		// save old mask
+	TQBitmap newMask ( *mView.tqmask() );		// save old tqmask
 
-	// copy mask like the same way we're doing it with the pixmap
-	// a mask does not get copied on a bitblt automatically, we have to do
+	// copy tqmask like the same way we're doing it with the pixmap
+	// a tqmask does not get copied on a bitblt automatically, we have to do
 	// it "by hand"
-	bitBlt(&cycleMask, 0,0, &newMask, 0,0, mDistance, height, Qt::CopyROP);
-	bitBlt(&newMask, 0,0, &newMask, mDistance, 0, width-mDistance, height, Qt::CopyROP);
-	bitBlt(&newMask, width-mDistance, 0, &cycleMask, 0,0, mDistance, height, Qt::CopyROP);
+	bitBlt(&cycleMask, 0,0, &newMask, 0,0, mDistance, height, TQt::CopyROP);
+	bitBlt(&newMask, 0,0, &newMask, mDistance, 0, width-mDistance, height, TQt::CopyROP);
+	bitBlt(&newMask, width-mDistance, 0, &cycleMask, 0,0, mDistance, height, TQt::CopyROP);
 
-	bitBlt(&cycle, 0,0, &mView, 0,0, mDistance, height, Qt::CopyROP);
-	bitBlt(&mView, 0,0, &mView, mDistance, 0, width-mDistance, height, Qt::CopyROP);
-	bitBlt(&mView, width-mDistance, 0, &cycle, 0,0, mDistance, height, Qt::CopyROP);
+	bitBlt(&cycle, 0,0, &mView, 0,0, mDistance, height, TQt::CopyROP);
+	bitBlt(&mView, 0,0, &mView, mDistance, 0, width-mDistance, height, TQt::CopyROP);
+	bitBlt(&mView, width-mDistance, 0, &cycle, 0,0, mDistance, height, TQt::CopyROP);
 
-	// apply the newly created mask
+	// apply the newly created tqmask
 	mView.setMask(newMask);
 
-	repaint();
+	tqrepaint();
 }
 
 bool KJFilename::mousePress(const TQPoint &)
@@ -142,7 +142,7 @@ void KJFilename::readConfig()
 		mDistance = 1;
 	mTimerUpdates = KJLoader::kjofol->prefs()->titleMovingUpdates();
 	textFont().recalcSysFont();
-	mLastTitle=""; // invalidate title so it gets repainted on next timeUpdate()
+	mLastTitle=""; // tqinvalidate title so it gets tqrepainted on next timeUpdate()
 }
 
 void KJFilename::prepareString(const TQCString &str)
@@ -167,7 +167,7 @@ void KJFilename::timeUpdate(int)
 	mLastTitle = title;
 
 	TQCString timestring = napp->player()->lengthString().local8Bit();
-	timestring = timestring.mid(timestring.find('/')+1);
+	timestring = timestring.mid(timestring.tqfind('/')+1);
 	prepareString ( title + " (" + timestring + ")   ");
 }
 
@@ -206,7 +206,7 @@ KJTime::KJTime(const TQStringList &l, KJLoader *p)
 	// background under time-display
 	TQPixmap tmp  = p->pixmap(p->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	setRect(x,y,xs,ys);
 
@@ -226,13 +226,13 @@ void KJTime::paint(TQPainter *p, const TQRect &)
 	TQPixmap temp ( rect().width(), rect().height() );
 
 	// draw background into buffer
-	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP );
-	// draw time-display into buffer (that's a pixmap with a mask applied)
-	bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), Qt::CopyROP);
+	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
+	// draw time-display into buffer (that's a pixmap with a tqmask applied)
+	bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 
 	// and draw it on screen
 	bitBlt(p->device(), rect().topLeft(), &temp,
-	       TQRect(0,0, rect().width(), rect().height()), Qt::CopyROP);
+	       TQRect(0,0, rect().width(), rect().height()), TQt::CopyROP);
 }
 
 bool KJTime::mousePress(const TQPoint &)
@@ -255,7 +255,7 @@ void KJTime::readConfig()
 //	kdDebug(66666) << "KJTime::readConfig()" << endl;
 	countDown = napp->displayRemaining();
 	timeFont().recalcSysFont();
-	mLastTime=""; // invalidate time so it gets repainted on next timeUpdate()
+	mLastTime=""; // tqinvalidate time so it gets tqrepainted on next timeUpdate()
 }
 
 TQString KJTime::lengthString ( void )
@@ -325,7 +325,7 @@ void KJTime::prepareString(const TQCString &str)
 	mLastTime = str;
 	mTime = timeFont().draw(str, rect().width());
 
-	repaint();
+	tqrepaint();
 //	kdDebug(66666) << "END KJTime::prepareString(const TQCString &str)" << endl;
 }
 
@@ -364,7 +364,7 @@ KJVolumeText::KJVolumeText(const TQStringList &l, KJLoader *p)
 	// background under volumetext-display
 	TQPixmap tmp  = p->pixmap(p->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	setRect(x,y,xs,ys);
 
@@ -381,13 +381,13 @@ void KJVolumeText::paint(TQPainter *p, const TQRect &)
 	TQPixmap temp ( rect().width(), rect().height() );
 
 	// draw background into buffer
-	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP );
+	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
 	// draw time-display into buffer
-	bitBlt( &temp, 0, 0, &mVolume, 0, 0, rect().width(), rect().height(), Qt::CopyROP);
+	bitBlt( &temp, 0, 0, &mVolume, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 
 	// and draw it on screen
 	bitBlt(p->device(), rect().topLeft(), &temp,
-	       TQRect(0,0,-1,-1), Qt::CopyROP);
+	       TQRect(0,0,-1,-1), TQt::CopyROP);
 }
 
 bool KJVolumeText::mousePress(const TQPoint &)
@@ -398,7 +398,7 @@ bool KJVolumeText::mousePress(const TQPoint &)
 void KJVolumeText::readConfig()
 {
 	volumeFont().recalcSysFont();
-	mLastVolume=""; // invalidate value so it gets repainted on next timeUpdate()
+	mLastVolume=""; // tqinvalidate value so it gets tqrepainted on next timeUpdate()
 }
 
 void KJVolumeText::timeUpdate(int)
@@ -421,7 +421,7 @@ void KJVolumeText::prepareString(const TQCString &str)
 	mLastVolume = str;
 	mVolume = volumeFont().draw(str, rect().width());
 
-	repaint();
+	tqrepaint();
 }
 
 TQString KJVolumeText::tip()
@@ -454,7 +454,7 @@ KJPitchText::KJPitchText(const TQStringList &l, KJLoader *p)
 	// background under time-display
 	TQPixmap tmp  = p->pixmap(p->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	setRect(x,y,xs,ys);
 
@@ -472,11 +472,11 @@ void KJPitchText::paint(TQPainter *p, const TQRect &)
 	TQPixmap temp ( rect().width(), rect().height() );
 
 	// draw background into buffer
-	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP );
+	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
 	// draw time-display into buffer
-	bitBlt( &temp, 0, 0, &mSpeed, 0, 0, rect().width(), rect().height(), Qt::CopyROP);
+	bitBlt( &temp, 0, 0, &mSpeed, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 	// and draw it on screen
-	bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), Qt::CopyROP);
+	bitBlt(p->device(), rect().topLeft(), &temp, TQRect(0,0,-1,-1), TQt::CopyROP);
 }
 
 bool KJPitchText::mousePress(const TQPoint &)
@@ -501,7 +501,7 @@ void KJPitchText::mouseRelease(const TQPoint &, bool in)
 void KJPitchText::readConfig()
 {
 	pitchFont().recalcSysFont();
-	mLastPitch=""; // invalidate value so it gets repainted on next timeUpdate()
+	mLastPitch=""; // tqinvalidate value so it gets tqrepainted on next timeUpdate()
 }
 
 void KJPitchText::timeUpdate(int)
@@ -529,7 +529,7 @@ void KJPitchText::prepareString(const TQCString &str)
 	mLastPitch = str;
 	mSpeed = pitchFont().draw(str, rect().width());
 
-	repaint();
+	tqrepaint();
 }
 
 TQString KJPitchText::tip()
@@ -566,7 +566,7 @@ KJFileInfo::KJFileInfo(const TQStringList &l, KJLoader *p)
 	// background under info-display
 	TQPixmap tmp  = p->pixmap(p->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	setRect(x,y,xs,ys);
 
@@ -583,13 +583,13 @@ void KJFileInfo::paint(TQPainter *p, const TQRect &)
 	TQPixmap temp ( rect().width(), rect().height() );
 
 	// draw background into buffer
-	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP );
-	// draw time-display into buffer (that's a pixmap with a mask applied)
-	bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), Qt::CopyROP);
+	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
+	// draw time-display into buffer (that's a pixmap with a tqmask applied)
+	bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 
 	// and draw it on screen
 	bitBlt(p->device(), rect().topLeft(), &temp,
-	       TQRect(0,0, rect().width(), rect().height()), Qt::CopyROP);
+	       TQRect(0,0, rect().width(), rect().height()), TQt::CopyROP);
 }
 
 bool KJFileInfo::mousePress(const TQPoint &)
@@ -600,7 +600,7 @@ bool KJFileInfo::mousePress(const TQPoint &)
 void KJFileInfo::readConfig()
 {
 	textFont().recalcSysFont();
-	mLastTime=""; // invalidate value so it gets repainted on next timeUpdate()
+	mLastTime=""; // tqinvalidate value so it gets tqrepainted on next timeUpdate()
 }
 
 void KJFileInfo::timeUpdate(int)
@@ -634,7 +634,7 @@ void KJFileInfo::prepareString(const TQCString &str)
 		return;
 	mLastTime = str;
 	mTime = textFont().draw(str, rect().width());
-	repaint();
+	tqrepaint();
 }
 
 TQString KJFileInfo::tip()
diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.h b/noatun/modules/kjofol-skin/kjtextdisplay.h
index 893efac0..0a5caa0a 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.h
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.h
@@ -12,8 +12,9 @@ class KPixmap;
 class KJFilename : public TQObject, public KJWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	KJFilename(const TQStringList &, KJLoader *parent);
+	KJFilename(const TQStringList &, KJLoader *tqparent);
 	~KJFilename();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -42,7 +43,7 @@ private:
 class KJTime : public KJWidget
 {
 public:
-	KJTime(const TQStringList &, KJLoader *parent);
+	KJTime(const TQStringList &, KJLoader *tqparent);
 	~KJTime();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -72,7 +73,7 @@ private:
 class KJVolumeText : public KJWidget
 {
 public:
-	KJVolumeText(const TQStringList &, KJLoader *parent);
+	KJVolumeText(const TQStringList &, KJLoader *tqparent);
 	~KJVolumeText();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -94,7 +95,7 @@ private:
 class KJPitchText : public KJWidget
 {
 public:
-	KJPitchText(const TQStringList &, KJLoader *parent);
+	KJPitchText(const TQStringList &, KJLoader *tqparent);
 	~KJPitchText();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -117,7 +118,7 @@ private:
 class KJFileInfo : public KJWidget
 {
 public:
-	KJFileInfo(const TQStringList &, KJLoader *parent);
+	KJFileInfo(const TQStringList &, KJLoader *tqparent);
 	~KJFileInfo();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp
index 3bd40f00..8915e434 100644
--- a/noatun/modules/kjofol-skin/kjvis.cpp
+++ b/noatun/modules/kjofol-skin/kjvis.cpp
@@ -35,8 +35,8 @@
 void KJVisScope::swapScope(Visuals newOne)
 {
 	//kdDebug(66666) << k_funcinfo << endl;
-	TQStringList line = parent()->item("analyzerwindow");
-	KJLoader *p=parent();
+	TQStringList line = tqparent()->item("analyzerwindow");
+	KJLoader *p=tqparent();
 	p->removeChild(this);
 	delete this;
 
@@ -66,8 +66,8 @@ void KJVisScope::swapScope(Visuals newOne)
  * KJNullScope
  *******************************************/
 
-KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent)
-	: KJVisScope(parent)
+KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent)
+	: KJVisScope(tqparent)
 {
 	int x  = l[1].toInt();
 	int y  = l[2].toInt();
@@ -75,17 +75,17 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent)
 	int ys = l[4].toInt() - y;
 
 	// background under vis
-	TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]);
+	TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 	setRect ( x, y, xs, ys );
-	repaint();
+	tqrepaint();
 }
 
 void KJNullScope::paint(TQPainter *p, const TQRect &)
 {
 	// just redraw the background
-	bitBlt ( p->device(), rect().topLeft(), mBack, TQRect(0,0,-1,-1), Qt::CopyROP );
+	bitBlt ( p->device(), rect().topLeft(), mBack, TQRect(0,0,-1,-1), TQt::CopyROP );
 }
 
 bool KJNullScope::mousePress(const TQPoint &)
@@ -98,7 +98,7 @@ void KJNullScope::mouseRelease(const TQPoint &, bool in)
 	if (!in) // only do something if users is still inside the button
 		return;
 
-	parent()->repaint(rect(), false);
+	tqparent()->tqrepaint(rect(), false);
 	swapScope(FFT);
 }
 
@@ -108,7 +108,7 @@ void KJNullScope::readConfig()
 	Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType();
 	if ( v != Null )
 	{
-		parent()->repaint(rect(), false);
+		tqparent()->tqrepaint(rect(), false);
 		swapScope ( v );
 	}
 }
@@ -118,8 +118,8 @@ void KJNullScope::readConfig()
  * KJFFT - Analyzer like visualization, mono
  *************************************************/
 
-KJFFT::KJFFT(const TQStringList &l, KJLoader *parent)
-	: KJVisScope(parent), MonoFFTScope(50), mGradient(0)
+KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent)
+	: KJVisScope(tqparent), MonoFFTScope(50), mGradient(0)
 {
 	int x = l[1].toInt();
 	int y = l[2].toInt();
@@ -129,7 +129,7 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *parent)
 	// each bar will be 1px wide
 	mMultiples=1;
 
-	if ( parent->exist("analyzercolor") )
+	if ( tqparent->exist("analyzercolor") )
 	{
 		TQStringList &col = parser()["analyzercolor"];
 		mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@@ -140,12 +140,12 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *parent)
 	}
 
 	// background under vis
-	TQPixmap tmp  = parent->pixmap(parent->item("backgroundimage")[1]);
+	TQPixmap tmp  = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	mAnalyzer = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	// create a gradient for the bars going from 30% lighter to 30% darker than mColor
 	mGradient = new KPixmap ( TQSize(xs,ys) );
@@ -163,7 +163,7 @@ void KJFFT::scopeEvent(float *d, int size)
 	if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
 	{
 		if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
-			parent()->repaint(rect(), false);
+			tqparent()->tqrepaint(rect(), false);
 		return;
 	}
 
@@ -171,12 +171,12 @@ void KJFFT::scopeEvent(float *d, int size)
 	int h = rect().height();
 
 	TQBitmap mGradientMask ( rect().width(), h, true );
-	TQPainter mask( &mGradientMask );
+	TQPainter tqmask( &mGradientMask );
 
 	float *start = d ;
 	float *end = d + size /*- 1*/;
 
-	// loop creating the mask for vis-gradient
+	// loop creating the tqmask for vis-gradient
 	for ( ; start < end; ++start )
 	{
 		// 5 has been 8 before and I have no idea how this scaling works :/
@@ -191,26 +191,26 @@ void KJFFT::scopeEvent(float *d, int size)
 		else if ( amp > h ) amp = h;
 
 		// make a part of the analyzer-gradient visible
-		mask.fillRect ( x, (h-amp), mMultiples, amp, Qt::color1 );
+		tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
 		x += mMultiples;
 	}
-	// done creating our mask
+	// done creating our tqmask
 
 	// draw background of vis into it
-	bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP );
+	bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
 
 	// draw the analyzer
 	mGradient->setMask(mGradientMask);
-	bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, Qt::CopyROP );
+	bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP );
 
-	repaint();
+	tqrepaint();
 }
 
 void KJFFT::paint(TQPainter *p, const TQRect &)
 {
 	// put that thing on screen
 	if ( !napp->player()->isStopped() )
-		bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), Qt::CopyROP );
+		bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), TQt::CopyROP );
 }
 
 
@@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in)
 		return;
 
 	stop();
-	parent()->repaint(rect(), false);
+	tqparent()->tqrepaint(rect(), false);
 	swapScope(Mono);
 }
 
@@ -236,7 +236,7 @@ void KJFFT::readConfig()
 	if ( v != FFT )
 	{
 		stop();
-		parent()->repaint(rect(), false);
+		tqparent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
@@ -250,8 +250,8 @@ void KJFFT::readConfig()
  * KJStereoFFT - Analyzer like visualization, stereo
  *************************************************/
 
-KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent)
-	: KJVisScope(parent), StereoFFTScope(50), mGradient(0)
+KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent)
+	: KJVisScope(tqparent), StereoFFTScope(50), mGradient(0)
 {
 	//kdDebug(66666) << k_funcinfo << endl;
 
@@ -263,7 +263,7 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent)
 	// each bar will be 1px wide
 	mMultiples=1;
 
-	if ( parent->exist("analyzercolor") )
+	if ( tqparent->exist("analyzercolor") )
 	{
 		TQStringList &col = parser()["analyzercolor"];
 		mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@@ -274,12 +274,12 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent)
 	}
 
 	// background under vis
-	TQPixmap tmp  = parent->pixmap(parent->item("backgroundimage")[1]);
+	TQPixmap tmp  = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	mAnalyzer = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mAnalyzer, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	// create a gradient for the bars going from 30% lighter to 30% darker than mColor
 	mGradient = new KPixmap ( TQSize(xs,ys) );
@@ -297,7 +297,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 	if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
 	{
 		if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
-			parent()->repaint(rect(), false);
+			tqparent()->tqrepaint(rect(), false);
 		return;
 	}
 
@@ -305,7 +305,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 	int hh = (int)(rect().height()/2);
 
 	TQBitmap mGradientMask ( rect().width(), h, true );
-	TQPainter mask( &mGradientMask );
+	TQPainter tqmask( &mGradientMask );
 
 	float *start = left;
 	float *end = left + len;
@@ -313,7 +313,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 	int amp = 0;
 	int x = 0;
 
-	// loop creating the mask for vis-gradient
+	// loop creating the tqmask for vis-gradient
 	for ( ; start < end; ++start )
 	{
 		n = log((*start)+1) * (float)hh * 5;
@@ -324,16 +324,16 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 		else if ( amp > hh ) amp = hh;
 
 		// make a part of the analyzer-gradient visible
-		mask.fillRect ( x, (h-amp), mMultiples, amp, Qt::color1 );
+		tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
 		x += mMultiples;
 	}
-	// done creating our mask
+	// done creating our tqmask
 
 
 	start = right;
 	end = right + len;
 	x = 0;
-	// loop creating the mask for vis-gradient
+	// loop creating the tqmask for vis-gradient
 	for ( ; start < end; ++start )
 	{
 		n = log((*start)+1) * (float)hh * 5;
@@ -344,26 +344,26 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 		else if ( amp > hh ) amp = hh;
 
 		// make a part of the analyzer-gradient visible
-		mask.fillRect ( x, 0, mMultiples, amp, Qt::color1 );
+		tqmask.fillRect ( x, 0, mMultiples, amp, TQt::color1 );
 		x += mMultiples;
 	}
 
 
 	// draw background of vis into it
-	bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP );
+	bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
 
 	// draw the analyzer
 	mGradient->setMask(mGradientMask);
-	bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, Qt::CopyROP );
+	bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP );
 
-	repaint();
+	tqrepaint();
 }
 
 void KJStereoFFT::paint(TQPainter *p, const TQRect &)
 {
 	// put that thing on screen
 	if ( !napp->player()->isStopped() )
-		bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), Qt::CopyROP );
+		bitBlt ( p->device(), rect().topLeft(), mAnalyzer, TQRect(0,0,-1,-1), TQt::CopyROP );
 }
 
 bool KJStereoFFT::mousePress(const TQPoint &)
@@ -376,7 +376,7 @@ void KJStereoFFT::mouseRelease(const TQPoint &, bool in)
 	if (!in) // only do something if users is still inside the button
 		return;
 	stop();
-	parent()->repaint(rect(), false);
+	tqparent()->tqrepaint(rect(), false);
 	swapScope(Null);
 }
 
@@ -387,7 +387,7 @@ void KJStereoFFT::readConfig()
 	if ( v != StereoFFT )
 	{
 		stop();
-		parent()->repaint(rect(), false);
+		tqparent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
@@ -399,8 +399,8 @@ void KJStereoFFT::readConfig()
  * KJScope - oscilloscope like visualization
  *************************************************/
 
-KJScope::KJScope(const TQStringList &l, KJLoader *parent)
-	: KJVisScope(parent), MonoScope(50)/*, blurnum(0), mOsci(0)*/
+KJScope::KJScope(const TQStringList &l, KJLoader *tqparent)
+	: KJVisScope(tqparent), MonoScope(50)/*, blurnum(0), mOsci(0)*/
 {
 	int x=l[1].toInt();
 	int y=l[2].toInt();
@@ -411,7 +411,7 @@ KJScope::KJScope(const TQStringList &l, KJLoader *parent)
 
 //	kdDebug(66666) << "Analyzer Window " << x << "," << y << " " << mWidth << "," << mHeight << endl;
 
-	if ( parent->exist("analyzercolor") )
+	if ( tqparent->exist("analyzercolor") )
 	{
 		TQStringList &col = parser()["analyzercolor"];
 		mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@@ -420,12 +420,12 @@ KJScope::KJScope(const TQStringList &l, KJLoader *parent)
 		mColor.setRgb ( 255, 255, 255 );
 
 	// background under vis
-	TQPixmap tmp  = parent->pixmap(parent->item("backgroundimage")[1]);
+	TQPixmap tmp  = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	mOsci = new KPixmap ( TQSize(xs,ys) );
-	bitBlt( mOsci, 0, 0, &tmp, x, y, xs, ys, Qt::CopyROP );
+	bitBlt( mOsci, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
 	// create a gradient
 	mGradient = new KPixmap ( TQSize(xs,ys) );
@@ -447,8 +447,8 @@ void KJScope::scopeEvent(float *d, int size)
 	{
 		if ( napp->player()->isStopped() )
 		{
-			bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP );
-			repaint();
+			bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
+			tqrepaint();
 		}
 		return;
 	}
@@ -463,7 +463,7 @@ void KJScope::scopeEvent(float *d, int size)
 
 	if ( blurnum == 3 )
 	{  // clear whole Vis
-		bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, Qt::CopyROP );
+		bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
 		tempP.setPen( mColor.light(110) ); // 10% lighter than mColor
 		blurnum=0;
 	}
@@ -487,23 +487,23 @@ void KJScope::scopeEvent(float *d, int size)
 //		tempP.drawLine(x, heightHalf, x, heightHalf+amp);
 		if ( amp > 0 )
 		{
-			bitBlt ( tempP.device(), TQPoint(x,heightHalf), mGradient, TQRect(x,heightHalf,1,amp), Qt::CopyROP );
+			bitBlt ( tempP.device(), TQPoint(x,heightHalf), mGradient, TQRect(x,heightHalf,1,amp), TQt::CopyROP );
 		}
 		else
 		{
 			amp = -amp;
-			bitBlt ( tempP.device(), TQPoint(x,heightHalf-amp), mGradient, TQRect(x,(heightHalf-amp),1,amp), Qt::CopyROP );
+			bitBlt ( tempP.device(), TQPoint(x,heightHalf-amp), mGradient, TQRect(x,(heightHalf-amp),1,amp), TQt::CopyROP );
 		}
 		x++;
 	}
 
-	repaint();
+	tqrepaint();
 }
 
 void KJScope::paint(TQPainter *p, const TQRect &)
 {
 	// put that thing on screen
-	bitBlt ( p->device(), rect().topLeft(), mOsci, TQRect(0,0,-1,-1), Qt::CopyROP );
+	bitBlt ( p->device(), rect().topLeft(), mOsci, TQRect(0,0,-1,-1), TQt::CopyROP );
 }
 
 bool KJScope::mousePress(const TQPoint &)
@@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in)
 		return;
 
 	stop();
-	parent()->repaint(rect(), false);
+	tqparent()->tqrepaint(rect(), false);
 	swapScope(/*Null*/ StereoFFT);
 }
 
@@ -528,7 +528,7 @@ void KJScope::readConfig()
 	if ( v != Mono )
 	{
 		stop();
-		parent()->repaint(rect(), false);
+		tqparent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
diff --git a/noatun/modules/kjofol-skin/kjvis.h b/noatun/modules/kjofol-skin/kjvis.h
index a05103d8..9f8bec4d 100644
--- a/noatun/modules/kjofol-skin/kjvis.h
+++ b/noatun/modules/kjofol-skin/kjvis.h
@@ -8,7 +8,7 @@ class KPixmap;
 class KJVisScope : public KJWidget
 {
 public:
-	KJVisScope(KJLoader *parent) : KJWidget(parent) {};
+	KJVisScope(KJLoader *tqparent) : KJWidget(tqparent) {};
 	enum Visuals { Null=0, FFT, Mono, StereoFFT };
 	void swapScope(Visuals newOne);
 //	virtual void readConfig();
@@ -19,7 +19,7 @@ public:
 class KJNullScope : public KJVisScope
 {
 public:
-	KJNullScope(const TQStringList &, KJLoader *parent);
+	KJNullScope(const TQStringList &, KJLoader *tqparent);
 	virtual void paint(TQPainter *p, const TQRect &);
 	virtual bool mousePress(const TQPoint&);
 	virtual void mouseRelease(const TQPoint &, bool in);
@@ -35,7 +35,7 @@ private:
 class KJFFT : public KJVisScope, public MonoFFTScope
 {
 public:
-	KJFFT(const TQStringList &, KJLoader *parent);
+	KJFFT(const TQStringList &, KJLoader *tqparent);
 	virtual void paint(TQPainter *p, const TQRect &);
 	virtual void scopeEvent(float *d, int size);
 
@@ -57,7 +57,7 @@ private:
 class KJStereoFFT : public KJVisScope, public StereoFFTScope
 {
 public:
-	KJStereoFFT(const TQStringList &, KJLoader *parent);
+	KJStereoFFT(const TQStringList &, KJLoader *tqparent);
 	virtual void paint(TQPainter *p, const TQRect &);
 	virtual void scopeEvent(float *left, float *right, int len);
 
@@ -79,7 +79,7 @@ private:
 class KJScope : public KJVisScope, public MonoScope
 {
 public:
-	KJScope ( const TQStringList &, KJLoader *parent);
+	KJScope ( const TQStringList &, KJLoader *tqparent);
 	virtual void paint(TQPainter *p, const TQRect &);
 	virtual void scopeEvent(float *d, int size);
 
diff --git a/noatun/modules/kjofol-skin/kjwidget.cpp b/noatun/modules/kjofol-skin/kjwidget.cpp
index b46fb651..d292637a 100644
--- a/noatun/modules/kjofol-skin/kjwidget.cpp
+++ b/noatun/modules/kjofol-skin/kjwidget.cpp
@@ -18,16 +18,11 @@ KJWidget::KJWidget(KJLoader *p) : mParent(p)
 {
 }
 
-TQBitmap KJWidget::getMask(const TQImage &_rect, register QRgb transparent)
+TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent)
 {
 	TQImage result(_rect.width(), _rect.height(), 1,2, TQImage::LittleEndian);
-#if QT_VERSION < 0x030300
-	result.setColor(0, qRgb(0,0,0));  //TODO: maybe use Qt::color0 and Qt::color1
-	result.setColor(1, qRgb(255,255,255));
-#else
-	result.setColor(1, qRgb(0,0,0));
-	result.setColor(0, qRgb(255,255,255));
-#endif
+	result.setColor(1, tqRgb(0,0,0));
+	result.setColor(0, tqRgb(255,255,255));
 
 	for(int height=0;height<_rect.height(); height++)
 	{
@@ -39,21 +34,21 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register QRgb transparent)
 	return bm;
 }
 
-void KJWidget::repaint(bool me, const TQRect &r, bool clear)
+void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear)
 {
-	TQPainter p(parent());
+	TQPainter p(tqparent());
 	if (me)
 		paint(&p, r.isValid() ? r : rect());
 	else
-		parent()->repaint(r.isValid() ? r : rect(), clear);
+		tqparent()->tqrepaint(r.isValid() ? r : rect(), clear);
 }
 
 const TQString &KJWidget::backgroundPressed(const TQString &bmp) const
 {
 	if(bmp.isEmpty()) // play safe
 	{
-//		kdDebug(66666) << k_funcinfo << "empty argument 'bmp', returning TQString::null!" << endl;
-		return TQString::null;
+//		kdDebug(66666) << k_funcinfo << "empty argument 'bmp', returning TQString()!" << endl;
+		return TQString();
 	}
 
 //	kdDebug(66666) << k_funcinfo << "Returning pressed pixmap for '" << bmp.latin1() << "'" << endl;
@@ -63,7 +58,7 @@ const TQString &KJWidget::backgroundPressed(const TQString &bmp) const
 	if(item.count() < 2)
 	{
 //		kdDebug(66666) << k_funcinfo << "backgroundimagepressed doesn't have enough keys in its line!" << endl;
-		return TQString::null;
+		return TQString();
 	}
 	else
 		return item[1];
diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h
index 3f63671b..693d4eaa 100644
--- a/noatun/modules/kjofol-skin/kjwidget.h
+++ b/noatun/modules/kjofol-skin/kjwidget.h
@@ -25,17 +25,17 @@ public:
 	virtual void readConfig() {}
 
 	// called when the mouse is moved while clicked in this widget
-	// repaint myself
-	virtual void repaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false);
+	// tqrepaint myself
+	virtual void tqrepaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false);
 
 	virtual TQString tip() { return 0; }
 
 public:
-	static TQBitmap getMask(const TQImage &color, register QRgb=qRgb(255,0,255));
+	static TQBitmap getMask(const TQImage &color, register TQRgb=tqRgb(255,0,255));
 
 protected:
 	const TQString &backgroundPressed(const TQString &bmp) const;
-	KJLoader *parent() const {return mParent;}
+	KJLoader *tqparent() const {return mParent;}
 	KJLoader &parser() const {return *mParent;}
 
 	KJFont &textFont() const {return *mParent->mText;}
diff --git a/noatun/modules/kjofol-skin/parser.cpp b/noatun/modules/kjofol-skin/parser.cpp
index aae5b12e..7b6be03a 100644
--- a/noatun/modules/kjofol-skin/parser.cpp
+++ b/noatun/modules/kjofol-skin/parser.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-	parser.cpp  -  Reads *.rc files in kjöfol-config-format into a QDict
+	parser.cpp  -  Reads *.rc files in kjöfol-config-format into a TQDict
 	--------------------------------------
 	Maintainer: Stefan Gehn <sgehn@gmx.net>
 
@@ -82,7 +82,7 @@ Parser::ImagePixmap* Parser::getPair(const TQString &filenameOld) const
 	// is it in there?
 	ImagePixmap *pair;
 	{
-		pair=mImageCache.find(filenameOld);
+		pair=mImageCache.tqfind(filenameOld);
 		if (pair)
 			return pair;
 	}
@@ -128,5 +128,5 @@ Parser::ImagePixmap* Parser::getPair(const TQString &filenameOld) const
 
 bool Parser::exist(const TQString &i) const
 {
-	return (bool)find(i);
+	return (bool)tqfind(i);
 }
diff --git a/noatun/modules/kjofol-skin/parser.h b/noatun/modules/kjofol-skin/parser.h
index 3f691253..5c838726 100644
--- a/noatun/modules/kjofol-skin/parser.h
+++ b/noatun/modules/kjofol-skin/parser.h
@@ -36,7 +36,7 @@ class Parser : public TQDict<TQStringList>
 		bool exist(const TQString &i) const;
 
 	public:
-		TQStringList& operator[](const TQString &l) { return *find(l);}
+		TQStringList& operator[](const TQString &l) { return *tqfind(l);}
 
 	private:
 		ImagePixmap *getPair(const TQString &i) const;