rename the following methods:

tqparent parent
tqmask mask


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

10 files changed, 28 insertions, 28 deletions

diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
index 97b3ff4..62dc3a5 100644
--- a/kaffeine/src/input/disc/disc.cpp
+++ b/kaffeine/src/input/disc/disc.cpp
@@ -42,7 +42,7 @@
 #include "disc.h"
 #include "disc.moc"
 
-MLabel::MLabel( TQWidget *tqparent ) : TQLabel( tqparent )
+MLabel::MLabel( TQWidget *parent ) : TQLabel( parent )
 {
 	setText("<center><font size=\"6\"><b>"+i18n("Audio CD")+"</b></font></center>");
 }
@@ -59,7 +59,7 @@ void MLabel::paintEvent( TQPaintEvent *pe )
 	setPaletteBackgroundColor( TQColor(r, g, b) );
 }
 
-MListView::MListView( TQWidget *tqparent ) : KListView( tqparent )
+MListView::MListView( TQWidget *parent ) : KListView( parent )
 {
 }
 
@@ -73,9 +73,9 @@ void MListView::resizeEvent( TQResizeEvent *rev )
 	KListView::resizeEvent(rev);
 }
 
-Disc::Disc( TQWidget* tqparent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name)
+Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name)
 {
-	mainWidget = new TQVBox( tqparent );
+	mainWidget = new TQVBox( parent );
 	mainWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
 	split = new TQSplitter( mainWidget );
 	split->setOpaqueResize( true );
diff --git a/kaffeine/src/input/disc/disc.h b/kaffeine/src/input/disc/disc.h
index fe1a1ad..129041d 100644
--- a/kaffeine/src/input/disc/disc.h
+++ b/kaffeine/src/input/disc/disc.h
@@ -46,7 +46,7 @@ class MLabel : public TQLabel
   TQ_OBJECT
 
 public:
-	MLabel( TQWidget *tqparent );
+	MLabel( TQWidget *parent );
 	~MLabel() {}
 
 protected:
@@ -61,7 +61,7 @@ class MListView : public KListView
   TQ_OBJECT
 
 public:
-	MListView( TQWidget *tqparent );
+	MListView( TQWidget *parent );
 	~MListView() {}
 
 protected:
@@ -76,7 +76,7 @@ class Disc : public KaffeineInput
   TQ_OBJECT
 
 public:
-	Disc(TQWidget *tqparent, TQObject *objParent, const char *name=0);
+	Disc(TQWidget *parent, TQObject *objParent, const char *name=0);
 	~Disc();
 
 	// Reimplemented from KaffeineInput
diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp
index ce07604..03f39fa 100644
--- a/kaffeine/src/input/disc/paranoia.cpp
+++ b/kaffeine/src/input/disc/paranoia.cpp
@@ -50,7 +50,7 @@
 
 #define DEFAULT_DRIVE "/dev/cdrom"
 
-KiloConfig::KiloConfig( TQWidget *tqparent, KConfig *confile, const TQStringList &encoders ) : ParanoiaSettings( tqparent )
+KiloConfig::KiloConfig( TQWidget *parent, KConfig *confile, const TQStringList &encoders ) : ParanoiaSettings( parent )
 {
 	int i;
 
@@ -227,14 +227,14 @@ void Paranoia::setMode( int mode )
 	paranoia_modeset( p, mode );
 }
 
-bool Paranoia::encode( const TQStringList &list, TQWidget *tqparent )
+bool Paranoia::encode( const TQStringList &list, TQWidget *parent )
 {
 	TQStringList desktop;
 	TQStringList encoderName;
 
 	encodingList.clear();
 	encodingList = list;
-	myParent = tqparent;
+	myParent = parent;
 
 	// check for encoders
 	KTrader::OfferList offers = KTrader::self()->query("KaffeineAudioEncoder");
@@ -282,20 +282,20 @@ bool Paranoia::encode( const TQStringList &list, TQWidget *tqparent )
 	return true;
 }
 
-bool Paranoia::loadEncoder( TQWidget *tqparent )
+bool Paranoia::loadEncoder( TQWidget *parent )
 {
 	int error = 0;
 
 	KService::Ptr service = KService::serviceByDesktopName( encoderDesktop );
 	if (!service) {
-		KMessageBox::error( tqparent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
+		KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
 		return false;
 	}
 
 	if ( service->serviceTypes().contains("KaffeineAudioEncoder") ) {
 		currentEncoder = KParts::ComponentFactory::createPartInstanceFromService<KaffeineAudioEncoder>(service, 0, service->name().ascii(), 0, 0, 0, &error);
 		if (error > 0) {
-			KMessageBox::error( tqparent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
+			KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
 			return false;
 		}
 		else
diff --git a/kaffeine/src/input/disc/paranoia.h b/kaffeine/src/input/disc/paranoia.h
index 0957ffe..f54d010 100644
--- a/kaffeine/src/input/disc/paranoia.h
+++ b/kaffeine/src/input/disc/paranoia.h
@@ -43,7 +43,7 @@ class KiloConfig : public ParanoiaSettings
 
 public:
 
-	KiloConfig( TQWidget *tqparent, KConfig *confile, const TQStringList &encoders );
+	KiloConfig( TQWidget *parent, KConfig *confile, const TQStringList &encoders );
 	~KiloConfig();
 
 	TQString getEncoder();
diff --git a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp
index 85b9f7a..5d545da 100644
--- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp
+++ b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp
@@ -21,7 +21,7 @@
 #include "kaffeineaudioencoder.h"
 #include "kaffeineaudioencoder.moc"
 
-KaffeineAudioEncoder::KaffeineAudioEncoder(TQObject* tqparent, const char* name) : KParts::Part( tqparent, name )
+KaffeineAudioEncoder::KaffeineAudioEncoder(TQObject* parent, const char* name) : KParts::Part( parent, name )
 {
 }
 
diff --git a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
index 3cfc570..f7f3c42 100644
--- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
+++ b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
@@ -36,7 +36,7 @@ class KDE_EXPORT KaffeineAudioEncoder : public KParts::Part
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KaffeineAudioEncoder(TQObject* tqparent, const char* name);
+	KaffeineAudioEncoder(TQObject* parent, const char* name);
 	virtual ~KaffeineAudioEncoder();
 
 	// return false if the user's canceled.
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
index 19f3737..fc7dda2 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
+++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
@@ -29,7 +29,7 @@
 #include "klameenc.h"
 #include "klameenc.moc"
 
-LameSettings::LameSettings( TQWidget *tqparent, KConfig *confile ) : LameConfig( tqparent )
+LameSettings::LameSettings( TQWidget *parent, KConfig *confile ) : LameConfig( parent )
 {
 	KIconLoader *icon = new KIconLoader();
 	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
@@ -79,8 +79,8 @@ bool LameSettings::isVBR()
 
 K_EXPORT_COMPONENT_FACTORY (libkaffeinemp3lame, KParts::GenericFactory<KLameEnc>)
 
-KLameEnc::KLameEnc( TQWidget*, const char*, TQObject* tqparent, const char* name, const TQStringList& )
-	: KaffeineAudioEncoder(tqparent,name)
+KLameEnc::KLameEnc( TQWidget*, const char*, TQObject* parent, const char* name, const TQStringList& )
+	: KaffeineAudioEncoder(parent,name)
 {
 	setInstance(KParts::GenericFactory<KLameEnc>::instance());
 }
@@ -101,9 +101,9 @@ TQString KLameEnc::getExtension()
 	return TQString(".mp3");
 }
 
-bool KLameEnc::options( TQWidget *tqparent, KConfig *conf )
+bool KLameEnc::options( TQWidget *parent, KConfig *conf )
 {
-	LameSettings dlg( tqparent, conf );
+	LameSettings dlg( parent, conf );
 	int ret = dlg.exec();
 	if ( ret!=TQDialog::Accepted )
 		return false;
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
index faa944e..033f448 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
+++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
@@ -33,7 +33,7 @@ class LameSettings : public LameConfig
 	Q_OBJECT
   TQ_OBJECT
 public:
-	LameSettings( TQWidget *tqparent, KConfig *confile );
+	LameSettings( TQWidget *parent, KConfig *confile );
 	~LameSettings();
 
 	int getBitrate();
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
index a96898c..bd16963 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
@@ -27,7 +27,7 @@
 #include "koggenc.h"
 #include "koggenc.moc"
 
-OggSettings::OggSettings( TQWidget *tqparent, KConfig *confile ) : OggConfig( tqparent )
+OggSettings::OggSettings( TQWidget *parent, KConfig *confile ) : OggConfig( parent )
 {
 	KIconLoader *icon = new KIconLoader();
 	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
@@ -56,8 +56,8 @@ int OggSettings::getQuality()
 
 K_EXPORT_COMPONENT_FACTORY (libkaffeineoggvorbis, KParts::GenericFactory<KOggEnc>)
 
-KOggEnc::KOggEnc( TQWidget*, const char*, TQObject* tqparent, const char* name, const TQStringList& )
-	: KaffeineAudioEncoder(tqparent,name)
+KOggEnc::KOggEnc( TQWidget*, const char*, TQObject* parent, const char* name, const TQStringList& )
+	: KaffeineAudioEncoder(parent,name)
 {
 	setInstance(KParts::GenericFactory<KOggEnc>::instance());
 	encodingQuality = 0.4;
@@ -81,9 +81,9 @@ TQString KOggEnc::getExtension()
 	return TQString(".ogg");
 }
 
-bool KOggEnc::options( TQWidget *tqparent, KConfig *conf )
+bool KOggEnc::options( TQWidget *parent, KConfig *conf )
 {
-	OggSettings dlg( tqparent, conf );
+	OggSettings dlg( parent, conf );
 	int ret = dlg.exec();
 	if ( ret!=TQDialog::Accepted )
 		return false;
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
index be2c9b6..f495cbf 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
@@ -41,7 +41,7 @@ class OggSettings : public OggConfig
 	Q_OBJECT
   TQ_OBJECT
 public:
-	OggSettings( TQWidget *tqparent, KConfig *confile );
+	OggSettings( TQWidget *parent, KConfig *confile );
 	~OggSettings();
 
 	int getQuality();