Rename old tq methods that no longer need a unique name

27 files changed, 92 insertions, 92 deletions

diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index 790691e8..e5b6cd89 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -41,7 +41,7 @@
 
 #ifndef KDE_USE_FINAL
 static void min_size(TQWidget *w) {
-  w->setMinimumSize(w->tqsizeHint());
+  w->setMinimumSize(w->sizeHint());
 }
 #endif
 
@@ -63,7 +63,7 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(TQString(" ")+i18n("Synthesis running...")+TQString(" "));
-	captionlabel->tqsetAlignment(AlignCenter);
+	captionlabel->setAlignment(AlignCenter);
 	min_size(captionlabel);
 	maintqlayout->addWidget(captionlabel);
 
@@ -151,7 +151,7 @@ void ExecDlg::updateCpuUsage()
 #if 0 /* TODO:PORT */
 	char cpuusage[100];
 
-	ArtsCorba::tqStatus s = Synthesizer->gettqStatus();
+	ArtsCorba::Status s = Synthesizer->getStatus();
 	if(s.halted)
 	{
 		cpuusagetimer->stop();
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 3b4d455a..dd85fc80 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -56,7 +56,7 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	objectlabel->setFont(labelfont);
 	objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" "));
-	objectlabel->tqsetAlignment(AlignCenter);
+	objectlabel->setAlignment(AlignCenter);
 	min_size(objectlabel);
 	maintqlayout->addWidget(objectlabel);
 */
@@ -70,10 +70,10 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 	portlabel->setFont(labelfont);
 	portlabel->setText(i18n("Port description: ")+ port->description);
 	min_size(portlabel);
-	portlabel->tqsetAlignment(AlignCenter);
+	portlabel->setAlignment(AlignCenter);
 	maintqlayout->addWidget(portlabel);
 
-	int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width());
+	int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width());
 
 	portlabel->setMinimumWidth(labelwidth);
 	objectlabel->setMinimumWidth(labelwidth);
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 63f2546c..69e8ac86 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -57,7 +57,7 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	objectlabel->setFont(labelfont);
 	objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" "));
-	objectlabel->tqsetAlignment(AlignCenter);
+	objectlabel->setAlignment(AlignCenter);
 	min_size(objectlabel);
 	maintqlayout->addWidget(objectlabel);
 */
@@ -71,10 +71,10 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
 	portlabel->setFont(labelfont);
 	portlabel->setText(i18n("Port description: ")+ port->description);
 	min_size(portlabel);
-	portlabel->tqsetAlignment(AlignCenter);
+	portlabel->setAlignment(AlignCenter);
 	maintqlayout->addWidget(portlabel);
 
-	int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width());
+	int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width());
 
 	portlabel->setMinimumWidth(labelwidth);
 	objectlabel->setMinimumWidth(labelwidth);
diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp
index df76588a..98e40de1 100644
--- a/arts/builder/propertypanel.cpp
+++ b/arts/builder/propertypanel.cpp
@@ -115,7 +115,7 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component )
 		if(component->pixmap())
 		{
 			moduleIconLabel->setPixmap( *component->pixmap() );
-			moduleIconLabel->setMinimumSize( moduleIconLabel->tqsizeHint() );
+			moduleIconLabel->setMinimumSize( moduleIconLabel->sizeHint() );
 			moduleIconLabel->show();
 		}
 		else
@@ -132,7 +132,7 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component )
 										i18n("OUTPUT") : i18n("INPUT") );
 			portCombo->insertItem( portTitle );
 		}
-		//portCombo->setMinimumSize( portCombo->tqsizeHint() );
+		//portCombo->setMinimumSize( portCombo->sizeHint() );
 		setEnabled(true);
 	}
 }
diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp
index f8716b44..d08deab2 100644
--- a/arts/builder/qttableview.cpp
+++ b/arts/builder/qttableview.cpp
@@ -34,8 +34,8 @@ enum ScrollBarDirtyFlags {
 };
 
 
