rename the following methods:

tqparent parent
tqmask mask


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

18 files changed, 133 insertions, 133 deletions

diff --git a/noatun/modules/kjofol-skin/kjbackground.cpp b/noatun/modules/kjofol-skin/kjbackground.cpp
index 543d92cc..5a6e8587 100644
--- a/noatun/modules/kjofol-skin/kjbackground.cpp
+++ b/noatun/modules/kjofol-skin/kjbackground.cpp
@@ -9,18 +9,18 @@
 
 #include "kjbackground.h"
 
-KJBackground::KJBackground(KJLoader *tqparent)
-	: KJWidget(tqparent)
+KJBackground::KJBackground(KJLoader *parent)
+	: KJWidget(parent)
 {
 	TQImage ibackground;
 
-	mBackground = tqparent->pixmap(parser()["backgroundimage"][1]);
-	ibackground = tqparent->image(parser()["backgroundimage"][1]);
+	mBackground = parent->pixmap(parser()["backgroundimage"][1]);
+	ibackground = parent->image(parser()["backgroundimage"][1]);
 
-	tqparent->setMask( getMask(ibackground) );
-	tqparent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) );
+	parent->setMask( getMask(ibackground) );
+	parent->setFixedSize ( TQSize(mBackground.width(), mBackground.height()) );
 
-	setRect(0,0,tqparent->width(),tqparent->height());
+	setRect(0,0,parent->width(),parent->height());
 }
 
 void KJBackground::paint(TQPainter *painter, const TQRect &rect)
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index 6777c518..edd53e2b 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 *tqparent)
-	: TQObject(0), KJWidget(tqparent), mTitle(i[0]), mShowPressed(false)
+KJButton::KJButton(const TQStringList &i, KJLoader *parent)
+	: TQObject(0), KJWidget(parent), mTitle(i[0]), mShowPressed(false)
 {
 //	kdDebug(66666) << k_funcinfo << "new button: " << i[0].latin1() << endl;
 	mPushedPixmap = (i.count() >= 7);
@@ -58,7 +58,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
 			TQString pressedTmp = backgroundPressed((*it));
 			if(!pressedTmp.isEmpty())
 			{
-				mPressed = tqparent->pixmap(pressedTmp);
+				mPressed = parent->pixmap(pressedTmp);
 				gotBack = true;
 			}
 		}
@@ -67,7 +67,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
 			// take background and darken the buttons rectangle
 			// FIXME: what KPixmapEffect causes the desired effect?
 			//        intensity is the wrong one
-			KPixmap temp = tqparent->pixmap(parser()["backgroundimage"][1]);
+			KPixmap temp = parent->pixmap(parser()["backgroundimage"][1]);
 			mPressed = (TQPixmap)KPixmapEffect::intensity ( temp, 1.2f );
 			gotBack = true;
 		}
