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

23 files changed, 55 insertions, 55 deletions

diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp
index 9075f87e..6f07a322 100644
--- a/arts/tools/artsactions.cpp
+++ b/arts/tools/artsactions.cpp
@@ -36,8 +36,8 @@
 #include "environmentview.h"
 #include "mediatypesview.h"
 
-ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* tqparent, const char* name )
-  : TQObject( tqparent,name )
+ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* parent, const char* name )
+  : TQObject( parent,name )
   , _kartsserver( server )
   , _actioncollection( col )
   , _a_sv( 0 ), _a_am( 0 ), _a_asv( 0 ), _a_mmv( 0 ), _a_ev( 0 ), _a_mtv( 0 )
diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h
index b6f77839..d28edd33 100644
--- a/arts/tools/artsactions.h
+++ b/arts/tools/artsactions.h
@@ -48,7 +48,7 @@ public:
 
 		@param artsserver a pointer to a existing KArtsServer. If 0 a new is created.
 		@param actioncollection the KActionCollection all the actions should belong to. Names of the actions are then: artssupport_*
-		@param qwidget the tqparent TQWidget
+		@param qwidget the parent TQWidget
 		@param name the name of the object
 	*/
 	ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 );
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index 490366d1..f59bc9ff 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -29,18 +29,18 @@
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString configFile)
+  KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
   {
     KGlobal::locale()->insertCatalogue("artscontrol");
     return new ArtsControlApplet(configFile, KPanelApplet::Normal,
                       KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/,
-                      tqparent, "artscontrolapplet");
+                      parent, "artscontrolapplet");
   }
 }
 
-ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) : KPanelApplet(configFile, type, actions, tqparent, name)
+ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name)
 {
-	//kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<tqparent<<", const char* "<<name<<" )"<<endl;
+	//kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<parent<<", const char* "<<name<<" )"<<endl;
 	// Get the current application configuration handle
 	ksConfig = config();
 
diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h
index ab683464..e1722ebf 100644
--- a/arts/tools/artscontrolapplet.h
+++ b/arts/tools/artscontrolapplet.h
@@ -39,7 +39,7 @@ public:
 	* @param configFile The configFile handed over in the factory function.
 	* @param Type The applet @ref type().
 	* @param actions Standard RMB menu actions supported by the applet (see @ref action() ).
-	* @param tqparent The pointer to the tqparent widget handed over in the factory function.
+	* @param parent The pointer to the parent widget handed over in the factory function.
 	* @param name A TQt object name for your applet.
 	**/
 	ArtsControlApplet(const TQString& configFile, Type t = Normal, int = 0,
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index 2f7c553d..bddc0728 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -66,9 +66,9 @@ public:
 	KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
 	KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall;
 
-	ArtsControlAppletPrivate( ArtsControlApplet *tqparent )
-	    : TQObject(tqparent)
-	    , _parent( tqparent )
+	ArtsControlAppletPrivate( ArtsControlApplet *parent )
+	    : TQObject(parent)
+	    , _parent( parent )
 	    , barts( false )
 	    , bInUpdate( false )
 	{
@@ -78,7 +78,7 @@ public:
 		if( barts ) volume = arts->server().outVolume();
 		svinline=0;
 
-		_artsactions = new ArtsActions( arts, 0, tqparent );
+		_artsactions = new ArtsActions( arts, 0, parent );
 
 		menu = new KPopupMenu( 0 );
 		_showSV = _artsactions->actionScopeView();
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index 73debf80..439ab191 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -37,7 +37,7 @@ using namespace std;
  * as this is an 1:1 port of an old arts-0.3.4.1 artsbuilable visual widget,
  * you'll see some porting artefacts, and it's not elegance itself ;)
  */
-Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name )
+Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name )
 {
 	this->setCaption( i18n( "Audio Manager" ) );
 	this->setIcon( MainBarIcon( "artsaudiomanager", 32 ) );
@@ -72,14 +72,14 @@ void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget)
 }
 #endif
 