-#define HSBEXT horizontalScrollBar()->tqsizeHint().height()
-#define VSBEXT verticalScrollBar()->tqsizeHint().width()
+#define HSBEXT horizontalScrollBar()->sizeHint().height()
+#define VSBEXT verticalScrollBar()->sizeHint().width()
 
 
 class TQCornerSquare : public TQWidget		// internal class
@@ -1385,7 +1385,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
     // outside the cells.
 
     TQRect viewR = viewRect();
-    const TQColorGroup g = tqcolorGroup();
+    const TQColorGroup g = colorGroup();
 
     if ( xPos <= maxX ) {
 	TQRect r = viewR;
@@ -1443,7 +1443,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const
 #ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
-        sb->resize( sb->tqsizeHint() ); // height is irrelevant
+        sb->resize( sb->sizeHint() ); // height is irrelevant
 	Q_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
 	sb->setFocusPolicy( TQ_NoFocus );
@@ -1474,7 +1474,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
 #ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
-	sb->resize( sb->tqsizeHint() ); // width is irrelevant
+	sb->resize( sb->sizeHint() ); // width is irrelevant
 	sb->setFocusPolicy( TQ_NoFocus );
 	Q_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index 5b738471..cedd5940 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -37,7 +37,7 @@
 #include <tqpushbutton.h>
 
 static void min_size(TQWidget *w) {
-  w->setMinimumSize(w->tqsizeHint());
+  w->setMinimumSize(w->sizeHint());
 }
 
 RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
@@ -54,7 +54,7 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(TQString(" ")+i18n("Published structures")+TQString(" "));
-	captionlabel->tqsetAlignment(AlignCenter);
+	captionlabel->setAlignment(AlignCenter);
 	min_size(captionlabel);
 	maintqlayout->addWidget(captionlabel);
 
diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp
index 9aeee822..5ee56635 100644
--- a/arts/gui/kde/klayoutbox_impl.cpp
+++ b/arts/gui/kde/klayoutbox_impl.cpp
@@ -85,11 +85,11 @@ void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) {
 	TQPainter p( this );
 	TQStyle::SFlags flags = TQStyle::Style_Default;
 	if ( width() < height() ) flags |= TQStyle::Style_Horizontal;
-	tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), flags );
+	tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags );
 }
 
-TQSize KLayoutBox_Separator::tqminimumSizeHint() const {
-	int wh = tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth, this );
+TQSize KLayoutBox_Separator::minimumSizeHint() const {
+	int wh = tqstyle().pixelMetric( TQStyle::PM_SplitterWidth, this );
 	return TQSize( wh, wh );
 }
 
@@ -105,12 +105,12 @@ KLayoutBox_Line::KLayoutBox_Line( int width, int space, TQWidget* p, const char*
 void KLayoutBox_Line::paintEvent( TQPaintEvent* ) {
 //kdDebug() << k_funcinfo << size() << endl;
 	TQPainter p( this );
-	p.setPen( TQPen( tqcolorGroup().foreground(), _width ) );
+	p.setPen( TQPen( colorGroup().foreground(), _width ) );
 	if ( width() > height() ) p.drawLine( 0, height()/2, width(), height()/2 );
 		else p.drawLine( width()/2, 0, width()/2, height() );
 }
 
-TQSize KLayoutBox_Line::tqminimumSizeHint() const {
+TQSize KLayoutBox_Line::minimumSizeHint() const {
 //kdDebug() << k_funcinfo << size() << endl;
 	int wh = _width + 2* _space;
 	return TQSize( wh, wh );
diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h
index 38cca947..eee3b781 100644
--- a/arts/gui/kde/klayoutbox_impl.h
+++ b/arts/gui/kde/klayoutbox_impl.h
@@ -85,7 +85,7 @@ public:
 	KLayoutBox_Separator( TQWidget*, const char* =0 );
 	void resizeEvent( TQResizeEvent* );
 	void paintEvent( TQPaintEvent* );
-	TQSize tqminimumSizeHint() const;
+	TQSize minimumSizeHint() const;
 };
 
 class KLayoutBox_Line : public TQWidget {
@@ -96,7 +96,7 @@ private:
 public:
 	KLayoutBox_Line( int, int, TQWidget*, const char* =0 );
 	void paintEvent( TQPaintEvent* );
-	TQSize tqminimumSizeHint() const;
+	TQSize minimumSizeHint() const;
 };
 
 #endif
diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp
index 37dfe4d3..cdbb819d 100644
--- a/arts/gui/kde/klevelmeter_linebars.cpp
+++ b/arts/gui/kde/klevelmeter_linebars.cpp
@@ -31,7 +31,7 @@ KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidg
 //kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", Arts::Direction "<<dir<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
 	this->setMinimumSize( 5, 5 );
 	this->substyle( substyle );
-	_stdcolors = tqcolorGroup();
+	_stdcolors = colorGroup();
 	setBackgroundMode( TQt::NoBackground );
 }
 
diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h
index b9b38e7f..07fb221c 100644
--- a/arts/gui/kde/kpopupbox_private.h
+++ b/arts/gui/kde/kpopupbox_private.h
@@ -88,7 +88,7 @@ public:
 		TQPainter p( this );
 		TQStyle::SFlags flags = TQStyle::Style_Default;
 		if( width() < height() ) flags |= TQStyle::Style_Horizontal;
-		tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), tqcolorGroup(), flags );
+		tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags );
 	}
 signals:
 	void clicked();