@@ -79,7 +79,7 @@ KJButton::KJButton(const TQStringList &i, KJLoader *tqparent)
 	{
 		kdDebug(66666) << k_funcinfo << "Couldn't find valid background for button '" <<
 			mTitle << "', dafulting to backgroundimage" << endl;
-		mPressed = tqparent->pixmap(parser()["backgroundimage"][1]);
+		mPressed = parent->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::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
+		bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
 }
 
 bool KJButton::mousePress(const TQPoint &)
 {
-	bitBlt(KJWidget::tqparent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
+	bitBlt(KJWidget::parent(), rect().topLeft(), &mPressed, rect(), TQt::CopyROP);
 	return true;
 }
 
@@ -201,11 +201,11 @@ void KJButton::mouseRelease(const TQPoint &, bool in)
 
 	// now, find what widget I am and do the proper action
 	if (mTitle=="closebutton")
-		KJWidget::tqparent()->close();
+		KJWidget::parent()->close();
 	else if (mTitle=="minimizebutton")
-		KJWidget::tqparent()->minimize();
+		KJWidget::parent()->minimize();
 	else if (mTitle=="aboutbutton")
-		KJWidget::tqparent()->helpMenu()->aboutApplication();
+		KJWidget::parent()->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::tqparent(), i18n("Select File to Play")));
+		KURL file(KFileDialog::getOpenURL(0, napp->mimeTypes(), KJWidget::parent(), 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::tqparent(),"loopMenu");
+		KPopupMenu *loopMenu = new KPopupMenu(KJWidget::parent(),"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::tqparent()->prefs()));
+		napp->preferencesBox()->show(static_cast<CModule *>(KJWidget::parent()->prefs()));
 	else if (mTitle=="dockmodebutton")
-		KJWidget::tqparent()->switchToDockmode();
+		KJWidget::parent()->switchToDockmode();
 	else if (mTitle=="undockmodebutton")
-		KJWidget::tqparent()->returnFromDockmode();
+		KJWidget::parent()->returnFromDockmode();
 	else
 		kdDebug(66666) << "unknown buttontype: " << mTitle.latin1() << endl;
 }
diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp
index 4b260f6f..b84a0185 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.cpp
+++ b/noatun/modules/kjofol-skin/kjequalizer.cpp
@@ -87,8 +87,8 @@ void KJEqualizer::slotUpdateBuffer()
 {
 //	kdDebug(66666) << "[KJEqualizer] slotUpdateBuffer() called." << endl;
 
-	TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent tqmask
-	TQPainter tqmask( &regionMask );
+	TQBitmap regionMask( rect().width(), rect().height(), true); // fully transparent mask
+	TQPainter mask( &regionMask );
 
 	TQPoint destX = TQPoint(0, 0);
 
@@ -103,12 +103,12 @@ 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()), TQt::CopyROP);
-		// make slider opaque in tqmask so you see something on screen
-		tqmask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 );
+		// make slider opaque in mask so you see something on screen
+		mask.fillRect ( destX.x(), 0, mBandWidth, rect().height(), TQt::color1 );
 		destX += TQPoint(mXSpace,0);
 
 	} // for()
-	// whole thingy has been drawn, now set the tqmask
+	// whole thingy has been drawn, now set the mask
 	mView->setMask( regionMask );
 	tqrepaint();
 }
diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h
index f2e85678..42c64a45 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.h
+++ b/noatun/modules/kjofol-skin/kjequalizer.h
@@ -13,7 +13,7 @@ class KJEqualizer : public TQObject, public KJWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-	KJEqualizer(const TQStringList &, KJLoader *tqparent);
+	KJEqualizer(const TQStringList &, KJLoader *parent);
 	~KJEqualizer(void);
 
 	virtual void mouseMove(const TQPoint &pos, bool);
diff --git a/noatun/modules/kjofol-skin/kjfont.cpp b/noatun/modules/kjofol-skin/kjfont.cpp
index cf82fa43..7d5a967f 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 *tqparent) : mTextMask(0), mTransparentRGB(0)
+KJFont::KJFont(const TQString &prefix, KJLoader *parent) : mTextMask(0), mTransparentRGB(0)
 {
-//	kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *tqparent)" << prefix.latin1() << endl;
+//	kdDebug(66666) << "KJFont::KJFont(const TQString &prefix, KJLoader *parent)" << prefix.latin1() << endl;
 
 	if (prefix=="timefont")
 	{
@@ -47,12 +47,12 @@ KJFont::KJFont(const TQString &prefix, KJLoader *tqparent) : mTextMask(0), mTran
 		mNullChar=' ';
 	}
 
-	mText = tqparent->pixmap(tqparent->item(prefix+"image")[1]);
+	mText = parent->pixmap(parent->item(prefix+"image")[1]);
 
-	if ( tqparent->exist(prefix+"size") )
+	if ( parent->exist(prefix+"size") )
 	{
-		mWidth = tqparent->item(prefix+"size")[1].toInt();
-		mHeight = tqparent->item(prefix+"size")[2].toInt();
+		mWidth = parent->item(prefix+"size")[1].toInt();
+		mHeight = parent->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 *tqparent) : mTextMask(0), mTran
 		mHeight = mText.height();
 
 	// Stupid Skin authors tend to forget keys :/
-	if ( tqparent->exist(prefix+"spacing") )
-		mSpacing = tqparent->item(prefix+"spacing")[1].toInt();
+	if ( parent->exist(prefix+"spacing") )
+		mSpacing = parent->item(prefix+"spacing")[1].toInt();
 	else
 		mSpacing = 0; // FIXME: What's default for this in kjöfol???
 
-	if ( tqparent->exist(prefix+"transparent") )
-		mTransparent = (bool)tqparent->item(prefix+"transparent")[1].toInt();
+	if ( parent->exist(prefix+"transparent") )
+		mTransparent = (bool)parent->item(prefix+"transparent")[1].toInt();
 	else
 		mTransparent = true; // transparency seems to be default in kjöfol
 
@@ -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 tqmask
-	TQPainter mp(&regionMask); // tqmask painter
+		mHeight, true); // fully transparent mask
+	TQPainter mp(&regionMask); // mask painter
 
 //	kdDebug(66666) << "region; w=" << region.width() << ", h=" << region.height() << 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 tqmask
