Rename a number of old tq methods that are no longer tq specific

20 files changed, 78 insertions, 78 deletions

diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl
index c88dd3f1..a9a3950a 100644
--- a/arts/gui/common/artsgui.idl
+++ b/arts/gui/common/artsgui.idl
@@ -89,7 +89,7 @@ module Arts {
 		attribute long midlinewidth;
 
 		attribute long framestyle;
-		attribute Shape frametqshape;
+		attribute Shape frameshape;
 		attribute Shadow frameshadow;
 	};
 
@@ -126,7 +126,7 @@ module Arts {
 	interface LayoutBox : Frame {
 		/// Sets the direction of the widgets. Can be changed on-the-fly.
 		attribute Direction direction;
-		/// Adds a widget with the stretch-factor and the tqalignment.
+		/// Adds a widget with the stretch-factor and the alignment.
 		void addWidget( Widget widget, long stretch, long align );
 		void addWidget( Widget widget, long stretch );
 		void addWidget( Widget widget );
@@ -256,7 +256,7 @@ module Arts {
 	interface Label : Frame {
 		/// The text to show.
 		attribute string text;
-		/// The tqalignment of the text. See enum Align
+		/// The alignment of the text. See enum Align
 		attribute long align;
 		/// Fontsize [pixel]
 		/*writeonly*/ attribute long fontsize;
diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp
index 763239f7..35c18df5 100644
--- a/arts/gui/kde/kartswidget.cpp
+++ b/arts/gui/kde/kartswidget.cpp
@@ -24,25 +24,25 @@
 #include "kartswidget.h"
 #include "kwidgetrepo.h"
 #include "debug.h"
-#include "tqlayout.h"
+#include "layout.h"
 
 class KArtsWidgetPrivate {
 public:
-	TQHBoxLayout *tqlayout;
+	TQHBoxLayout *layout;
 };
 
 KArtsWidget::KArtsWidget( TQWidget* parent, const char* name )
 	:TQWidget( parent, name ), _content( Arts::Widget::null() )
 {
 	d = new KArtsWidgetPrivate;
-	d->tqlayout = new TQHBoxLayout(this);
+	d->layout = new TQHBoxLayout(this);
 }
 
 KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name )
 	:TQWidget( parent, name ), _content( Arts::Widget::null())
 {
 	d = new KArtsWidgetPrivate;
-	d->tqlayout = new TQHBoxLayout(this);
+	d->layout = new TQHBoxLayout(this);
 	setContent(content);
 }
 
@@ -50,7 +50,7 @@ KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* na
 	:TQWidget( parent, name, wflags ), _content( Arts::Widget::null() )
 {
 	d = new KArtsWidgetPrivate;
-	d->tqlayout = new TQHBoxLayout( this );
+	d->layout = new TQHBoxLayout( this );
 	setContent( content );
 }
 
@@ -58,7 +58,7 @@ KArtsWidget::KArtsWidget(TQWidget* parent, const char* name, WFlags wflags )
 	:TQWidget(parent, name, wflags ), _content(Arts::Widget::null())
 {
 	d = new KArtsWidgetPrivate;
-	d->tqlayout = new TQHBoxLayout(this);
+	d->layout = new TQHBoxLayout(this);
 }
 
 KArtsWidget::~KArtsWidget()
@@ -80,7 +80,7 @@ void KArtsWidget::setContent(Arts::Widget content)
 
 	_content = content;
 	contentAsWidget->reparent(this,TQPoint(0,0),content.visible());
-	d->tqlayout->addWidget(contentAsWidget);
+	d->layout->addWidget(contentAsWidget);
 }
 
 Arts::Widget KArtsWidget::content()
diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h
index 8b1b85f4..d33efa15 100644
--- a/arts/gui/kde/kartswidget.h
+++ b/arts/gui/kde/kartswidget.h
@@ -32,12 +32,12 @@ class KArtsWidgetPrivate;
 /**
  * KArtsWidget provides a simple way to treat Arts::Widget classes like
  * native TQt widgets. Suppose you use TQt, and want to put an Arts::Widget
- * type into a tqlayout, you can do so using this code
+ * type into a layout, you can do so using this code
  *
  * <pre>
  *    Arts::Widget widget = ...get widget from somewhere...;
  *    KArtsWidget *w = new KArtsWidget(widget, this);
- *    tqlayout->addWidget(w);
+ *    layout->addWidget(w);
  * </pre>
  *
  * In line 2 of the code, the "this" is the parent widget (which is usually
diff --git a/arts/gui/kde/kframe_impl.cpp b/arts/gui/kde/kframe_impl.cpp
index 478d8ec4..d95da549 100644
--- a/arts/gui/kde/kframe_impl.cpp
+++ b/arts/gui/kde/kframe_impl.cpp
@@ -73,12 +73,12 @@ void KFrame_impl::framestyle( long fs )
 	_qframe->setFrameStyle( fs );
 }
 
-Shape KFrame_impl::frametqshape()
+Shape KFrame_impl::frameshape()
 {
 	return ( Shape )_qframe->frameShape();
 }
 
-void KFrame_impl::frametqshape( Shape fs )
+void KFrame_impl::frameshape( Shape fs )
 {
 	_qframe->setFrameShape( ( TQFrame::Shape )fs );
 }
diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h
index a5638f98..656b9aa1 100644
--- a/arts/gui/kde/kframe_impl.h
+++ b/arts/gui/kde/kframe_impl.h
@@ -44,8 +44,8 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
 		void midlinewidth( long mlw );
 		long framestyle();
 		void framestyle( long fs );
-		Shape frametqshape();
-		void frametqshape( Shape fs );
+		Shape frameshape();
+		void frameshape( Shape fs );
 		Shadow frameshadow();
 		void frameshadow( Shadow fs );
 }; //class
diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp
index 1278ba21..1218e9a0 100644
--- a/arts/gui/kde/kgraph.cpp
+++ b/arts/gui/kde/kgraph.cpp
@@ -52,7 +52,7 @@ void KGraph::addLine(Arts::KGraphLine_impl *line)
 
 void KGraph::redrawLine(Arts::KGraphLine_impl * /*line*/)
 {
-	tqrepaint();
+	repaint();
 }
 
 void KGraph::removeLine(Arts::KGraphLine_impl *line)
diff --git a/arts/gui/kde/klabel_impl.cpp b/arts/gui/kde/klabel_impl.cpp
index e6a008c4..dd0a9557 100644
--- a/arts/gui/kde/klabel_impl.cpp
+++ b/arts/gui/kde/klabel_impl.cpp
@@ -92,13 +92,13 @@ void RotateLabel::title( TQString n ) {
 
 void RotateLabel::align( long n ) {
 	_align=n;
-	tqrepaint();
+	repaint();
 }
 
 void RotateLabel::bottom( Arts::TextBottom bottom ) {
 	_bottom = bottom;
 	title( _title );
-	tqrepaint();
+	repaint();
 }
 
 // vim: sw=4 ts=4
diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp
index 9aeee822..1e745c50 100644
--- a/arts/gui/kde/klayoutbox_impl.cpp
+++ b/arts/gui/kde/klayoutbox_impl.cpp
@@ -21,7 +21,7 @@
 #include "klayoutbox_impl.h"
 
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kdebug.h>
 #include <tqpainter.h>
 #include <tqstyle.h>
@@ -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_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp
index 5589b772..9a78804c 100644
--- a/arts/gui/kde/klevelmeter_firebars.cpp
+++ b/arts/gui/kde/klevelmeter_firebars.cpp
@@ -91,7 +91,7 @@ void KLevelMeter_FireBars::invalue( float n, float p ) {
 			_bar->setGeometry( int( this->width()-_value*this->width() ), 0, this->width(), this->height() );
 			break;
 	}
-	tqrepaint();
+	repaint();
 }
 
 void KLevelMeter_FireBars::paintEvent( TQPaintEvent* ) {
diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp
index 418108ad..05b6492f 100644
--- a/arts/gui/kde/klevelmeter_impl.cpp
+++ b/arts/gui/kde/klevelmeter_impl.cpp
@@ -25,7 +25,7 @@
 
 #include <tqframe.h>
 #include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kartswidget.h>
 
 #include "klevelmeter_private.h"
diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp
index 37dfe4d3..fc2a1293 100644
--- a/arts/gui/kde/klevelmeter_linebars.cpp
+++ b/arts/gui/kde/klevelmeter_linebars.cpp
@@ -31,14 +31,14 @@ 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 );
 }
 
 void KLevelMeter_LineBars::invalue( float n, float p ) {
 	_value = amptondb( n );
 	_peak  = amptondb( p );
-	tqrepaint();
+	repaint();
 }
 
 void KLevelMeter_LineBars::substyle( long n ) {
diff --git a/arts/gui/kde/klevelmeter_normalbars.cpp b/arts/gui/kde/klevelmeter_normalbars.cpp
index 29593551..72a831fb 100644
--- a/arts/gui/kde/klevelmeter_normalbars.cpp
+++ b/arts/gui/kde/klevelmeter_normalbars.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* impl, TQWidget* parent, long substyle, long count, Arts::Direction dir, float _dbmin, float _dbmax ) : KLevelMeter_Template( impl, parent, substyle, count, dir, _dbmin, _dbmax ) {
 //kdDebug()<<"KLevelMeter_NormalBars::KLevelMeter_NormalBars( Arts::KLevelMeter_impl* "<<impl<<", TQWidget* "<<parent<<", long "<<substyle<<", long "<<count<<", float "<<_dbmin<<", float "<<_dbmax<<" )"<<endl;
diff --git a/arts/gui/kde/kpopupbox_impl.cpp b/arts/gui/kde/kpopupbox_impl.cpp
index e685b1ae..8e90451c 100644
--- a/arts/gui/kde/kpopupbox_impl.cpp
+++ b/arts/gui/kde/kpopupbox_impl.cpp
@@ -22,7 +22,7 @@
 #include "kpopupbox_impl.h"
 #include "kpopupbox_private.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace Arts;
 
@@ -60,8 +60,8 @@ KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFra
 	this->setMargin( 1 ); this->setLineWidth( 1 );
 
 	_titlebar = new TQFrame( this );
-	_titlebartqlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop );
-	_titlebartqlayout->setAutoAdd( true );
+	_titlebarlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop );
+	_titlebarlayout->setAutoAdd( true );
 
 	_showbutton = new ShowButton( _titlebar );
 	connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) );