@@ -151,17 +151,17 @@ public slots:
 		}
 	}
 public:
-	TQSize tqminimumSizeHint() const {
-		int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+	TQSize minimumSizeHint() const {
+		int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
 		return TQSize( wh, wh );
 	}
 	TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); }
-	TQSize tqminimumSize() const { return tqminimumSizeHint(); }
-	TQSize tqsizeHint() const { return tqminimumSize(); }
+	TQSize minimumSize() const { return minimumSizeHint(); }
+	TQSize sizeHint() const { return minimumSize(); }
 
 	void drawButton(  TQPainter * p )
 	{
-		p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
+		p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
 		p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() );
 	}
 };
@@ -187,17 +187,17 @@ public slots:
 			else setPixmap(  _pmown );
 	}
 public:
-	TQSize tqminimumSizeHint() const {
-		int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+	TQSize minimumSizeHint() const {
+		int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
 		return TQSize( wh, wh );
 	}
 	TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); }
-	TQSize tqminimumSize() const { return tqminimumSizeHint(); }
-	TQSize tqsizeHint() const { return tqminimumSize(); }
+	TQSize minimumSize() const { return minimumSizeHint(); }
+	TQSize sizeHint() const { return minimumSize(); }
 
 	void drawButton( TQPainter * p )
 	{
-		p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
+		p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
 		p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() );
 	}
 };
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index dca86721..b38902d8 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -53,7 +53,7 @@ struct KPoti::KPotiPrivate
 
 	bool bgDirty;
 	KPixmap bgdb;