-	TQPainter tqmask( &regionMask );
+			 mHeight, true); // fully transparent mask
+	TQPainter mask( &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;
-		tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
+		mask.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
-			tqmask.fillRect ( to.x(), 0, mSpacing, mHeight, TQt::color0 );
+			mask.fillRect ( to.x(), 0, mSpacing, mHeight, TQt::color0 );
 			to += TQPoint ( mSpacing, 0 );
 		}
 	}
 
 	if (freeSpace > 0)
 	{
-		tqmask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
+		mask.fillRect ( to.x(), 0, (freeSpace/2), mHeight, TQt::color0 );
 		to += TQPoint ( (freeSpace/2), 0 );
 	}
 
@@ -260,12 +260,12 @@ void KJFont::drawCharacter(TQPixmap *dev, TQBitmap *devMask, const TQPoint &to,
 
 	bitBlt(dev, to, &mText, TQRect(x,y,xs,ys), TQt::CopyROP);
 
-	// bitBlt tqmask for transparency
+	// bitBlt mask for transparency
 	if ( mTransparent )
 	{
 		bitBlt(devMask, to, &mTextMask, TQRect(x,y,xs,ys), TQt::OrROP);
 	}
-	else // fill tqmask
+	else // fill mask
 	{
 		TQPainter tempPainter (devMask);
 		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 626ed027..69e12052 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 *tqparent);
+	KJFont(const TQString &prefix, KJLoader *parent);
 	// 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
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index 6c433e74..ae25f152 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -72,8 +72,8 @@
 class KJToolTip : public TQToolTip
 {
 public:
-	KJToolTip(KJLoader *tqparent)
-		: TQToolTip(tqparent), mParent(tqparent)
+	KJToolTip(KJLoader *parent)
+		: TQToolTip(parent), mParent(parent)
 	{}
 
 protected:
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index 9e3727b6..4231d0ff 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* tqparent)
-	: CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", tqparent)
+KJPrefs::KJPrefs(TQObject* parent)
+	: CModule(i18n("K-Jöfol Skins"), i18n("Skin Selection For the K-Jöfol Plugin"), "style", parent)
 {
 	cfg = KGlobal::config();
 
diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h
index a0849d17..89991dea 100644
--- a/noatun/modules/kjofol-skin/kjprefs.h
+++ b/noatun/modules/kjofol-skin/kjprefs.h
@@ -27,7 +27,7 @@ class KJPrefs : public CModule
 Q_OBJECT
   TQ_OBJECT
 public:
-	KJPrefs(TQObject* tqparent);
+	KJPrefs(TQObject* parent);
 
 	// 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 24fc2da1..e82a1f8e 100644
--- a/noatun/modules/kjofol-skin/kjseeker.cpp
+++ b/noatun/modules/kjofol-skin/kjseeker.cpp
@@ -22,24 +22,24 @@ 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;
-		tqparent()->image(parser()["backgroundimage"][1]);
+		parent()->image(parser()["backgroundimage"][1]);
 	}
 	else
-		mActive = tqparent()->image(activeBg);
+		mActive = parent()->image(activeBg);
 
-	mScale = tqparent()->image(parser()["seekimage"][1]);
-	TQImage pixmapNoPress = tqparent()->image(parser()["backgroundimage"][1]);
+	mScale = parent()->image(parser()["seekimage"][1]);
+	TQImage pixmapNoPress = parent()->image(parser()["backgroundimage"][1]);
 
-	// generate transparent tqmask
+	// generate transparent mask
 	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 transtqmask(xs, ys, 1, 2, TQImage::LittleEndian);
-	transtqmask.setColor(1, tqRgb(0,0,0));
-	transtqmask.setColor(0, tqRgb(255,255,255));
+	TQImage transmask(xs, ys, 1, 2, TQImage::LittleEndian);
+	transmask.setColor(1, tqRgb(0,0,0));
+	transmask.setColor(0, tqRgb(255,255,255));
 
 	// clear the pointers
 	memset(barmodeImages, 0, 256*sizeof(TQImage*));
@@ -55,10 +55,10 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
 			// am I transparent?
 			if (!isGray(checkmScale))
 			{
-				setPixel1BPP(transtqmask, ix-x, iy-y, 0);
+				setPixel1BPP(transmask, ix-x, iy-y, 0);
 				continue;
 			}
-			setPixel1BPP(transtqmask, ix-x, iy-y, 1);
+			setPixel1BPP(transmask, ix-x, iy-y, 1);
 
 			// what is the level
 			int level=grayRgb(checkmScale)+1;
@@ -89,9 +89,9 @@ KJSeeker::KJSeeker(const TQStringList &i, KJLoader *l) : KJWidget(l), g(0)
 
 	// create the blank one
 	barmode[0]=new TQPixmap(xs, ys);
-	TQPixmap px=tqparent()->pixmap(parser()["backgroundimage"][1]);
+	TQPixmap px=parent()->pixmap(parser()["backgroundimage"][1]);
 	bitBlt(barmode[0], 0, 0, &px, x, y, xs, ys, TQt::CopyROP);
-	px.convertFromImage(transtqmask);
+	px.convertFromImage(transmask);
 	barModeMask=px;
 
 //	kdDebug(66666) << "END KJSeeker constructor" << endl;
@@ -180,7 +180,7 @@ void KJSeeker::timeUpdate(int sec)
 
 	g = sec * 255 / length;
 	//kdDebug(66666) << "sec: " << sec << " len: " << length << " g: " << g << endl;
-	TQPainter p(tqparent());
+	TQPainter p(parent());
 	paint(&p, rect());
 }
 
diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp
index b1e03b7a..589f994f 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   = tqparent()->pixmap(parser()["backgroundimage"][1]);
-	mSlider = tqparent()->pixmap(parser()["volumecontrolimage"][1]);
+	mBack   = parent()->pixmap(parser()["backgroundimage"][1]);
+	mSlider = parent()->pixmap(parser()["volumecontrolimage"][1]);
 }
 
 TQString KJVolumeBar::tip()
@@ -133,8 +133,8 @@ KJVolumeBMP::KJVolumeBMP(const TQStringList &i, KJLoader *p)
 	mWidth = parser()["volumecontrolimagexsize"][1].toInt();
 	mCount = parser()["volumecontrolimagenb"][1].toInt()-1;
 
-	mImages = tqparent()->pixmap(parser()["volumecontrolimage"][1]);
-	mPos = tqparent()->image(parser()["volumecontrolimageposition"][1]);
+	mImages = parent()->pixmap(parser()["volumecontrolimage"][1]);
+	mPos = parent()->image(parser()["volumecontrolimageposition"][1]);
 	timeUpdate(0);
 }
 
@@ -208,12 +208,12 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p)
 	mWidth = parser()["pitchcontrolimagexsize"][1].toInt();
 	mCount = parser()["pitchcontrolimagenb"][1].toInt()-1;
 
-	mImages = tqparent()->pixmap(parser()["pitchcontrolimage"][1]);
-	mPos = tqparent()->image(parser()["pitchcontrolimageposition"][1]);
+	mImages = parent()->pixmap(parser()["pitchcontrolimage"][1]);
+	mPos = parent()->image(parser()["pitchcontrolimageposition"][1]);
 
 	// makes all pixels with rgb(255,0,255) transparent
 	TQImage ibackground;
-	ibackground = tqparent()->image(parser()["pitchcontrolimage"][1]);
+	ibackground = parent()->image(parser()["pitchcontrolimage"][1]);
 	mImages.setMask( getMask(ibackground) );
 
 	Arts::PlayObject playobject = napp->player()->engine()->playObject();
diff --git a/noatun/modules/kjofol-skin/kjsliders.h b/noatun/modules/kjofol-skin/kjsliders.h
index 131261c7..bd3c3324 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 *tqparent);
+	KJVolumeBMP(const TQStringList &, KJLoader *parent);
 
 	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 *tqparent);
+	KJVolumeBar(const TQStringList &, KJLoader *parent);
 
 	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 *tqparent);