@@ -90,13 +90,13 @@ void KPopupBox_widget::direction( Arts::Direction n ) {
 	switch( n ) {
 		case LeftToRight:
 		case RightToLeft:
-			_titlebartqlayout->setDirection( TQBoxLayout::BottomToTop );
+			_titlebarlayout->setDirection( TQBoxLayout::BottomToTop );
 			_drag->setMinimumHeight( 30 );
 			_drag->setMinimumWidth( 0 );
 			break;
 		case TopToBottom:
 		case BottomToTop:
-			_titlebartqlayout->setDirection( TQBoxLayout::RightToLeft );
+			_titlebarlayout->setDirection( TQBoxLayout::RightToLeft );
 			_drag->setMinimumHeight( 0 );
 			_drag->setMinimumWidth( 30 );
 	}
diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h
index b9b38e7f..f702f4db 100644
--- a/arts/gui/kde/kpopupbox_private.h
+++ b/arts/gui/kde/kpopupbox_private.h
@@ -54,7 +54,7 @@ private:
 	TQBoxLayout *_layout;
 
 	TQFrame *_titlebar;
-	TQBoxLayout *_titlebartqlayout;
+	TQBoxLayout *_titlebarlayout;
 	HandleDrag *_drag;
 	ShowButton *_showbutton;
 	OwnButton *_ownbutton;
@@ -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();
@@ -107,7 +107,7 @@ static const char* const inside_xpm[] = { "5 5 2 1", "# c black", ". c None", "#
 static const char* const own_xpm[]    = { "5 5 2 1", "# c black", ". c None", "###..", "#.###", "###.#", ".#..#", ".####"};
 
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 class ShowButton : public TQPushButton {
    Q_OBJECT
@@ -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..d436be9a 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();
 }
 
@@ -392,7 +392,7 @@ void KPoti::setColor( const TQColor &c )
 {
 	d->potiColor = c;
 	d->potiDirty = true;
-	tqrepaint();
+	repaint();
 }
 
 
@@ -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()