Rename obsolete tq methods to standard names

9 files changed, 100 insertions, 100 deletions

diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index 8ffe493f..ec96958b 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -48,20 +48,20 @@ ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int
 	if( !p->barts ) KMessageBox::information(0, i18n("Something with the ArtsServer went wrong. You probably need to restart aRts and then reload this applet."));
 	setCustomMenu(p->menu);
 
-	p->tqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
-	p->tqlayout->setSpacing( 2 );
+	p->layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
+	p->layout->setSpacing( 2 );
 
 	if( p->barts ) {
 		p->vu = Arts::StereoVolumeControlGui( p->volume );
 		p->vu.label().fontsize( 8 );
 		p->vuw = new KArtsWidget( p->vu, this );
 		p->vuw->setMinimumSize( 16,16 );
-		p->tqlayout->addWidget( p->vuw );
+		p->layout->addWidget( p->vuw );
 	}
 
-	p->tqlayout->activate();
+	p->layout->activate();
 
-	TQTimer::singleShot( 100, this, TQT_SLOT( supdatetqlayout() ) );
+	TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) );
 
 kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl;
 }
@@ -93,7 +93,7 @@ kdDebug()<<k_funcinfo<<endl;
 
 int ArtsControlApplet::widthForHeight( int h ) const {
 kdDebug()<<"ArtsControlApplet::widthForHeight( int "<<h<<" )"<<endl;
-	return p->tqlayout->sizeHint().width();
+	return p->layout->sizeHint().width();
 }
 
 int ArtsControlApplet::heightForWidth( int w ) const {
@@ -122,12 +122,12 @@ kdDebug()<<k_funcinfo<<" position()="<<position()<<endl;
 	{
 		case pTop:
 		case pBottom:
-			p->tqlayout->setDirection( TQBoxLayout::LeftToRight );
+			p->layout->setDirection( TQBoxLayout::LeftToRight );
 			if ( p->barts ) p->vu.direction( Arts::LeftToRight );
 			break;
 		case pRight:
 		case pLeft:
-			p->tqlayout->setDirection( TQBoxLayout::TopToBottom );
+			p->layout->setDirection( TQBoxLayout::TopToBottom );
 			if ( p->barts ) p->vu.direction( Arts::TopToBottom );
 			break;
 		default: break;
@@ -140,23 +140,23 @@ kdDebug() << k_funcinfo << endl;
 		svinline = new FFTScopeView( arts->server(), _parent );
 		svinline->setMargin( 2 ); svinline->setLineWidth( 2 ); svinline->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
 		connect( svinline, TQT_SIGNAL( closed() ), this, TQT_SLOT( SVinline() ) );
-		tqlayout->addWidget( svinline );
+		layout->addWidget( svinline );
 	} else {
 		delete svinline;
 		svinline = 0;
 	}
-	_parent->supdatetqlayout();
+	_parent->supdatelayout();
 }
 
 void ArtsControlAppletPrivate::moreBars() { vu.left().count( vu.left().count()+10 ); vu.right().count( vu.right().count()+10 ); }
 void ArtsControlAppletPrivate::lessBars() { vu.left().count( vu.left().count()-10 ); vu.right().count( vu.right().count()-10 ); }
 