+	KJPitchBMP(const TQStringList &, KJLoader *parent);
 
 	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 ab583a24..e0d3028e 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
@@ -90,12 +90,12 @@ void KJFilename::timerEvent(TQTimerEvent *)
 	int height = mView.height();
 	int width = mView.width();
 
-	TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the tqmask
+	TQBitmap cycleMask ( mDistance, height ); // temporary-space for moving parts of the mask
 	TQPixmap cycle ( mDistance, height );	// temporary-space for moving parts of the pixmap
-	TQBitmap newMask ( *mView.tqmask() );		// save old tqmask
+	TQBitmap newMask ( *mView.mask() );		// save old mask
 
-	// 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
+	// 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
 	// it "by hand"
 	bitBlt(&cycleMask, 0,0, &newMask, 0,0, mDistance, height, TQt::CopyROP);
 	bitBlt(&newMask, 0,0, &newMask, mDistance, 0, width-mDistance, height, TQt::CopyROP);
@@ -105,7 +105,7 @@ void KJFilename::timerEvent(TQTimerEvent *)
 	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 tqmask
+	// apply the newly created mask
 	mView.setMask(newMask);
 
 	tqrepaint();
@@ -227,7 +227,7 @@ void KJTime::paint(TQPainter *p, const TQRect &)
 
 	// draw background into buffer
 	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
-	// draw time-display into buffer (that's a pixmap with a tqmask applied)
+	// draw time-display into buffer (that's a pixmap with a mask applied)
 	bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 
 	// and draw it on screen