-	KPixmap bgPixmap( const TQColorGroup & tqcolorGroup )
+	KPixmap bgPixmap( const TQColorGroup & colorGroup )
 	{
 		if( bgDirty || bgdb.isNull() )
 		{
@@ -73,8 +73,8 @@ struct KPoti::KPotiPrivate
 
 			// inset shadow
 			KPixmap gradient( bgdb.size() );
-			KPixmapEffect::gradient( gradient, tqcolorGroup.light(), tqcolorGroup.dark(), KPixmapEffect::DiagonalGradient );
-			dbp.setBrush( TQBrush( tqcolorGroup.button(), gradient ) );
+			KPixmapEffect::gradient( gradient, colorGroup.light(), colorGroup.dark(), KPixmapEffect::DiagonalGradient );
+			dbp.setBrush( TQBrush( colorGroup.button(), gradient ) );
 			dbp.drawEllipse( drawRect );
 
 			potiRect.setSize( drawRect.size() * 0.9 );
@@ -133,12 +133,12 @@ TQSizePolicy KPoti::sizePolicy() const
 	return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
 }
 
-TQSize KPoti::tqsizeHint() const
+TQSize KPoti::sizeHint() const
 {
-	return tqminimumSizeHint();
+	return minimumSizeHint();
 }
 
-TQSize KPoti::tqminimumSizeHint() const
+TQSize KPoti::minimumSizeHint() const
 {
 	int width = 40;
 	int height = 40;
@@ -162,7 +162,7 @@ TQString KPoti::text() const
 void KPoti::setText( const TQString & text )
 {
 	d->label = text;
-	setMinimumSize( tqminimumSizeHint() );
+	setMinimumSize( minimumSizeHint() );
 	updateGeometry();
 }
 
@@ -408,8 +408,8 @@ void KPoti::paintPoti( TQPainter * p )
 		p2.translate( db.rect().center().x(), db.rect().center().y() );
 		p2.rotate( potiPos * 180.0 / PI );
 		TQRect pointer( db.width() / -20, db.width() / -2, db.width() / 10, db.width() / 2 );
-		TQBrush buttonbrush( tqcolorGroup().button() );
-		qDrawShadePanel( &p2, pointer, tqcolorGroup(), true, 1, &buttonbrush );
+		TQBrush buttonbrush( colorGroup().button() );
+		qDrawShadePanel( &p2, pointer, colorGroup(), true, 1, &buttonbrush );
 		p2.end();
 
 		p->drawPixmap( d->potiRect, db );
@@ -440,7 +440,7 @@ void KPoti::reallyMovePoti( float newPos )
 void KPoti::drawContents( TQPainter * p )
 {
 	TQPixmap doublebuffer( contentsRect().size() );
-	doublebuffer.fill( tqcolorGroup().background() );
+	doublebuffer.fill( colorGroup().background() );
 	TQPainter dbp( &doublebuffer );
 	if( m_bLabel )
 	{
@@ -455,10 +455,10 @@ void KPoti::drawContents( TQPainter * p )
     if( ticks )
 		drawTicks( &dbp, buttonRadius, tickLength, interval );
 
-	dbp.drawPixmap( d->buttonRect, d->bgPixmap( tqcolorGroup() ) );
+	dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) );
 
 	if( hasFocus() )
-		tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, tqcolorGroup() );
+		tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() );
 
     paintPoti( &dbp );
 	dbp.end();
@@ -711,7 +711,7 @@ void KPoti::repeatTimeout()
 
 void KPoti::drawTicks( TQPainter *p, double dist, double w, int i ) const
 {
-	p->setPen( tqcolorGroup().foreground() );
+	p->setPen( colorGroup().foreground() );
 	double angle,s,c;
 	double x, y;
 	for (int v=0; v<=i; v++)
diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h
index d9013c8a..52705f8f 100644
--- a/arts/gui/kde/kpoti.h
+++ b/arts/gui/kde/kpoti.h
@@ -53,8 +53,8 @@ public:
     int 	tickInterval() const { return tickInt; }
 
     virtual TQSizePolicy sizePolicy() const;
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
     TQString text() const;
 
 public slots:
diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp
index 4988ad7b..5df8dd00 100644
--- a/arts/gui/kde/ktickmarks_impl.cpp
+++ b/arts/gui/kde/ktickmarks_impl.cpp
@@ -75,8 +75,8 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) {
 	int _minsize;
 	// Shorcuts
 	int w,h;
-	TQColor colornormal = tqcolorGroup().foreground();
-	TQColor colordiff = tqcolorGroup().buttonText();
+	TQColor colornormal = colorGroup().foreground();
+	TQColor colordiff = colorGroup().buttonText();
 
 	if ( _dir == Arts::BottomToTop || _dir == Arts::TopToBottom ) {
 		p->translate( contentsRect().left(), contentsRect().bottom() );
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp
index fca3466e..97ea35a6 100644
--- a/arts/gui/kde/kvolumefader_impl.cpp
+++ b/arts/gui/kde/kvolumefader_impl.cpp
@@ -159,10 +159,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){
 		if ( _dir==Arts::BottomToTop ) h = contentsRect().height() * ( 1 - _value );
 			else h = contentsRect().height() * _value;
 		for ( int i=int( h ); i<contentsRect().height(); i++ ) {
-			p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( i )/contentsRect().height() ) );
+			p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( i )/contentsRect().height() ) );
 			p->drawLine( contentsRect().left(), this->frameWidth() + i, contentsRect().right(), this->frameWidth() + i );
 		}
