6 files changed, 19 insertions, 19 deletions

diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp
index 763239f7..faada158 100644
--- a/arts/gui/kde/kartswidget.cpp
+++ b/arts/gui/kde/kartswidget.cpp
@@ -28,21 +28,21 @@
 
 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/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp
index 5ee56635..c14a5478 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(), colorGroup(), flags );
+	style().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags );
 }
 
 TQSize KLayoutBox_Separator::minimumSizeHint() const {
-	int wh = tqstyle().pixelMetric( TQStyle::PM_SplitterWidth, this );
+	int wh = style().pixelMetric( TQStyle::PM_SplitterWidth, this );
 	return TQSize( wh, wh );
 }
 
diff --git a/arts/gui/kde/kpopupbox_impl.cpp b/arts/gui/kde/kpopupbox_impl.cpp
index e685b1ae..23de74fc 100644
--- a/arts/gui/kde/kpopupbox_impl.cpp
+++ b/arts/gui/kde/kpopupbox_impl.cpp
@@ -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 07fb221c..f58aa84d 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(), colorGroup(), flags );
+		style().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags );
 	}
 signals:
 	void clicked();
@@ -152,7 +152,7 @@ public slots:
 	}
 public:
 	TQSize minimumSizeHint() const {
-		int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+		int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
 		return TQSize( wh, wh );
 	}
 	TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); }
@@ -188,7 +188,7 @@ public slots:
 	}
 public:
 	TQSize minimumSizeHint() const {
-		int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+		int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
 		return TQSize( wh, wh );
 	}
 	TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); }
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index d436be9a..32202b39 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -458,7 +458,7 @@ void KPoti::drawContents( TQPainter * p )
 	dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) );
 
 	if( hasFocus() )
-		tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() );
+		style().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() );
 
     paintPoti( &dbp );
 	dbp.end();