@@ -584,7 +584,7 @@ void KJFileInfo::paint(TQPainter *p, const TQRect &)
 
 	// draw background into buffer
 	bitBlt ( &temp, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
-	// draw time-display into buffer (that's a pixmap with a tqmask applied)
+	// draw time-display into buffer (that's a pixmap with a mask applied)
 	bitBlt( &temp, 0, 0, &mTime, 0, 0, rect().width(), rect().height(), TQt::CopyROP);
 
 	// and draw it on screen
diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.h b/noatun/modules/kjofol-skin/kjtextdisplay.h
index 0a5caa0a..4997df9d 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.h
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.h
@@ -14,7 +14,7 @@ class KJFilename : public TQObject, public KJWidget
 Q_OBJECT
   TQ_OBJECT
 public:
-	KJFilename(const TQStringList &, KJLoader *tqparent);
+	KJFilename(const TQStringList &, KJLoader *parent);
 	~KJFilename();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -43,7 +43,7 @@ private:
 class KJTime : public KJWidget
 {
 public:
-	KJTime(const TQStringList &, KJLoader *tqparent);
+	KJTime(const TQStringList &, KJLoader *parent);
 	~KJTime();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -73,7 +73,7 @@ private:
 class KJVolumeText : public KJWidget
 {
 public:
-	KJVolumeText(const TQStringList &, KJLoader *tqparent);
+	KJVolumeText(const TQStringList &, KJLoader *parent);
 	~KJVolumeText();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -95,7 +95,7 @@ private:
 class KJPitchText : public KJWidget
 {
 public:
-	KJPitchText(const TQStringList &, KJLoader *tqparent);
+	KJPitchText(const TQStringList &, KJLoader *parent);
 	~KJPitchText();
 
 	virtual void paint(TQPainter *, const TQRect &rect);
@@ -118,7 +118,7 @@ private:
 class KJFileInfo : public KJWidget
 {
 public:
-	KJFileInfo(const TQStringList &, KJLoader *tqparent);
+	KJFileInfo(const TQStringList &, KJLoader *parent);
 	~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 8915e434..a1a4c840 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 = tqparent()->item("analyzerwindow");
-	KJLoader *p=tqparent();
+	TQStringList line = parent()->item("analyzerwindow");
+	KJLoader *p=parent();
 	p->removeChild(this);
 	delete this;
 
@@ -66,8 +66,8 @@ void KJVisScope::swapScope(Visuals newOne)
  * KJNullScope
  *******************************************/
 
-KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent)
-	: KJVisScope(tqparent)
+KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent)
+	: KJVisScope(parent)
 {
 	int x  = l[1].toInt();
 	int y  = l[2].toInt();
@@ -75,7 +75,7 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *tqparent)
 	int ys = l[4].toInt() - y;
 
 	// background under vis
-	TQPixmap tmp = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
+	TQPixmap tmp = parent->pixmap(parent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
 	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 	setRect ( x, y, xs, ys );
@@ -98,7 +98,7 @@ void KJNullScope::mouseRelease(const TQPoint &, bool in)
 	if (!in) // only do something if users is still inside the button
 		return;
 
-	tqparent()->tqrepaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(FFT);
 }
 
@@ -108,7 +108,7 @@ void KJNullScope::readConfig()
 	Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType();
 	if ( v != Null )
 	{
-		tqparent()->tqrepaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 	}
 }
@@ -118,8 +118,8 @@ void KJNullScope::readConfig()
  * KJFFT - Analyzer like visualization, mono
  *************************************************/
 
-KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent)
-	: KJVisScope(tqparent), MonoFFTScope(50), mGradient(0)
+KJFFT::KJFFT(const TQStringList &l, KJLoader *parent)
+	: KJVisScope(parent), MonoFFTScope(50), mGradient(0)
 {
 	int x = l[1].toInt();
 	int y = l[2].toInt();
@@ -129,7 +129,7 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent)
 	// each bar will be 1px wide
 	mMultiples=1;
 
-	if ( tqparent->exist("analyzercolor") )
+	if ( parent->exist("analyzercolor") )
 	{
 		TQStringList &col = parser()["analyzercolor"];
 		mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@@ -140,7 +140,7 @@ KJFFT::KJFFT(const TQStringList &l, KJLoader *tqparent)
 	}
 
 	// background under vis
-	TQPixmap tmp  = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
+	TQPixmap tmp  = parent->pixmap(parent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
 	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
@@ -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
-			tqparent()->tqrepaint(rect(), false);
+			parent()->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 tqmask( &mGradientMask );
+	TQPainter mask( &mGradientMask );
 
 	float *start = d ;
 	float *end = d + size /*- 1*/;
 
-	// loop creating the tqmask for vis-gradient
+	// loop creating the mask for vis-gradient
 	for ( ; start < end; ++start )
 	{
 		// 5 has been 8 before and I have no idea how this scaling works :/
@@ -191,10 +191,10 @@ void KJFFT::scopeEvent(float *d, int size)
 		else if ( amp > h ) amp = h;
 
 		// make a part of the analyzer-gradient visible
-		tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
+		mask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
 		x += mMultiples;
 	}
-	// done creating our tqmask
+	// done creating our mask
 
 	// draw background of vis into it
 	bitBlt ( mAnalyzer, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
@@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in)
 		return;
 
 	stop();
-	tqparent()->tqrepaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(Mono);
 }
 
@@ -236,7 +236,7 @@ void KJFFT::readConfig()
 	if ( v != FFT )
 	{
 		stop();
-		tqparent()->tqrepaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
@@ -250,8 +250,8 @@ void KJFFT::readConfig()
  * KJStereoFFT - Analyzer like visualization, stereo
  *************************************************/
 
-KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent)
-	: KJVisScope(tqparent), StereoFFTScope(50), mGradient(0)
+KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *parent)
+	: KJVisScope(parent), StereoFFTScope(50), mGradient(0)
 {
 	//kdDebug(66666) << k_funcinfo << endl;
 
@@ -263,7 +263,7 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent)
 	// each bar will be 1px wide
 	mMultiples=1;
 
-	if ( tqparent->exist("analyzercolor") )
+	if ( parent->exist("analyzercolor") )
 	{
 		TQStringList &col = parser()["analyzercolor"];
 		mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@@ -274,7 +274,7 @@ KJStereoFFT::KJStereoFFT(const TQStringList &l, KJLoader *tqparent)
 	}
 
 	// background under vis
-	TQPixmap tmp  = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
+	TQPixmap tmp  = parent->pixmap(parent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
 	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
@@ -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
-			tqparent()->tqrepaint(rect(), false);
+			parent()->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 tqmask( &mGradientMask );
+	TQPainter mask( &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 tqmask for vis-gradient
+	// loop creating the mask 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
-		tqmask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
+		mask.fillRect ( x, (h-amp), mMultiples, amp, TQt::color1 );
 		x += mMultiples;
 	}
-	// done creating our tqmask
+	// done creating our mask
 
 
 	start = right;
 	end = right + len;
 	x = 0;
-	// loop creating the tqmask for vis-gradient
+	// loop creating the mask for vis-gradient
 	for ( ; start < end; ++start )
 	{
 		n = log((*start)+1) * (float)hh * 5;
@@ -344,7 +344,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 		else if ( amp > hh ) amp = hh;
 
 		// make a part of the analyzer-gradient visible
-		tqmask.fillRect ( x, 0, mMultiples, amp, TQt::color1 );
+		mask.fillRect ( x, 0, mMultiples, amp, TQt::color1 );
 		x += mMultiples;
 	}
 
@@ -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();
-	tqparent()->tqrepaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(Null);
 }
 