-void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/)
+void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*tqlayout*/)
 {
 /************************************************************************
  * From Gui_INSTRUMENT_MAPPER:
  *
- * I am still not sure wether this kind of putting yourself into a tqparent
+ * I am still not sure wether this kind of putting yourself into a parent
  * widget (with own tqlayout etc.) is a good idea (there may not even be
- * a singe call to setParent, because there is no tqparent).
+ * a singe call to setParent, because there is no parent).
  *
  * But the "how to write aRts widgets"-stuff will need some experiments,
  * so lets try that method...
@@ -90,12 +90,12 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/
  * else would be appropriate. Check that. FIXME
  ************************************************************************/
 
-	TQVBoxLayout *maintqlayout = new TQVBoxLayout(tqparent);
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(parent);
 	/*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/
 
 // list
 
-	listview = new KListView(tqparent);
+	listview = new KListView(parent);
 
 	listview->addColumn(i18n("Title"),175);
 	listview->addColumn(i18n("Type"),50);
@@ -110,7 +110,7 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/
 
 	maintqlayout->activate();
 	//maintqlayout->freeze();
-	ParentWidget = tqparent;
+	ParentWidget = parent;
 }
 
 void Gui_AUDIO_MANAGER::tick()
@@ -178,8 +178,8 @@ void GuiAudioManagerProxy::edit(TQListViewItem *item)
 	gim->edit(item);
 }
 
-AudioManagerItem::AudioManagerItem(TQListView *tqparent, TQString a,
-         TQString b, TQString c, long ID) :TQListViewItem(tqparent,a,b,c)
+AudioManagerItem::AudioManagerItem(TQListView *parent, TQString a,
+         TQString b, TQString c, long ID) :TQListViewItem(parent,a,b,c)
 {
 	_ID = ID;
 }
diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h
index 5a23092d..6f86778e 100644
--- a/arts/tools/audiomanager.h
+++ b/arts/tools/audiomanager.h
@@ -71,7 +71,7 @@ public slots:
 class AudioManagerItem : public TQListViewItem {
 	long _ID;
 public:
-	AudioManagerItem(TQListView *tqparent, TQString a, TQString b,
+	AudioManagerItem(TQListView *parent, TQString a, TQString b,
 			              TQString c, long ID);
 	~AudioManagerItem();
 
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index a4f96ba5..29a1bb69 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -42,8 +42,8 @@ static void min_size(TQWidget *w) {
   w->setMinimumSize(w->tqsizeHint());
 }
 
-ChooseBusDlg::ChooseBusDlg(TQWidget *tqparent)
-	: KDialog(tqparent,"X", TRUE)
+ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
+	: KDialog(parent,"X", TRUE)
 	, _newbusitemindex( -1 )
 {
 	setCaption(i18n("Choose Bus"));
diff --git a/arts/tools/choosebusdlg.h b/arts/tools/choosebusdlg.h
index 9ba29b8a..13312651 100644
--- a/arts/tools/choosebusdlg.h
+++ b/arts/tools/choosebusdlg.h
@@ -36,7 +36,7 @@ class ChooseBusDlg :public KDialog {
 
 	int _newbusitemindex;
 public:
-	ChooseBusDlg(TQWidget *tqparent);
+	ChooseBusDlg(TQWidget *parent);
 
 public slots:
 	TQString result();
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index 0ba42a7f..f62a5c06 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -61,7 +61,7 @@ public:
 	}
 };
 
-EnvironmentView::EnvironmentView( Container container, TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name ), container(container)
+EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ), container(container)
 {
 	this->setCaption( i18n( "Environment" ) );
 	this->setIcon( MainBarIcon( "artsenvironment", 32 ) );
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index 1d5c5345..ab15dc59 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -37,8 +37,8 @@
 using namespace std;
 using namespace Arts;
 
-FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* tqparent )
-	: Template_ArtsView( tqparent )
+FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* parent )
+	: Template_ArtsView( parent )
 	, server( server )
 	, scopeData( 0 )
 {
diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp
index ae7834a8..08d9099b 100644
--- a/arts/tools/levelmeters.cpp
+++ b/arts/tools/levelmeters.cpp
@@ -7,8 +7,8 @@
 
 const int PeakBar::peakMillis=1500;
 
-PeakBar::PeakBar(TQWidget *tqparent)
-	: ACLevelMeter(tqparent)
+PeakBar::PeakBar(TQWidget *parent)
+	: ACLevelMeter(parent)
 	, maxValue( 0.0f )
 	, minValue( 0.0f )
 {
@@ -109,8 +109,8 @@ void PeakBar::setValue(float f) {
 
 // -------------------------------------------------------------
 
-PeakLevelMeters::PeakLevelMeters(TQWidget *tqparent):
-	StereoLevelMeter(tqparent), left(this), right(this), scaleView(this)
+PeakLevelMeters::PeakLevelMeters(TQWidget *parent):
+	StereoLevelMeter(parent), left(this), right(this), scaleView(this)
 {
 	TQBoxLayout *tqlayout= new TQHBoxLayout(this);
 	tqlayout->addWidget(&left);
@@ -142,7 +142,7 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) {
 	right.setValue(f);
 }
 
-ScaleView::ScaleView(TQWidget *tqparent): TQFrame(tqparent) {
+ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) {
 	font.setPixelSize(10);
 	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
 }
@@ -187,7 +187,7 @@ void ScaleView::drawContents(TQPainter *p) {
 
 // -------------------------------------------------------------
 
-LedMeter::LedMeter(TQWidget *tqparent, bool blueState) : ACLevelMeter(tqparent) {
+LedMeter::LedMeter(TQWidget *parent, bool blueState) : ACLevelMeter(parent) {
 	setBackgroundColor(black);
 	TQBoxLayout * l = new TQVBoxLayout( this );
 	l->setAutoAdd(TRUE);
@@ -223,8 +223,8 @@ void LedMeter::setValue(float f)
 
 // -------------------------------------------------------------
 
-StereoLedMeters::StereoLedMeters(TQWidget *tqparent)
-	: StereoLevelMeter(tqparent), left(this), right(this)
+StereoLedMeters::StereoLedMeters(TQWidget *parent)
+	: StereoLevelMeter(parent), left(this), right(this)
 {
 	TQBoxLayout *tqlayout= new TQHBoxLayout(this);
 	tqlayout->addWidget(&left);
diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h
index 64c41c0b..8046d745 100644
--- a/arts/tools/levelmeters.h
+++ b/arts/tools/levelmeters.h
@@ -46,7 +46,7 @@ class ACLevelMeter : public TQFrame {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ACLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {}
+	ACLevelMeter(TQWidget *parent): TQFrame(parent) {}
 public slots:
 	virtual void setValue(float f) = 0;
 };
@@ -58,7 +58,7 @@ class StereoLevelMeter : public TQFrame {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	StereoLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {}
+	StereoLevelMeter(TQWidget *parent): TQFrame(parent) {}
 public slots:
 	virtual void setValues(float left, float right) = 0;
 };
@@ -92,7 +92,7 @@ protected:
 	void frameChanged();
 	
 public:
-	PeakBar(TQWidget *tqparent);
+	PeakBar(TQWidget *parent);
 	
 	TQSize tqsizeHint() const;
 
@@ -111,7 +111,7 @@ protected:
 	int dbRange;
 	int upperMargin, lowerMargin;
 public:
-	ScaleView(TQWidget *tqparent);
+	ScaleView(TQWidget *parent);
 	void setDbRange(int db);
 	void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; }
 	TQSize tqsizeHint() const;
@@ -132,7 +132,7 @@ protected:
 	ScaleView scaleView;
 
 public:
-	PeakLevelMeters(TQWidget *tqparent);
+	PeakLevelMeters(TQWidget *parent);
 
 public slots:
 	void setValues(float leftVal, float rightVal);
@@ -153,7 +153,7 @@ protected:
 	KLed *leds[12];
 
 public:
-	LedMeter(TQWidget *tqparent, bool blueState = false);
+	LedMeter(TQWidget *parent, bool blueState = false);
 	void setValue(float f);
 };
 
@@ -167,7 +167,7 @@ protected:
 	LedMeter left, right;
 	
 public:
-	StereoLedMeters(TQWidget *tqparent);
+	StereoLedMeters(TQWidget *parent);
 public slots:
 	void setValues(float left, float right);
 };
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index 5492f38a..62b3668a 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -82,7 +82,7 @@ FreeVerbView::~FreeVerbView() {
 }
 
 
-VControl::VControl( KArtsServer* artsserver, TQWidget *tqparent) : TQFrame(tqparent)
+VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent)
 	, freeVerbView(0)
 	, server( artsserver )
 {
diff --git a/arts/tools/main.h b/arts/tools/main.h
index 3b52dadb..41bcccdd 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -79,7 +79,7 @@ protected:
 	TQBoxLayout *boxLayout;
 
 public:
-	VControl( KArtsServer*, TQWidget *tqparent);
+	VControl( KArtsServer*, TQWidget *parent);
 	~VControl();
 
 public slots:
diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp
index fb8938d7..9353cda6 100644
--- a/arts/tools/mediatypesview.cpp
+++ b/arts/tools/mediatypesview.cpp
@@ -33,7 +33,7 @@
 using namespace std;
 using namespace Arts;
 
-MediaTypesView::MediaTypesView( TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name )
+MediaTypesView::MediaTypesView( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name )
 {
 	this->setCaption( i18n( "Available Media Types" ) );
 	this->setIcon( MainBarIcon( "artsmediatypes", 32 ) );
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 339cafa6..8fe922b7 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -63,8 +63,8 @@ static TQStringList listFiles(TQString directory, TQString extension)
 	return result;
 }
 
-MidiInstDlg::MidiInstDlg(TQWidget *tqparent)
-	:TQDialog(tqparent,"instrument",TRUE)
+MidiInstDlg::MidiInstDlg(TQWidget *parent)
+	:TQDialog(parent,"instrument",TRUE)
 {
 	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
 
diff --git a/arts/tools/midiinstdlg.h b/arts/tools/midiinstdlg.h
index 0e425225..52b617ef 100644
--- a/arts/tools/midiinstdlg.h
+++ b/arts/tools/midiinstdlg.h
@@ -31,7 +31,7 @@ class MidiInstDlg :public TQDialog {
   TQ_OBJECT
 	TQComboBox *box;
 public:
-	MidiInstDlg(TQWidget *tqparent);
+	MidiInstDlg(TQWidget *parent);
 	TQCString filename();
 public slots:
 	void help();
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index a9cefb07..3f137dea 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -78,7 +78,7 @@ public:
 class ConnectionWidget : public TQWidget {
 public:
 	MidiManagerView *v;
-	ConnectionWidget(MidiManagerView *v, TQWidget *tqparent) : TQWidget(tqparent), v(v)
+	ConnectionWidget(MidiManagerView *v, TQWidget *parent) : TQWidget(parent), v(v)
 	{
 	}
 	void paintEvent(TQPaintEvent * /*event*/)
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index eaed97f1..1c46d9e5 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -32,7 +32,7 @@
 #include <tqpushbutton.h>
 #include <kstdguiitem.h>
 