-		p->setPen( tqcolorGroup().dark() );
+		p->setPen( colorGroup().dark() );
 		p->drawLine( contentsRect().left(), this->frameWidth() + int( h ), contentsRect().right(), this->frameWidth() + int( h ) );
 	} else {
 		float w;
@@ -170,10 +170,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){
 		if ( _dir==Arts::LeftToRight ) w = - contentsRect().width() * ( 1 - _value );
 			else w = - contentsRect().width() * _value;
 		for ( int i=int( w ); i>=-contentsRect().width(); i-- ) {
-			p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( -i )/contentsRect().width() ) );
+			p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( -i )/contentsRect().width() ) );
 			p->drawLine( this->frameWidth() + i, contentsRect().top(), this->frameWidth() + i, contentsRect().bottom() );
 		}
-		p->setPen( tqcolorGroup().dark() );
+		p->setPen( colorGroup().dark() );
 		p->drawLine( this->frameWidth() + int( w ), contentsRect().top(), this->frameWidth() + int( w ), contentsRect().bottom() );
 	}
 }
diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp
index b716f4c3..2a1399f1 100644
--- a/arts/gui/kde/kwidget_impl.cpp
+++ b/arts/gui/kde/kwidget_impl.cpp
@@ -143,26 +143,26 @@ void KWidget_impl::visible(bool newVisible)
 
 SizePolicy KWidget_impl::hSizePolicy()
 {
-	return ( SizePolicy )_qwidget->tqsizePolicy().horData();
+	return ( SizePolicy )_qwidget->sizePolicy().horData();
 }
 
 void KWidget_impl::hSizePolicy( SizePolicy p )
 {
-	TQSizePolicy sp = _qwidget->tqsizePolicy();
+	TQSizePolicy sp = _qwidget->sizePolicy();
 	sp.setHorData( ( TQSizePolicy::SizeType )p );
-	_qwidget->tqsetSizePolicy( sp );
+	_qwidget->setSizePolicy( sp );
 }
 
 SizePolicy KWidget_impl::vSizePolicy()
 {
-	return ( SizePolicy )_qwidget->tqsizePolicy().verData();
+	return ( SizePolicy )_qwidget->sizePolicy().verData();
 }
 
 void KWidget_impl::vSizePolicy( SizePolicy p )
 {
-	TQSizePolicy sp = _qwidget->tqsizePolicy();
+	TQSizePolicy sp = _qwidget->sizePolicy();
 	sp.setVerData( ( TQSizePolicy::SizeType )p );
-	_qwidget->tqsetSizePolicy( sp );
+	_qwidget->setSizePolicy( sp );
 }
 
 void KWidget_impl::show()