@@ -387,7 +387,7 @@ void KJStereoFFT::readConfig()
 	if ( v != StereoFFT )
 	{
 		stop();
-		tqparent()->tqrepaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
@@ -399,8 +399,8 @@ void KJStereoFFT::readConfig()
  * KJScope - oscilloscope like visualization
  *************************************************/
 
-KJScope::KJScope(const TQStringList &l, KJLoader *tqparent)
-	: KJVisScope(tqparent), MonoScope(50)/*, blurnum(0), mOsci(0)*/
+KJScope::KJScope(const TQStringList &l, KJLoader *parent)
+	: KJVisScope(parent), 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 *tqparent)
 
 //	kdDebug(66666) << "Analyzer Window " << x << "," << y << " " << mWidth << "," << mHeight << endl;
 
-	if ( tqparent->exist("analyzercolor") )
+	if ( parent->exist("analyzercolor") )
 	{
 		TQStringList &col = parser()["analyzercolor"];
 		mColor.setRgb ( col[1].toInt(), col[2].toInt(), col[3].toInt() );
@@ -420,7 +420,7 @@ KJScope::KJScope(const TQStringList &l, KJLoader *tqparent)
 		mColor.setRgb ( 255, 255, 255 );
 
 	// background under vis
-	TQPixmap tmp  = tqparent->pixmap(tqparent->item("backgroundimage")[1]);
+	TQPixmap tmp  = parent->pixmap(parent->item("backgroundimage")[1]);
 	mBack = new KPixmap ( TQSize(xs,ys) );
 	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 
@@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in)
 		return;
 
 	stop();
-	tqparent()->tqrepaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(/*Null*/ StereoFFT);
 }
 
@@ -528,7 +528,7 @@ void KJScope::readConfig()
 	if ( v != Mono )
 	{
 		stop();
-		tqparent()->tqrepaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
diff --git a/noatun/modules/kjofol-skin/kjvis.h b/noatun/modules/kjofol-skin/kjvis.h
index 9f8bec4d..a05103d8 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 *tqparent) : KJWidget(tqparent) {};
+	KJVisScope(KJLoader *parent) : KJWidget(parent) {};
 	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 *tqparent);
+	KJNullScope(const TQStringList &, KJLoader *parent);
 	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 *tqparent);
+	KJFFT(const TQStringList &, KJLoader *parent);
 	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 *tqparent);
+	KJStereoFFT(const TQStringList &, KJLoader *parent);
 	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 *tqparent);
+	KJScope ( const TQStringList &, KJLoader *parent);
 	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 d292637a..f9cb345a 100644
--- a/noatun/modules/kjofol-skin/kjwidget.cpp
+++ b/noatun/modules/kjofol-skin/kjwidget.cpp
@@ -36,11 +36,11 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent)
 
 void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear)
 {
-	TQPainter p(tqparent());
+	TQPainter p(parent());
 	if (me)
 		paint(&p, r.isValid() ? r : rect());
 	else
-		tqparent()->tqrepaint(r.isValid() ? r : rect(), clear);
+		parent()->tqrepaint(r.isValid() ? r : rect(), clear);
 }
 
 const TQString &KJWidget::backgroundPressed(const TQString &bmp) const
diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h
index 693d4eaa..a678e8a7 100644
--- a/noatun/modules/kjofol-skin/kjwidget.h
+++ b/noatun/modules/kjofol-skin/kjwidget.h
@@ -35,7 +35,7 @@ public:
 
 protected:
 	const TQString &backgroundPressed(const TQString &bmp) const;
-	KJLoader *tqparent() const {return mParent;}
+	KJLoader *parent() const {return mParent;}
 	KJLoader &parser() const {return *mParent;}
 
 	KJFont &textFont() const {return *mParent->mText;}