-MidiPortDlg::MidiPortDlg(TQWidget *tqparent, const char *oldname, const char *title) :TQDialog(tqparent,title,TRUE)
+MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,TRUE)
 {
 	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
 
diff --git a/arts/tools/midiportdlg.h b/arts/tools/midiportdlg.h
index b6b428bc..59cb4f0f 100644
--- a/arts/tools/midiportdlg.h
+++ b/arts/tools/midiportdlg.h
@@ -34,7 +34,7 @@ class MidiPortDlg :public TQDialog {
   TQ_OBJECT
 	TQLineEdit *edit;
 public:
-	MidiPortDlg(TQWidget *tqparent, const char *device, const char *title);
+	MidiPortDlg(TQWidget *parent, const char *device, const char *title);
 	const char *device();
 
 public slots:
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index 6a9f0a25..901362fd 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -33,8 +33,8 @@
 using namespace std;
 using namespace Arts;
 
-ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* tqparent, const char* name )
-	: Template_ArtsView( tqparent,name )
+ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, const char* name )
+	: Template_ArtsView( parent,name )
 	, server(a_server)
 {
 	this->setCaption( i18n( "aRts tqStatus" ) );
diff --git a/arts/tools/templateview.cpp b/arts/tools/templateview.cpp
index a89efac4..a589ff46 100644
--- a/arts/tools/templateview.cpp
+++ b/arts/tools/templateview.cpp
@@ -22,7 +22,7 @@
 
 //#include <kdebug.h>
 
-Template_ArtsView::Template_ArtsView( TQWidget* tqparent, const char* name ) : TQFrame( tqparent,name ){
+Template_ArtsView::Template_ArtsView( TQWidget* parent, const char* name ) : TQFrame( parent,name ){
 	//kdDebug()<<k_funcinfo<<endl;
 }