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

1 files changed, 15 insertions, 15 deletions

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;
 }