-void ArtsControlAppletPrivate::styleNormalBars() { vu.left().style( Arts::lmNormalBars ); vu.right().style( Arts::lmNormalBars ); _parent->supdatetqlayout(); }
-void ArtsControlAppletPrivate::styleFireBars()   { vu.left().style( Arts::lmFireBars   ); vu.right().style( Arts::lmFireBars   ); _parent->supdatetqlayout(); }
-void ArtsControlAppletPrivate::styleLineBars()   { vu.left().style( Arts::lmLineBars   ); vu.right().style( Arts::lmLineBars   ); _parent->supdatetqlayout(); }
-void ArtsControlAppletPrivate::styleLEDs()       { vu.left().style( Arts::lmLEDs       ); vu.right().style( Arts::lmLEDs       ); _parent->supdatetqlayout(); }
-void ArtsControlAppletPrivate::styleAnalog()     { vu.left().style( Arts::lmAnalog     ); vu.right().style( Arts::lmAnalog     ); _parent->supdatetqlayout(); }
-void ArtsControlAppletPrivate::styleSmall()      { vu.left().style( Arts::lmSmall      ); vu.right().style( Arts::lmSmall      ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleNormalBars() { vu.left().style( Arts::lmNormalBars ); vu.right().style( Arts::lmNormalBars ); _parent->supdatelayout(); }
+void ArtsControlAppletPrivate::styleFireBars()   { vu.left().style( Arts::lmFireBars   ); vu.right().style( Arts::lmFireBars   ); _parent->supdatelayout(); }
+void ArtsControlAppletPrivate::styleLineBars()   { vu.left().style( Arts::lmLineBars   ); vu.right().style( Arts::lmLineBars   ); _parent->supdatelayout(); }
+void ArtsControlAppletPrivate::styleLEDs()       { vu.left().style( Arts::lmLEDs       ); vu.right().style( Arts::lmLEDs       ); _parent->supdatelayout(); }
+void ArtsControlAppletPrivate::styleAnalog()     { vu.left().style( Arts::lmAnalog     ); vu.right().style( Arts::lmAnalog     ); _parent->supdatelayout(); }
+void ArtsControlAppletPrivate::styleSmall()      { vu.left().style( Arts::lmSmall      ); vu.right().style( Arts::lmSmall      ); _parent->supdatelayout(); }
 
 // vim: sw=4 ts=4
 #include "artscontrolapplet.moc"
diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h
index e1722ebf..21a50b3e 100644
--- a/arts/tools/artscontrolapplet.h
+++ b/arts/tools/artscontrolapplet.h
@@ -120,7 +120,7 @@ protected:
 	void positionChange( Position );
 
 public slots:
-	void supdatetqlayout() { emit updateLayout(); }
+	void supdatelayout() { emit updateLayout(); }
 
 protected slots:
 	void resetLayout();
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index da6c1824..2ca75a79 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -52,7 +52,7 @@ private:
 	ArtsControlApplet *_parent;
 	ArtsActions* _artsactions;
 public:
-	TQBoxLayout *tqlayout;
+	TQBoxLayout *layout;
 	KArtsServer *arts;
 	KArtsDispatcher *dispatcher;
 	Arts::StereoVolumeControl volume;
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index 439ab191..eff4f6f9 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -72,13 +72,13 @@ void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget)
 }
 #endif
 
-void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*tqlayout*/)
+void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
 {
 /************************************************************************
  * From Gui_INSTRUMENT_MAPPER:
  *
  * 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
+ * widget (with own layout etc.) is a good idea (there may not even be
  * a singe call to setParent, because there is no parent).
  *
  * But the "how to write aRts widgets"-stuff will need some experiments,
@@ -90,8 +90,8 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*tqlayout*/)
  * else would be appropriate. Check that. FIXME
  ************************************************************************/
 
-	TQVBoxLayout *maintqlayout = new TQVBoxLayout(parent);
-	/*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/
+	TQVBoxLayout *mainlayout = new TQVBoxLayout(parent);
+	/*TQHBoxLayout *contentslayout = new TQHBoxLayout;*/
 
 // list
 
@@ -106,10 +106,10 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*tqlayout*/)
 	TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy,
 								TQT_SLOT(edit(TQListViewItem *)));
 
-	maintqlayout->addWidget(listview);
+	mainlayout->addWidget(listview);
 
-	maintqlayout->activate();
-	//maintqlayout->freeze();
+	mainlayout->activate();
+	//mainlayout->freeze();
 	ParentWidget = parent;
 }
 
diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h
index 6f86778e..39ac8362 100644
--- a/arts/tools/audiomanager.h
+++ b/arts/tools/audiomanager.h
@@ -51,7 +51,7 @@ public:
 	Gui_AUDIO_MANAGER( TQWidget* =0, const char* =0 );
 	~Gui_AUDIO_MANAGER();
 