diff --git a/arts/midi/artsmidi.idl b/arts/midi/artsmidi.idl
index 82e6e9e4..70157d95 100644
--- a/arts/midi/artsmidi.idl
+++ b/arts/midi/artsmidi.idl
@@ -54,7 +54,7 @@ struct TimeStamp {
 /**
  * different status of a midi command
  */
-enum MidiCommandtqStatus {
+enum MidiCommandStatus {
 // Masks:
 	mcsCommandMask		= 0xf0,
 	mcsChannelMask		= 0x0f,
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index f59bc9ff..8ffe493f 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -93,12 +93,12 @@ kdDebug()<<k_funcinfo<<endl;
 
 int ArtsControlApplet::widthForHeight( int h ) const {
 kdDebug()<<"ArtsControlApplet::widthForHeight( int "<<h<<" )"<<endl;
-	return p->tqlayout->tqsizeHint().width();
+	return p->tqlayout->sizeHint().width();
 }
 
 int ArtsControlApplet::heightForWidth( int w ) const {
 kdDebug()<<"ArtsControlApplet::heightForWidth( int "<<w<<" )"<<endl;
-	return p->tqlayout->tqsizeHint().height();
+	return p->tqlayout->sizeHint().height();
 }
 
 void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) {
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index 3f6417b1..da6c1824 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -63,7 +63,7 @@ public:
 	Arts::StereoVolumeControlGui vu;
 
 	KPopupMenu *menu;
-	KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
+	KAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
 	KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall;
 
 	ArtsControlAppletPrivate( ArtsControlApplet *parent )
@@ -87,8 +87,8 @@ public:
 		_showSVinline->plug( menu );
 		_showAM = _artsactions->actionAudioManager();
 		_showAM->plug( menu );
-		_showArtstqStatus = _artsactions->actionArtsStatusView();
-		_showArtstqStatus->plug( menu );
+		_showArtsStatus = _artsactions->actionArtsStatusView();
+		_showArtsStatus->plug( menu );
 		_showMidiManager = _artsactions->actionMidiManagerView();
 		_showMidiManager->plug( menu );
 		_showEnvironment = _artsactions->actionEnvironmentView();
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index 29a1bb69..b23c1f8c 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -39,7 +39,7 @@
 using namespace std;
 
 static void min_size(TQWidget *w) {
-  w->setMinimumSize(w->tqsizeHint());
+  w->setMinimumSize(w->sizeHint());
 }
 
 ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
@@ -58,7 +58,7 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(TQString(" ")+i18n("Available busses:")+TQString(" "));
-	captionlabel->tqsetAlignment(AlignCenter);
+	captionlabel->setAlignment(AlignCenter);
 	min_size(captionlabel);
 	maintqlayout->addWidget(captionlabel);
 
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index f62a5c06..b6b03a39 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -57,7 +57,7 @@ public:
 		printf("~ItemView()\n");
 	}
 	TQString text() const {
-		return TQString::tqfromLatin1(item._interfaceName().c_str());
+		return TQString::fromLatin1(item._interfaceName().c_str());
 	}
 };
 
diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp
index 08d9099b..93bb0c2a 100644
--- a/arts/tools/levelmeters.cpp
+++ b/arts/tools/levelmeters.cpp
@@ -20,7 +20,7 @@ PeakBar::PeakBar(TQWidget *parent)
 	lastValues.setAutoDelete( TRUE );
 	
 	setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
-	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+	setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
 	setBackgroundMode(NoBackground);
 	setMinimumSize(frameWidth()+7, 70);
 }
@@ -30,7 +30,7 @@ void PeakBar::frameChanged() {
 	TQFrame::frameChanged();
 }
 
-TQSize PeakBar::tqsizeHint() const {
+TQSize PeakBar::sizeHint() const {
 	return TQSize(13, 250);
 }
 
@@ -122,7 +122,7 @@ PeakLevelMeters::PeakLevelMeters(TQWidget *parent):
 	left.setLineWidth(2);
 	right.setLineWidth(2);
 	scaleView.setScaleMargins(right.frameWidth());
-	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+	setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
 
 	setDbRange(36);
 }
@@ -144,7 +144,7 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) {
 
 ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) {
 	font.setPixelSize(10);
-	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
+	setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
 }
 
 void ScaleView::setDbRange(int db) {
@@ -152,7 +152,7 @@ void ScaleView::setDbRange(int db) {
 	tqrepaint();
 }
 
-TQSize ScaleView::tqsizeHint() const {
+TQSize ScaleView::sizeHint() const {
 	return TQSize(TQFontMetrics(font).width("-88")+8, 250);
 }
 
diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h
index 8046d745..5bb867ab 100644
--- a/arts/tools/levelmeters.h
+++ b/arts/tools/levelmeters.h
@@ -94,7 +94,7 @@ protected:
 public:
 	PeakBar(TQWidget *parent);
 	
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 
 	void drawContents(TQPainter *p);
 	virtual void setValue(float f);
@@ -114,7 +114,7 @@ public:
 	ScaleView(TQWidget *parent);
 	void setDbRange(int db);
 	void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; }
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 	void drawContents(TQPainter *p);
 };
 
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 8fe922b7..d2f108ba 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -76,7 +76,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(TQString(" ")+i18n("Instrument")+TQString(" "));
-	captionlabel->tqsetAlignment(AlignCenter);
+	captionlabel->setAlignment(AlignCenter);
 	//min_size(captionlabel);
 	maintqlayout->addWidget(captionlabel);
 
