TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 16 insertions, 16 deletions

diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp
index dde61820..5188e81a 100644
--- a/arts/gui/kde/kartswidget.cpp
+++ b/arts/gui/kde/kartswidget.cpp
@@ -28,43 +28,43 @@
 
 class KArtsWidgetPrivate {
 public:
-	TQHBoxLayout *layout;
+	TQHBoxLayout *tqlayout;
 };
 
-KArtsWidget::KArtsWidget( TQWidget* parent, const char* name )
-	:TQWidget( parent, name ), _content( Arts::Widget::null() )
+KArtsWidget::KArtsWidget( TQWidget* tqparent, const char* name )
+	:TQWidget( tqparent, name ), _content( Arts::Widget::null() )
 {
 	d = new KArtsWidgetPrivate;
-	d->layout = new TQHBoxLayout(this);
+	d->tqlayout = new TQHBoxLayout(this);
 }
 
-KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name )
-	:TQWidget( parent, name ), _content( Arts::Widget::null())
+KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name )
+	:TQWidget( tqparent, name ), _content( Arts::Widget::null())
 {
 	d = new KArtsWidgetPrivate;
-	d->layout = new TQHBoxLayout(this);
+	d->tqlayout = new TQHBoxLayout(this);
 	setContent(content);
 }
 
-KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name, WFlags wflags )
-	:TQWidget( parent, name, wflags ), _content( Arts::Widget::null() )
+KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* tqparent, const char* name, WFlags wflags )
+	:TQWidget( tqparent, name, wflags ), _content( Arts::Widget::null() )
 {
 	d = new KArtsWidgetPrivate;
-	d->layout = new TQHBoxLayout( this );
+	d->tqlayout = new TQHBoxLayout( this );
 	setContent( content );
 }
 
-KArtsWidget::KArtsWidget(TQWidget* parent, const char* name, WFlags wflags )
-	:TQWidget(parent, name, wflags ), _content(Arts::Widget::null())
+KArtsWidget::KArtsWidget(TQWidget* tqparent, const char* name, WFlags wflags )
+	:TQWidget(tqparent, name, wflags ), _content(Arts::Widget::null())
 {
 	d = new KArtsWidgetPrivate;
-	d->layout = new TQHBoxLayout(this);
+	d->tqlayout = new TQHBoxLayout(this);
 }
 
 KArtsWidget::~KArtsWidget()
 {
 	TQWidget *contentAsWidget
-		= KWidgetRepo::the()->lookupQWidget(_content.widgetID());
+		= KWidgetRepo::the()->lookupTQWidget(_content.widgetID());
 	contentAsWidget->reparent(0,TQPoint(0,0),_content.visible());
 	delete d;
 	d = 0;
@@ -75,12 +75,12 @@ void KArtsWidget::setContent(Arts::Widget content)
 {
 	arts_return_if_fail(!content.isNull());
 	TQWidget *contentAsWidget
-		= KWidgetRepo::the()->lookupQWidget(content.widgetID());
+		= KWidgetRepo::the()->lookupTQWidget(content.widgetID());
 	arts_return_if_fail(contentAsWidget != 0);
 
 	_content = content;
 	contentAsWidget->reparent(this,TQPoint(0,0),content.visible());
-	d->layout->addWidget(contentAsWidget);
+	d->tqlayout->addWidget(contentAsWidget);
 }
 
 Arts::Widget KArtsWidget::content()