-	void setParent(TQWidget *Parent,TQBoxLayout *tqlayout);
+	void setParent(TQWidget *Parent,TQBoxLayout *layout);
 
 	void edit(TQListViewItem *item);
 public slots:
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index b23c1f8c..45b4eead 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -48,11 +48,11 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 {
 	setCaption(i18n("Choose Bus"));
 
-	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
 
 // caption label: "Synthesis running..."
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	TQLabel *captionlabel = new TQLabel(this);
 	TQFont labelfont(captionlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
@@ -60,15 +60,15 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 	captionlabel->setText(TQString(" ")+i18n("Available busses:")+TQString(" "));
 	captionlabel->setAlignment(AlignCenter);
 	min_size(captionlabel);
-	maintqlayout->addWidget(captionlabel);
+	mainlayout->addWidget(captionlabel);
 
 // hruler
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	maintqlayout->addWidget(ruler2);
+	mainlayout->addWidget(ruler2);
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 
 // listwidget
 
@@ -89,41 +89,41 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 	if( listbox->count() > 0 )
 		listbox->setCurrentItem( 0 );
 
-	maintqlayout->addWidget(listbox);
+	mainlayout->addWidget(listbox);
 
 // hruler
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	maintqlayout->addWidget(ruler);
-	maintqlayout->addSpacing(5);
+	mainlayout->addWidget(ruler);
+	mainlayout->addSpacing(5);
 
 // new bus lineedit
 
-	TQBoxLayout * tqlayout2 = new TQHBoxLayout( maintqlayout );
-	//maintqlayout->addLayout( tqlayout2 );
+	TQBoxLayout * layout2 = new TQHBoxLayout( mainlayout );
+	//mainlayout->addLayout( layout2 );
 	TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this );
-	tqlayout2->addWidget( newbuslabel );
+	layout2->addWidget( newbuslabel );
 	lineedit = new KLineEdit( this );
 	connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) );
-	tqlayout2->addWidget( lineedit );
+	layout2->addWidget( lineedit );
 
 // hruler
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	KSeparator *ruler3 = new KSeparator( KSeparator::HLine, this);
-	maintqlayout->addWidget(ruler3);
+	mainlayout->addWidget(ruler3);
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 
 // buttons
 
-	maintqlayout->addSpacing(5);
-	TQHBoxLayout *buttontqlayout = new TQHBoxLayout( maintqlayout );
-	//maintqlayout->addLayout(buttontqlayout);
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout( mainlayout );
+	//mainlayout->addLayout(buttonlayout);
+	mainlayout->addSpacing(5);
 
-	buttontqlayout->addSpacing(5);
+	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
 	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -136,12 +136,12 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 	TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
 	connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
 
-	bbox->tqlayout();
+	bbox->layout();
 
-	buttontqlayout->addWidget(bbox);
-	buttontqlayout->addSpacing(5);
+	buttonlayout->addWidget(bbox);
+	buttonlayout->addSpacing(5);
 
-	maintqlayout->freeze();
+	mainlayout->freeze();
 }
 
 TQString ChooseBusDlg::result()
diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp
index 3c2f0fc5..1d0b080c 100644
--- a/arts/tools/levelmeters.cpp
+++ b/arts/tools/levelmeters.cpp
@@ -112,13 +112,13 @@ void PeakBar::setValue(float f) {
 PeakLevelMeters::PeakLevelMeters(TQWidget *parent):
 	StereoLevelMeter(parent), left(this), right(this), scaleView(this)
 {
-	TQBoxLayout *tqlayout= new TQHBoxLayout(this);
-	tqlayout->addWidget(&left);
-	//	tqlayout->setStretchFactor(&left, 0);
-	tqlayout->addWidget(&right);
-	//	tqlayout->setStretchFactor(&right, 0);
-	tqlayout->addWidget(&scaleView);
-	//	tqlayout->setStretchFactor(&scaleView, 0);
+	TQBoxLayout *layout= new TQHBoxLayout(this);
+	layout->addWidget(&left);
+	//	layout->setStretchFactor(&left, 0);
+	layout->addWidget(&right);
+	//	layout->setStretchFactor(&right, 0);
+	layout->addWidget(&scaleView);
+	//	layout->setStretchFactor(&scaleView, 0);
 	left.setLineWidth(2);
 	right.setLineWidth(2);
 	scaleView.setScaleMargins(right.frameWidth());
@@ -226,9 +226,9 @@ void LedMeter::setValue(float f)
 StereoLedMeters::StereoLedMeters(TQWidget *parent)
 	: StereoLevelMeter(parent), left(this), right(this)
 {
-	TQBoxLayout *tqlayout= new TQHBoxLayout(this);
-	tqlayout->addWidget(&left);
-	tqlayout->addWidget(&right);
+	TQBoxLayout *layout= new TQHBoxLayout(this);
+	layout->addWidget(&left);
+	layout->addWidget(&right);
 }
 	
 void StereoLedMeters::setValues(float leftVal, float rightVal) {
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index d2f108ba..96b7ff44 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -66,11 +66,11 @@ static TQStringList listFiles(TQString directory, TQString extension)
 MidiInstDlg::MidiInstDlg(TQWidget *parent)
 	:TQDialog(parent,"instrument",TRUE)
 {
-	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
 
 // caption label: title
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	TQLabel *captionlabel = new TQLabel(this);
 	TQFont labelfont(captionlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
@@ -78,14 +78,14 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
 	captionlabel->setText(TQString(" ")+i18n("Instrument")+TQString(" "));
 	captionlabel->setAlignment(AlignCenter);
 	//min_size(captionlabel);
-	maintqlayout->addWidget(captionlabel);
+	mainlayout->addWidget(captionlabel);
 
 // hruler
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	maintqlayout->addWidget(ruler2);
-	maintqlayout->addSpacing(5);
+	mainlayout->addWidget(ruler2);
+	mainlayout->addSpacing(5);
 
 // combobox
 
@@ -116,23 +116,23 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
             //kdDebug() << "inserted map: " << modname.mid(prefix.length()) << endl;
     }
 
-	maintqlayout->addWidget(box);
+	mainlayout->addWidget(box);
 
 // hruler
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	maintqlayout->addWidget(ruler);
-	maintqlayout->addSpacing(5);
+	mainlayout->addWidget(ruler);
+	mainlayout->addSpacing(5);
 
 // buttons
 
-	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
-	maintqlayout->addSpacing(5);
-	maintqlayout->addLayout(buttontqlayout);
-	maintqlayout->addSpacing(5);
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
+	mainlayout->addSpacing(5);
+	mainlayout->addLayout(buttonlayout);
+	mainlayout->addSpacing(5);
 
-	buttontqlayout->addSpacing(5);
+	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
 	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -141,12 +141,12 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
 	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
 
-	bbox->tqlayout();
+	bbox->layout();
 
-	buttontqlayout->addWidget(bbox);
-	buttontqlayout->addSpacing(5);
+	buttonlayout->addWidget(bbox);
+	buttonlayout->addSpacing(5);
 
-	maintqlayout->freeze();
+	mainlayout->freeze();
 }
 
 TQCString MidiInstDlg::filename()
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 411df674..4b5678c1 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -34,11 +34,11 @@
 
 MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,TRUE)
 {
-	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
 
 // caption label: title
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	TQLabel *captionlabel = new TQLabel(this);
 	TQFont labelfont(captionlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
@@ -46,14 +46,14 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
 	captionlabel->setText(i18n("OSS MIDI Port"));
 	captionlabel->setAlignment(AlignCenter);
 	//min_size(captionlabel);
-	maintqlayout->addWidget(captionlabel);
+	mainlayout->addWidget(captionlabel);
 
 // hruler
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	maintqlayout->addWidget(ruler2);
-	maintqlayout->addSpacing(5);
+	mainlayout->addWidget(ruler2);
+	mainlayout->addSpacing(5);
 
 // editwidget
 
@@ -61,23 +61,23 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
 	edit->setText(oldname);
 	//min_size(edit);
 
-	maintqlayout->addWidget(edit);
+	mainlayout->addWidget(edit);
 
 // hruler
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	maintqlayout->addWidget(ruler);
-	maintqlayout->addSpacing(5);
+	mainlayout->addWidget(ruler);
+	mainlayout->addSpacing(5);
 
 // buttons
 
-	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
-	maintqlayout->addSpacing(5);
-	maintqlayout->addLayout(buttontqlayout);
-	maintqlayout->addSpacing(5);
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
+	mainlayout->addSpacing(5);
+	mainlayout->addLayout(buttonlayout);
+	mainlayout->addSpacing(5);
 
-	buttontqlayout->addSpacing(5);
+	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
 	TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -90,12 +90,12 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
 	okbutton->setAutoDefault( true );
 	okbutton->setDefault( true );
 
-	bbox->tqlayout();
+	bbox->layout();
 
-	buttontqlayout->addWidget(bbox);
-	buttontqlayout->addSpacing(5);
+	buttonlayout->addWidget(bbox);
+	buttonlayout->addSpacing(5);
 
-	maintqlayout->freeze();
+	mainlayout->freeze();
 }
 
 const char *MidiPortDlg::device()