@@ -95,7 +95,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
     TQStringList::Iterator it;
     for ( it = instruments.begin(); it != instruments.end(); it++ ) {
         TQString modname = *it;
-        TQString prefix = TQString::tqfromLatin1("instrument_");
+        TQString prefix = TQString::fromLatin1("instrument_");
         if (modname.length() > 5)
             modname.truncate(modname.length()-5);  // kill .arts extension
         if ( (modname.startsWith(prefix)) && (!modname.contains("_GUI")) )
@@ -108,7 +108,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
 
     for ( it = maps.begin(); it != maps.end(); it++ ) {
         TQString modname = *it;
-        TQString prefix = TQString::tqfromLatin1("instrument_");
+        TQString prefix = TQString::fromLatin1("instrument_");
         if (modname.length() > 9)
             modname.truncate(modname.length()-9);  // kill .arts-map extension
         if (modname.startsWith(prefix))
@@ -157,12 +157,12 @@ TQCString MidiInstDlg::filename()
     TQStringList::Iterator it;
 
     for ( it = artsPath.begin(); it != artsPath.end(); it++ ) {
-        TQString pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts");
+        TQString pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts");
         TQFileInfo fi(pathname);
         if (fi.exists() && fi.isReadable())
             return TQFile::encodeName(pathname);
 
-        pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts-map");
+        pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts-map");
         fi.setFile(pathname);
         if (fi.exists() && fi.isReadable())
             return TQFile::encodeName(pathname);
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index 3f137dea..2a598bbd 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -96,8 +96,8 @@ public:
 					conn != item->info.connections.end(); conn++)
 			{
 				MidiManagerItem *outitem = v->itemMap[*conn];
-				TQRect r1 = v->widget->inputsListBox->tqitemRect(item);
-				TQRect r2 = v->widget->outputsListBox->tqitemRect(outitem);
+				TQRect r1 = v->widget->inputsListBox->itemRect(item);
+				TQRect r2 = v->widget->outputsListBox->itemRect(outitem);
 
 				if(r1.height() > 0 && r2.height() > 0)
 				{
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 1c46d9e5..411df674 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -44,7 +44,7 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(i18n("OSS MIDI Port"));
-	captionlabel->tqsetAlignment(AlignCenter);
+	captionlabel->setAlignment(AlignCenter);
 	//min_size(captionlabel);
 	maintqlayout->addWidget(captionlabel);
 
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index 37d8cbe2..c29cf4ed 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -41,7 +41,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con
 	TQBoxLayout *l= new TQVBoxLayout(this);
 	//l->setAutoAdd(TRUE);
 
-	RealtimetqStatus rs= server.realtimetqStatus();
+	RealtimeStatus rs= server.realtimeStatus();
 	l->addWidget(new TQLabel(rs==rtRealtime?
 							i18n("Artsd is running with realtime scheduling."):
 							rs==rtNoSupport?
@@ -66,7 +66,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con
 	connect(suspendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(suspendButtonClicked()));
 
 	artsPollStatusTimer= new TQTimer(this);
-	connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatetqStatus()));
+	connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus()));
 	artsPollStatusTimer->start(1000);
 	//l->activate();
 	show();
@@ -77,7 +77,7 @@ void ArtsStatusView::suspendButtonClicked()
 	(void)server.suspend(); // TODO: error msg if suspend not possible?
 }
 
-void ArtsStatusView::updatetqStatus()
+void ArtsStatusView::updateStatus()
 {
 	long seconds= server.secondsUntilSuspend();
 	if (seconds<0)
diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h
index 59f757c2..37487588 100644
--- a/arts/tools/statusview.h
+++ b/arts/tools/statusview.h
@@ -40,7 +40,7 @@ public:
 	ArtsStatusView(Arts::SoundServer server, TQWidget* =0, const char* =0 );
 	
 public slots:
-	void updatetqStatus();
+	void updateStatus();
 	void suspendButtonClicked();
 	
 protected: