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

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.

57 files changed, 396 insertions, 396 deletions

diff --git a/arts/builder/createtool.cpp b/arts/builder/createtool.cpp
index ef26009f..f8d5c7e5 100644
--- a/arts/builder/createtool.cpp
+++ b/arts/builder/createtool.cpp
@@ -25,7 +25,7 @@
 #include "structureport.h"
 
 //#include <arts/debug.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpainter.h>
 #include <kmessagebox.h>
 #include <klocale.h>
@@ -55,7 +55,7 @@ CreateTool::CreateTool(ModuleWidget *mwidget)
 
 CreateTool::~CreateTool()
 {
-	mwidget->repaint(componentRect);
+	mwidget->tqrepaint(componentRect);
 	mwidget->setCursor(oldCursor);
 	mwidget->setMouseTracking(oldMouseTracking);
 }
@@ -89,7 +89,7 @@ void CreateTool::mouseMoveEvent(TQMouseEvent *e)
      && mwidget->colXPos(x + width, &cellx2) && mwidget->rowYPos(y + height, &celly2);
 	if(!posok) return;
 
-	mwidget->repaint(componentRect);
+	mwidget->tqrepaint(componentRect);
 	componentRect = TQRect(cellx, celly, cellx2 - cellx, celly2 - celly);
 
 	TQPainter *p = new TQPainter;
@@ -303,7 +303,7 @@ void ConnectPortsTool::mouseMoveEvent(TQMouseEvent *e)
 {
 	TQPainter painter(mwidget);
 	painter.setPen(TQt::white);
-	mwidget->repaint(TQRect(firstPos, lastPos).normalize());
+	mwidget->tqrepaint(TQRect(firstPos, lastPos).normalize());
 	painter.drawLine(firstPos, e->pos());
 	lastPos = e->pos();
 }
@@ -334,6 +334,6 @@ void ConnectPortsTool::mouseReleaseEvent(TQMouseEvent *e)
 			}
 		}
 	}
-	mwidget->repaint(TQRect(firstPos, lastPos).normalize());
+	mwidget->tqrepaint(TQRect(firstPos, lastPos).normalize());
 	mwidget->leaveTool(this);
 }
diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp
index 2f22f104..dae660b2 100644
--- a/arts/builder/dirmanager.cpp
+++ b/arts/builder/dirmanager.cpp
@@ -83,7 +83,7 @@ char *DirManager::directory(const char *subdir, const TQString &desc)
 		TQString dir = TQFile::decodeName(dirname);
 		message = i18n("You need the folder %1.\n"
 			"It will be used to store %2.\nShould I create it now?")
-			.arg(dir).arg(desc);
+			.tqarg(dir).tqarg(desc);
 
 		if(KMessageBox::questionYesNo(0,message,i18n("aRts Folder Missing"),i18n("Create Folder"),i18n("Do Not Create"))
 			== KMessageBox::Yes)
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index 8ead524a..790691e8 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -20,7 +20,7 @@
     */
 
 #include <tqfile.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
@@ -41,7 +41,7 @@
 
 #ifndef KDE_USE_FINAL
 static void min_size(TQWidget *w) {
-  w->setMinimumSize(w->sizeHint());
+  w->setMinimumSize(w->tqsizeHint());
 }
 #endif
 
@@ -53,19 +53,19 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 
 	setCaption(i18n("aRts Module Execution"));
 
-	mainlayout = new TQVBoxLayout(this);
+	maintqlayout = new TQVBoxLayout(this);
 
 // caption label: "Synthesis running..."
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *captionlabel = new TQLabel(this);
 	TQFont labelfont(captionlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(TQString(" ")+i18n("Synthesis running...")+TQString(" "));
-	captionlabel->setAlignment(AlignCenter);
+	captionlabel->tqsetAlignment(AlignCenter);
 	min_size(captionlabel);
-	mainlayout->addWidget(captionlabel);
+	maintqlayout->addWidget(captionlabel);
 
 	cpuusagelabel = new TQLabel(this);
 	cpuusagelabel->setText(i18n("CPU usage: unknown"));
@@ -78,41 +78,41 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 	cpuusagetimer->start( 2000, false );
 
 	min_size(cpuusagelabel);
-	mainlayout->addWidget(cpuusagelabel);
+	maintqlayout->addWidget(cpuusagelabel);
 
-//	ruler above the sliderlayout
+//	ruler above the slidertqlayout
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
         KSeparator* sep = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(sep);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(sep);
+	maintqlayout->addSpacing(5);
 
 //	sliders, controlpanels
 
-	sliderlayout = new TQVBoxLayout;
-	mainlayout->addLayout(sliderlayout);
+	slidertqlayout = new TQVBoxLayout;
+	maintqlayout->addLayout(slidertqlayout);
 
 #if 0 /* PORT */
 	this->GUIServer = GUIServer;
 	GUIServer->setGlobalParent(this);
-	GUIServer->setGlobalLayout(sliderlayout);
+	GUIServer->setGlobalLayout(slidertqlayout);
 #endif
 
-//  hruler below the sliderlayout
+//  hruler below the slidertqlayout
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
         sep = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(sep);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(sep);
+	maintqlayout->addSpacing(5);
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(buttonlayout);
-	mainlayout->addSpacing(5);
+	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(buttontqlayout);
+	maintqlayout->addSpacing(5);
 
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
 	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -125,18 +125,18 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
 	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
 
-	bbox->layout();
+	bbox->tqlayout();
 	//min_size(bbox);
 
-	buttonlayout->addWidget(bbox);
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addWidget(bbox);
+	buttontqlayout->addSpacing(5);
 
-//	mainlayout->freeze();
+//	maintqlayout->freeze();
 }
 
 void ExecDlg::start()
 {
-	mainlayout->freeze();
+	maintqlayout->freeze();
 }
 
 void ExecDlg::guiServerTick()
@@ -151,7 +151,7 @@ void ExecDlg::updateCpuUsage()
 #if 0 /* TODO:PORT */
 	char cpuusage[100];
 
-	ArtsCorba::Status s = Synthesizer->getStatus();
+	ArtsCorba::tqStatus s = Synthesizer->gettqStatus();
 	if(s.halted)
 	{
 		cpuusagetimer->stop();
diff --git a/arts/builder/execdlg.h b/arts/builder/execdlg.h
index 7c2c6d78..61348c0f 100644
--- a/arts/builder/execdlg.h
+++ b/arts/builder/execdlg.h
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 #include <tqlabel.h>
 #include <tqscrollbar.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 class ExecDlg :public TQDialog {
 	Q_OBJECT
@@ -35,7 +35,7 @@ class ExecDlg :public TQDialog {
 public:
 	TQTimer *cpuusagetimer;
 	TQLabel *cpuusagelabel;
-	TQVBoxLayout *mainlayout,*sliderlayout;
+	TQVBoxLayout *maintqlayout,*slidertqlayout;
 	ExecutableStructure *structure;
 
 	void start();
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 4d57c954..3b4d455a 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -21,7 +21,7 @@
 
 #include "interfacedlg.h"
 #include "structureport.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <kbuttonbox.h>
@@ -45,46 +45,46 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 {
 	setCaption(i18n("aRts: Structureport View"));
 
-	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
-	//TQHBoxLayout *contentslayout = new TQHBoxLayout;
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
+	//TQHBoxLayout *contentstqlayout = new TQHBoxLayout;
 
 // object type
 /*
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *objectlabel = new TQLabel(this);
 	TQFont labelfont(objectlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	objectlabel->setFont(labelfont);
 	objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" "));
-	objectlabel->setAlignment(AlignCenter);
+	objectlabel->tqsetAlignment(AlignCenter);
 	min_size(objectlabel);
-	mainlayout->addWidget(objectlabel);
+	maintqlayout->addWidget(objectlabel);
 */
 
 // port description
 
 /*
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *portlabel = new TQLabel(this);
 	labelfont.setPointSize(labelfont.pointSize()*4/5);
 	portlabel->setFont(labelfont);
 	portlabel->setText(i18n("Port description: ")+ port->description);
 	min_size(portlabel);
-	portlabel->setAlignment(AlignCenter);
-	mainlayout->addWidget(portlabel);
+	portlabel->tqsetAlignment(AlignCenter);
+	maintqlayout->addWidget(portlabel);
 
-	int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width());
+	int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width());
 
 	portlabel->setMinimumWidth(labelwidth);
 	objectlabel->setMinimumWidth(labelwidth);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler);
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(contentslayout);
+	maintqlayout->addWidget(ruler);
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(contentstqlayout);
 */
 // list
 
@@ -93,23 +93,23 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 	update();
 
 	listbox->setMinimumSize(340,400);
-	mainlayout->addWidget(listbox);
+	maintqlayout->addWidget(listbox);
         connect( listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *)), this,
                  TQT_SLOT(accept()));
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler2);
+	maintqlayout->addWidget(ruler2);
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(buttonlayout);
-	mainlayout->addSpacing(5);
+	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(buttontqlayout);
+	maintqlayout->addSpacing(5);
 
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
 	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -121,14 +121,14 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 	TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
 	connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
 
-	bbox->layout();
+	bbox->tqlayout();
 	//min_size(bbox);
 
-	buttonlayout->addWidget(bbox);
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addWidget(bbox);
+	buttontqlayout->addSpacing(5);
 
-	//mainlayout->activate();
-	mainlayout->freeze();
+	//maintqlayout->activate();
+	maintqlayout->freeze();
 }
 
 string InterfaceDlg::interfaceName()
@@ -159,10 +159,10 @@ void InterfaceDlg::update(const string& interface, const string& indent)
 {
 	listbox->insertItem((indent + interface).c_str());
 
-	vector<string> *children = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface);
-	for (vector<string>::iterator ci = children->begin(); ci != children->end(); ++ci)
+	vector<string> *tqchildren = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface);
+	for (vector<string>::iterator ci = tqchildren->begin(); ci != tqchildren->end(); ++ci)
 		update(ci->c_str(), indent+"  ");
-	delete children;
+	delete tqchildren;
 }
 
 void InterfaceDlg::update()
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 229f4f61..558f650c 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -441,7 +441,7 @@ void ArtsBuilderWindow::publish()
 	checkName();
 	structure->publish();
 	KMessageBox::information(this,
-		i18n("The structure has been published as: '%1' on the server.").arg( structure->name().c_str() ));
+		i18n("The structure has been published as: '%1' on the server.").tqarg( structure->name().c_str() ));
 }
 
 TQString ArtsBuilderWindow::getOpenFilename(const char *pattern, const char *initialDir)
@@ -587,7 +587,7 @@ bool ArtsBuilderWindow::save(TQString filename)
 	if(file.status()) {
 		KMessageBox::sorry(this,
 			i18n("The file '%1' could not be opened for writing: %2")
-			.arg(filename).arg(strerror(file.status())),
+			.tqarg(filename).tqarg(strerror(file.status())),
 			i18n("aRts Warning"));
 		return false;
 	}
@@ -597,7 +597,7 @@ bool ArtsBuilderWindow::save(TQString filename)
 	if(!file.close()) {
 		KMessageBox::sorry(this,
 			i18n("Saving to file '%1' could not be finished correctly: %2")
-			.arg(filename).arg(strerror(file.status())),
+			.tqarg(filename).tqarg(strerror(file.status())),
 			i18n("aRts Warning"));
 		return false;
 	}
@@ -872,7 +872,7 @@ ArtsBuilderApp::ArtsBuilderApp(TQString filename)
 		mainWindow->open(filename);
 	} else {
 		KMessageBox::sorry(0,
-		   i18n("The specified file '%1' does not exist.").arg(filename),
+		   i18n("The specified file '%1' does not exist.").tqarg(filename),
 		   i18n("aRts Warning"));
 	}
 }
diff --git a/arts/builder/module.cpp b/arts/builder/module.cpp
index 2d452dc5..099f01e7 100644
--- a/arts/builder/module.cpp
+++ b/arts/builder/module.cpp
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <arts/debug.h>
 
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqdrawutil.h>
 #include <kiconloader.h>
 #include <algorithm>
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index e165cc17..63f2546c 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -21,7 +21,7 @@
 
 #include "portposdlg.h"
 #include "structureport.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <kbuttonbox.h>
@@ -46,46 +46,46 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
 
 	setCaption(i18n("aRts: Structureport View"));
 
-	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
-	//TQHBoxLayout *contentslayout = new TQHBoxLayout;
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
+	//TQHBoxLayout *contentstqlayout = new TQHBoxLayout;
 
 // object type
 /*
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *objectlabel = new TQLabel(this);
 	TQFont labelfont(objectlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	objectlabel->setFont(labelfont);
 	objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" "));
-	objectlabel->setAlignment(AlignCenter);
+	objectlabel->tqsetAlignment(AlignCenter);
 	min_size(objectlabel);
-	mainlayout->addWidget(objectlabel);
+	maintqlayout->addWidget(objectlabel);
 */
 
 // port description
 
 /*
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *portlabel = new TQLabel(this);
 	labelfont.setPointSize(labelfont.pointSize()*4/5);
 	portlabel->setFont(labelfont);
 	portlabel->setText(i18n("Port description: ")+ port->description);
 	min_size(portlabel);
-	portlabel->setAlignment(AlignCenter);
-	mainlayout->addWidget(portlabel);
+	portlabel->tqsetAlignment(AlignCenter);
+	maintqlayout->addWidget(portlabel);
 
-	int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width());
+	int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width());
 
 	portlabel->setMinimumWidth(labelwidth);
 	objectlabel->setMinimumWidth(labelwidth);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler);
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(contentslayout);
+	maintqlayout->addWidget(ruler);
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(contentstqlayout);
 */
 // list
 
@@ -94,21 +94,21 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
 	update();
 
 	listbox->setMinimumSize(100,200);
-	mainlayout->addWidget(listbox);
+	maintqlayout->addWidget(listbox);
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler2);
+	maintqlayout->addWidget(ruler2);
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(buttonlayout);
-	mainlayout->addSpacing(5);
+	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(buttontqlayout);
+	maintqlayout->addSpacing(5);
 
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
 	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -133,14 +133,14 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
 	TQButton *cancelbutton = bbox->addButton(i18n("Cancel"));
 	connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
 */
-	bbox->layout();
+	bbox->tqlayout();
 	//min_size(bbox);
 
-	buttonlayout->addWidget(bbox);
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addWidget(bbox);
+	buttontqlayout->addSpacing(5);
 
-	//mainlayout->activate();
-	mainlayout->freeze();
+	//maintqlayout->activate();
+	maintqlayout->freeze();
 }
 
 void PortPosDlg::raise()
@@ -247,7 +247,7 @@ void PortPosDlg::update()
 			}
 		}
 	}
-	listbox->repaint();
+	listbox->tqrepaint();
 }
 
 void PortPosDlg::help()
diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp
index 65dcd49b..df76588a 100644
--- a/arts/builder/propertypanel.cpp
+++ b/arts/builder/propertypanel.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
@@ -115,7 +115,7 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component )
 		if(component->pixmap())
 		{
 			moduleIconLabel->setPixmap( *component->pixmap() );
-			moduleIconLabel->setMinimumSize( moduleIconLabel->sizeHint() );
+			moduleIconLabel->setMinimumSize( moduleIconLabel->tqsizeHint() );
 			moduleIconLabel->show();
 		}
 		else
@@ -128,11 +128,11 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component )
 			 it != modulePorts.end(); it++)
 		{
 			TQString portTitle = (*it)->description
-				+ TQString(" (%1)").arg( (*it)->PortDesc.type().direction == Arts::output ?
+				+ TQString(" (%1)").tqarg( (*it)->PortDesc.type().direction == Arts::output ?
 										i18n("OUTPUT") : i18n("INPUT") );
 			portCombo->insertItem( portTitle );
 		}
-		//portCombo->setMinimumSize( portCombo->sizeHint() );
+		//portCombo->setMinimumSize( portCombo->tqsizeHint() );
 		setEnabled(true);
 	}
 }
@@ -344,7 +344,7 @@ bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e )
 		TQString entered = TQT_TQKEYEVENT(e)->text();
 		bool goodString = entered.length() > 0;
 
-//		kdDebug() << TQString("pressed '%1'").arg(entered) << endl;
+//		kdDebug() << TQString("pressed '%1'").tqarg(entered) << endl;
 
 		for( unsigned int i = 0; i < entered.length(); i++)
 			goodString = goodString && entered[i].isLetterOrNumber();
diff --git a/arts/builder/propertypanel.h b/arts/builder/propertypanel.h
index cfe417f2..cf34fe65 100644
--- a/arts/builder/propertypanel.h
+++ b/arts/builder/propertypanel.h
@@ -21,7 +21,7 @@
 #define PROPERTYPANEL_H
 
 #include "propertypanelbase.h"
-#include "palette.h"
+#include "tqpalette.h"
 
 #include <vector>
 #include <list>
diff --git a/arts/builder/propertypanelbase.ui b/arts/builder/propertypanelbase.ui
index 0ff20382..b327b33f 100644
--- a/arts/builder/propertypanelbase.ui
+++ b/arts/builder/propertypanelbase.ui
@@ -314,7 +314,7 @@
                     <property name="name">
                         <cstring>tipLabel</cstring>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="wordwrap" stdset="0">
diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp
index 4db8af17..f8716b44 100644
--- a/arts/builder/qttableview.cpp
+++ b/arts/builder/qttableview.cpp
@@ -34,8 +34,8 @@ enum ScrollBarDirtyFlags {
 };
 
 
-#define HSBEXT horizontalScrollBar()->sizeHint().height()
-#define VSBEXT verticalScrollBar()->sizeHint().width()
+#define HSBEXT horizontalScrollBar()->tqsizeHint().height()
+#define VSBEXT verticalScrollBar()->tqsizeHint().width()
 
 
 class TQCornerSquare : public TQWidget		// internal class
@@ -88,7 +88,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
   used by functions such as setXOffset() or maxYOffset().
 
   \i The \e widget coordinates. (0,0) is the top-left corner of the widget,
-  \e including the frame.  They are used by functions such as repaint().
+  \e including the frame.  They are used by functions such as tqrepaint().
 
   \i The \e view coordinates.  (0,0) is the top-left corner of the view, \e
   excluding the frame.  This is the least-used coordinate system; it is used by
@@ -135,7 +135,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
   The \link setCellHeight() cell height\endlink and \link setCellWidth()
   cell width\endlink are set to 0.
 
-  Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
+  Frame line tqshapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
   see TQFrame::setFrameStyle().
 
   Note that the \a f argument is \e not \link setTableFlags() table
@@ -207,7 +207,7 @@ void QtTableView::show()
 
 
 /*!
-  \overload void QtTableView::repaint( bool erase )
+  \overload void QtTableView::tqrepaint( bool erase )
   Repaints the entire view.
 */
 
@@ -221,16 +221,16 @@ void QtTableView::show()
   If \a w is negative, it is replaced with <code>width() - x</code>.
   If \a h is negative, it is replaced with <code>height() - y</code>.
 
-  Doing a repaint() usually is faster than doing an update(), but
+  Doing a tqrepaint() usually is faster than doing an update(), but
   calling update() many times in a row will generate a single paint
   event.
 
   At present, QtTableView is the only widget that reimplements \link
-  TQWidget::repaint() repaint()\endlink.	 It does this because by
+  TQWidget::tqrepaint() tqrepaint()\endlink.	 It does this because by
   clearing and then repainting one cell at at time, it can make the
   screen flicker less than it would otherwise.  */
 
-void QtTableView::repaint( int x, int y, int w, int h, bool erase )
+void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
 {
     if ( !isVisible() || testWState(WState_BlockUpdates) )
 	return;
@@ -249,7 +249,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase )
 }
 
 /*!
-  \overload void QtTableView::repaint( const TQRect &r, bool erase )
+  \overload void QtTableView::tqrepaint( const TQRect &r, bool erase )
   Replaints rectangle \a r. If \a erase is TRUE draws the background
   using the palette's background.
 */
@@ -288,7 +288,7 @@ void QtTableView::setNumRows( int rows )
 	nRows = rows;
 	if ( autoUpdate() && isVisible() &&
 	     ( oldLastVisible != lastRowVisible() || oldTopCell != topCell() ) )
-		repaint( oldTopCell != topCell() );
+		tqrepaint( oldTopCell != topCell() );
     } else {
 	// Be more careful - if destructing, bad things might happen.
 	nRows = rows;
@@ -328,7 +328,7 @@ void QtTableView::setNumCols( int cols )
     if ( autoUpdate() && isVisible() ) {
 	int maxCol = lastColVisible();
 	if ( maxCol >= oldCols || maxCol >= nCols )
-	    repaint();
+	    tqrepaint();
     }
     updateScrollBars( horRange );
     updateFrameSize();
@@ -591,7 +591,7 @@ void QtTableView::setCellWidth( int cellWidth )
 
     updateScrollBars( horSteps | horRange );
     if ( autoUpdate() && isVisible() )
-	repaint();
+	tqrepaint();
 
 }
 
@@ -643,7 +643,7 @@ void QtTableView::setCellHeight( int cellHeight )
 #endif
     cellH = (short)cellHeight;
     if ( autoUpdate() && isVisible() )
-	repaint();
+	tqrepaint();
     updateScrollBars( verSteps | verRange );
 }
 
@@ -817,7 +817,7 @@ void QtTableView::setTableFlags( uint f )
 	     (f & Tbl_snapToVGrid) != 0 && yCellDelta != 0 ) {
 	    snapToGrid( (f & Tbl_snapToHGrid) != 0,	// do snapping
 			(f & Tbl_snapToVGrid) != 0 );
-	    repaintMask |= Tbl_snapToGrid;	// repaint table
+	    repaintMask |= Tbl_snapToGrid;	// tqrepaint table
 	}
     }
 
@@ -825,7 +825,7 @@ void QtTableView::setTableFlags( uint f )
 	setAutoUpdate( TRUE );
 	updateScrollBars();
 	if ( isVisible() && (f & repaintMask) )
-	    repaint();
+	    tqrepaint();
     }
 
 }
@@ -881,7 +881,7 @@ void QtTableView::clearTableFlags( uint f )
 	    (f & Tbl_smoothVScrolling) != 0 && yCellDelta != 0 ) {
 	    snapToGrid( (f & Tbl_smoothHScrolling) != 0,      // do snapping
 			(f & Tbl_smoothVScrolling) != 0 );
-	    repaintMask |= Tbl_smoothScrolling;		     // repaint table
+	    repaintMask |= Tbl_smoothScrolling;		     // tqrepaint table
 	}
     }
     if ( f & Tbl_snapToHGrid ) {
@@ -894,7 +894,7 @@ void QtTableView::clearTableFlags( uint f )
 	setAutoUpdate( TRUE );
 	updateScrollBars();	     // returns immediately if nothing to do
 	if ( isVisible() && (f & repaintMask) )
-	    repaint();
+	    tqrepaint();
     }
 
 }
@@ -916,20 +916,20 @@ void QtTableView::clearTableFlags( uint f )
   automatically whenever it has changed in some way (for example, when a
   \link setTableFlags() flag\endlink is changed).
 
-  If \a enable is FALSE, the view does NOT repaint itself or update
+  If \a enable is FALSE, the view does NOT tqrepaint itself or update
   its internal state variables when it is changed.  This can be
   useful to avoid flicker during large changes and is singularly
   useless otherwise. Disable auto-update, do the changes, re-enable
-  auto-update and call repaint().
+  auto-update and call tqrepaint().
 
   \warning Do not leave the view in this state for a long time
   (i.e., between events). If, for example, the user interacts with the
   view when auto-update is off, strange things can happen.
 
-  Setting auto-update to TRUE does not repaint the view; you must call
-  repaint() to do this.
+  Setting auto-update to TRUE does not tqrepaint the view; you must call
+  tqrepaint() to do this.
 
-  \sa autoUpdate(), repaint()
+  \sa autoUpdate(), tqrepaint()
 */
 
 void QtTableView::setAutoUpdate( bool enable )
@@ -963,7 +963,7 @@ void QtTableView::updateCell( int row, int col, bool erase )
     TQRect uR = TQRect( xPos, yPos,
 		      cellW ? cellW : cellWidth(col),
 		      cellH ? cellH : cellHeight(row) );
-    repaint( uR.intersect(viewRect()), erase );
+    tqrepaint( uR.intersect(viewRect()), erase );
 }
 
 
@@ -1379,13 +1379,13 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 
     // Note that this needs to be done regardless whether we do
     // eraseInPaint or not. Reason: a subclass may implement
-    // flicker-freeness and encourage the use of repaint(FALSE).
+    // flicker-freeness and encourage the use of tqrepaint(FALSE).
     // The subclass, however, cannot draw all pixels, just those
     // inside the cells. So QtTableView is reponsible for all pixels
     // outside the cells.
 
     TQRect viewR = viewRect();
-    const TQColorGroup g = colorGroup();
+    const TQColorGroup g = tqcolorGroup();
 
     if ( xPos <= maxX ) {
 	TQRect r = viewR;
@@ -1426,7 +1426,7 @@ void QtTableView::resizeEvent( TQResizeEvent * )
 
 void QtTableView::updateView()
 {
-    repaint( viewRect() );
+    tqrepaint( viewRect() );
 }
 
 /*!
@@ -1443,7 +1443,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const
 #ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
-        sb->resize( sb->sizeHint() ); // height is irrelevant
+        sb->resize( sb->tqsizeHint() ); // 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->sizeHint() ); // width is irrelevant
+	sb->resize( sb->tqsizeHint() ); // width is irrelevant
 	sb->setFocusPolicy( TQ_NoFocus );
 	Q_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
@@ -1522,7 +1522,7 @@ void QtTableView::setHorScrollBar( bool on, bool update )
 	else
 	    sbDirty = sbDirty | verMask;
 	if ( hideScrollBar && isVisible() )
-	    repaint( hScrollBar->x(), hScrollBar->y(),
+	    tqrepaint( hScrollBar->x(), hScrollBar->y(),
 		     width() - hScrollBar->x(), hScrollBar->height() );
     }
     if ( update )
@@ -1561,7 +1561,7 @@ void QtTableView::setVerScrollBar( bool on, bool update )
 	else
 	    sbDirty = sbDirty | horMask;
 	if ( hideScrollBar && isVisible() )
-	    repaint( vScrollBar->x(), vScrollBar->y(),
+	    tqrepaint( vScrollBar->x(), vScrollBar->y(),
 		     vScrollBar->width(), height() - vScrollBar->y() );
     }
     if ( update )
@@ -2006,7 +2006,7 @@ void QtTableView::updateScrollBars( uint f )
 	if ( sbDirty & horValue )
 	    hScrollBar->setValue( xOffs );
 
-			// show scrollbar only when it has a sane geometry
+			// show scrollbar only when it has a sane tqgeometry
 	if ( !hScrollBar->isVisible() )
 	    hScrollBar->show();
     }
@@ -2030,7 +2030,7 @@ void QtTableView::updateScrollBars( uint f )
 	if ( sbDirty & verValue )
 	    vScrollBar->setValue( yOffs );
 
-			// show scrollbar only when it has a sane geometry
+			// show scrollbar only when it has a sane tqgeometry
 	if ( !vScrollBar->isVisible() )
 	    vScrollBar->show();
     }
@@ -2253,7 +2253,7 @@ void QtTableView::showOrHideScrollBars()
   Call this function when the table view's total size is changed;
   typically because the result of cellHeight() or cellWidth() have changed.
 
-  This function does not repaint the widget.
+  This function does not tqrepaint the widget.
 */
 
 void QtTableView::updateTableSize()
diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h
index 3160a38a..7d4f14e2 100644
--- a/arts/builder/qttableview.h
+++ b/arts/builder/qttableview.h
@@ -32,9 +32,9 @@ public:
     virtual void setPalette( const TQPalette & );
     void	show();
 
-    void	repaint( bool erase=TRUE );
-    void	repaint( int x, int y, int w, int h, bool erase=TRUE );
-    void	repaint( const TQRect &, bool erase=TRUE );
+    void	tqrepaint( bool erase=TRUE );
+    void	tqrepaint( int x, int y, int w, int h, bool erase=TRUE );
+    void	tqrepaint( const TQRect &, bool erase=TRUE );
 
 protected:
     QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
@@ -235,11 +235,11 @@ inline TQRect QtTableView::cellUpdateRect() const
 inline bool QtTableView::autoUpdate() const
 { return isUpdatesEnabled(); }
 
-inline void QtTableView::repaint( bool erase )
-{ repaint( 0, 0, width(), height(), erase ); }
+inline void QtTableView::tqrepaint( bool erase )
+{ tqrepaint( 0, 0, width(), height(), erase ); }
 
-inline void QtTableView::repaint( const TQRect &r, bool erase )
-{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
+inline void QtTableView::tqrepaint( const TQRect &r, bool erase )
+{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); }
 
 inline void QtTableView::updateScrollBars()
 { updateScrollBars( 0 ); }
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index 94dca3d4..5b738471 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -20,7 +20,7 @@
     */
 
 #include "retrievedlg.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <kbuttonbox.h>
@@ -37,33 +37,33 @@
 #include <tqpushbutton.h>
 
 static void min_size(TQWidget *w) {
-  w->setMinimumSize(w->sizeHint());
+  w->setMinimumSize(w->tqsizeHint());
 }
 
 RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
 {
 	setCaption(i18n("Retrieve Structure From Server"));
 
-	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
 
 // caption label: "Synthesis running..."
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *captionlabel = new TQLabel(this);
 	TQFont labelfont(captionlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(TQString(" ")+i18n("Published structures")+TQString(" "));
-	captionlabel->setAlignment(AlignCenter);
+	captionlabel->tqsetAlignment(AlignCenter);
 	min_size(captionlabel);
-	mainlayout->addWidget(captionlabel);
+	maintqlayout->addWidget(captionlabel);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler2);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(ruler2);
+	maintqlayout->addSpacing(5);
 
 // listwidget
 
@@ -85,23 +85,23 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
 		listbox->insertItem((*ni).c_str());
 #endif
 
-	mainlayout->addWidget(listbox);
+	maintqlayout->addWidget(listbox);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(ruler);
+	maintqlayout->addSpacing(5);
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(buttonlayout);
-	mainlayout->addSpacing(5);
+	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(buttontqlayout);
+	maintqlayout->addSpacing(5);
 
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
 	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -113,12 +113,12 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
 	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
 
-	bbox->layout();
+	bbox->tqlayout();
 
-	buttonlayout->addWidget(bbox);
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addWidget(bbox);
+	buttontqlayout->addSpacing(5);
 
-	mainlayout->freeze();
+	maintqlayout->freeze();
 }
 
 TQString RetrieveDlg::result()
diff --git a/arts/builder/retrievedlg.h b/arts/builder/retrievedlg.h
index dfc079e1..51649c4f 100644
--- a/arts/builder/retrievedlg.h
+++ b/arts/builder/retrievedlg.h
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqscrollbar.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <string>
 
diff --git a/arts/builder/structureport.cpp b/arts/builder/structureport.cpp
index b8d59d1e..e61fa2a9 100644
--- a/arts/builder/structureport.cpp
+++ b/arts/builder/structureport.cpp
@@ -22,7 +22,7 @@
 #include "structureport.h"
 #include "drawutils.h"
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqdrawutil.h>
 #include <tqbitmap.h>
 #include <assert.h>
diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl
index a9a3950a..c88dd3f1 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 frameshape;
+		attribute Shape frametqshape;
 		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 alignment.
+		/// Adds a widget with the stretch-factor and the tqalignment.
 		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 alignment of the text. See enum Align
+		/// The tqalignment 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 35c18df5..763239f7 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 "layout.h"
+#include "tqlayout.h"
 
 class KArtsWidgetPrivate {
 public:
-	TQHBoxLayout *layout;
+	TQHBoxLayout *tqlayout;
 };
 
 KArtsWidget::KArtsWidget( TQWidget* parent, const char* name )
 	:TQWidget( parent, 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())
 {
 	d = new KArtsWidgetPrivate;
-	d->layout = new TQHBoxLayout(this);
+	d->tqlayout = 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->layout = new TQHBoxLayout( this );
+	d->tqlayout = 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->layout = new TQHBoxLayout(this);
+	d->tqlayout = 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->layout->addWidget(contentAsWidget);
+	d->tqlayout->addWidget(contentAsWidget);
 }
 
 Arts::Widget KArtsWidget::content()
diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h
index d33efa15..8b1b85f4 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 layout, you can do so using this code
+ * type into a tqlayout, you can do so using this code
  *
  * <pre>
  *    Arts::Widget widget = ...get widget from somewhere...;
  *    KArtsWidget *w = new KArtsWidget(widget, this);
- *    layout->addWidget(w);
+ *    tqlayout->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 d95da549..478d8ec4 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::frameshape()
+Shape KFrame_impl::frametqshape()
 {
 	return ( Shape )_qframe->frameShape();
 }
 
-void KFrame_impl::frameshape( Shape fs )
+void KFrame_impl::frametqshape( Shape fs )
 {
 	_qframe->setFrameShape( ( TQFrame::Shape )fs );
 }
diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h
index 656b9aa1..a5638f98 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 frameshape();
-		void frameshape( Shape fs );
+		Shape frametqshape();
+		void frametqshape( Shape fs );
 		Shadow frameshadow();
 		void frameshadow( Shadow fs );
 }; //class
diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp
index 1218e9a0..1278ba21 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*/)
 {
-	repaint();
+	tqrepaint();
 }
 
 void KGraph::removeLine(Arts::KGraphLine_impl *line)
diff --git a/arts/gui/kde/klabel_impl.cpp b/arts/gui/kde/klabel_impl.cpp
index dd0a9557..e6a008c4 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;
-	repaint();
+	tqrepaint();
 }
 
 void RotateLabel::bottom( Arts::TextBottom bottom ) {
 	_bottom = bottom;
 	title( _title );
-	repaint();
+	tqrepaint();
 }
 
 // vim: sw=4 ts=4
diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp
index 1e745c50..9aeee822 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 <layout.h>
+#include <tqlayout.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(), colorGroup(), flags );
+	tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), flags );
 }
 
-TQSize KLayoutBox_Separator::minimumSizeHint() const {
-	int wh = tqstyle().pixelMetric( TQStyle::PM_SplitterWidth, this );
+TQSize KLayoutBox_Separator::tqminimumSizeHint() const {
+	int wh = tqstyle().tqpixelMetric( 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( colorGroup().foreground(), _width ) );
+	p.setPen( TQPen( tqcolorGroup().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::minimumSizeHint() const {
+TQSize KLayoutBox_Line::tqminimumSizeHint() 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 eee3b781..38cca947 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 minimumSizeHint() const;
+	TQSize tqminimumSizeHint() const;
 };
 
 class KLayoutBox_Line : public TQWidget {
@@ -96,7 +96,7 @@ private:
 public:
 	KLayoutBox_Line( int, int, TQWidget*, const char* =0 );
 	void paintEvent( TQPaintEvent* );
-	TQSize minimumSizeHint() const;
+	TQSize tqminimumSizeHint() const;
 };
 
 #endif
diff --git a/arts/gui/kde/klevelmeter_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp
index 9a78804c..5589b772 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;
 	}
-	repaint();
+	tqrepaint();
 }
 
 void KLevelMeter_FireBars::paintEvent( TQPaintEvent* ) {
diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp
index 05b6492f..418108ad 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 <layout.h>
+#include <tqlayout.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 fc2a1293..37dfe4d3 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 = colorGroup();
+	_stdcolors = tqcolorGroup();
 	setBackgroundMode( TQt::NoBackground );
 }
 
 void KLevelMeter_LineBars::invalue( float n, float p ) {
 	_value = amptondb( n );
 	_peak  = amptondb( p );
-	repaint();
+	tqrepaint();
 }
 
 void KLevelMeter_LineBars::substyle( long n ) {
diff --git a/arts/gui/kde/klevelmeter_normalbars.cpp b/arts/gui/kde/klevelmeter_normalbars.cpp
index 72a831fb..29593551 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 <layout.h>
+#include <tqlayout.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 8e90451c..e685b1ae 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 <layout.h>
+#include <tqlayout.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 );
-	_titlebarlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop );
-	_titlebarlayout->setAutoAdd( true );
+	_titlebartqlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop );
+	_titlebartqlayout->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:
-			_titlebarlayout->setDirection( TQBoxLayout::BottomToTop );
+			_titlebartqlayout->setDirection( TQBoxLayout::BottomToTop );
 			_drag->setMinimumHeight( 30 );
 			_drag->setMinimumWidth( 0 );
 			break;
 		case TopToBottom:
 		case BottomToTop:
-			_titlebarlayout->setDirection( TQBoxLayout::RightToLeft );
+			_titlebartqlayout->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 f702f4db..b9b38e7f 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 *_titlebarlayout;
+	TQBoxLayout *_titlebartqlayout;
 	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 );
+		tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), tqcolorGroup(), 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 <layout.h>
+#include <tqlayout.h>
 
 class ShowButton : public TQPushButton {
    Q_OBJECT
@@ -151,17 +151,17 @@ public slots:
 		}
 	}
 public:
-	TQSize minimumSizeHint() const {
-		int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+	TQSize tqminimumSizeHint() const {
+		int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
 		return TQSize( wh, wh );
 	}
 	TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); }
-	TQSize minimumSize() const { return minimumSizeHint(); }
-	TQSize sizeHint() const { return minimumSize(); }
+	TQSize tqminimumSize() const { return tqminimumSizeHint(); }
+	TQSize tqsizeHint() const { return tqminimumSize(); }
 
 	void drawButton(  TQPainter * p )
 	{
-		p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
+		p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().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 minimumSizeHint() const {
-		int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+	TQSize tqminimumSizeHint() const {
+		int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
 		return TQSize( wh, wh );
 	}
 	TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); }
-	TQSize minimumSize() const { return minimumSizeHint(); }
-	TQSize sizeHint() const { return minimumSize(); }
+	TQSize tqminimumSize() const { return tqminimumSizeHint(); }
+	TQSize tqsizeHint() const { return tqminimumSize(); }
 
 	void drawButton( TQPainter * p )
 	{
-		p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
+		p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().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 d436be9a..dca86721 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 & colorGroup )
+	KPixmap bgPixmap( const TQColorGroup & tqcolorGroup )
 	{
 		if( bgDirty || bgdb.isNull() )
 		{
@@ -73,8 +73,8 @@ struct KPoti::KPotiPrivate
 
 			// inset shadow
 			KPixmap gradient( bgdb.size() );
-			KPixmapEffect::gradient( gradient, colorGroup.light(), colorGroup.dark(), KPixmapEffect::DiagonalGradient );
-			dbp.setBrush( TQBrush( colorGroup.button(), gradient ) );
+			KPixmapEffect::gradient( gradient, tqcolorGroup.light(), tqcolorGroup.dark(), KPixmapEffect::DiagonalGradient );
+			dbp.setBrush( TQBrush( tqcolorGroup.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::sizeHint() const
+TQSize KPoti::tqsizeHint() const
 {
-	return minimumSizeHint();
+	return tqminimumSizeHint();
 }
 
-TQSize KPoti::minimumSizeHint() const
+TQSize KPoti::tqminimumSizeHint() 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( minimumSizeHint() );
+	setMinimumSize( tqminimumSizeHint() );
 	updateGeometry();
 }
 
@@ -392,7 +392,7 @@ void KPoti::setColor( const TQColor &c )
 {
 	d->potiColor = c;
 	d->potiDirty = true;
-	repaint();
+	tqrepaint();
 }
 
 
@@ -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( colorGroup().button() );
-		qDrawShadePanel( &p2, pointer, colorGroup(), true, 1, &buttonbrush );
+		TQBrush buttonbrush( tqcolorGroup().button() );
+		qDrawShadePanel( &p2, pointer, tqcolorGroup(), 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( colorGroup().background() );
+	doublebuffer.fill( tqcolorGroup().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( colorGroup() ) );
+	dbp.drawPixmap( d->buttonRect, d->bgPixmap( tqcolorGroup() ) );
 
 	if( hasFocus() )
-		tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() );
+		tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, tqcolorGroup() );
 
     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( colorGroup().foreground() );
+	p->setPen( tqcolorGroup().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 52705f8f..d9013c8a 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 sizeHint() const;
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqsizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
     TQString text() const;
 
 public slots:
diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp
index 5df8dd00..4988ad7b 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 = colorGroup().foreground();
-	TQColor colordiff = colorGroup().buttonText();
+	TQColor colornormal = tqcolorGroup().foreground();
+	TQColor colordiff = tqcolorGroup().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 97ea35a6..fca3466e 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( colorGroup().light(), colorGroup().highlight(), float( i )/contentsRect().height() ) );
+			p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( i )/contentsRect().height() ) );
 			p->drawLine( contentsRect().left(), this->frameWidth() + i, contentsRect().right(), this->frameWidth() + i );
 		}
-		p->setPen( colorGroup().dark() );
+		p->setPen( tqcolorGroup().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( colorGroup().light(), colorGroup().highlight(), float( -i )/contentsRect().width() ) );
+			p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( -i )/contentsRect().width() ) );
 			p->drawLine( this->frameWidth() + i, contentsRect().top(), this->frameWidth() + i, contentsRect().bottom() );
 		}
-		p->setPen( colorGroup().dark() );
+		p->setPen( tqcolorGroup().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 2a1399f1..b716f4c3 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->sizePolicy().horData();
+	return ( SizePolicy )_qwidget->tqsizePolicy().horData();
 }
 
 void KWidget_impl::hSizePolicy( SizePolicy p )
 {
-	TQSizePolicy sp = _qwidget->sizePolicy();
+	TQSizePolicy sp = _qwidget->tqsizePolicy();
 	sp.setHorData( ( TQSizePolicy::SizeType )p );
-	_qwidget->setSizePolicy( sp );
+	_qwidget->tqsetSizePolicy( sp );
 }
 
 SizePolicy KWidget_impl::vSizePolicy()
 {
-	return ( SizePolicy )_qwidget->sizePolicy().verData();
+	return ( SizePolicy )_qwidget->tqsizePolicy().verData();
 }
 
 void KWidget_impl::vSizePolicy( SizePolicy p )
 {
-	TQSizePolicy sp = _qwidget->sizePolicy();
+	TQSizePolicy sp = _qwidget->tqsizePolicy();
 	sp.setVerData( ( TQSizePolicy::SizeType )p );
-	_qwidget->setSizePolicy( sp );
+	_qwidget->tqsetSizePolicy( sp );
 }
 
 void KWidget_impl::show()
diff --git a/arts/midi/artsmidi.idl b/arts/midi/artsmidi.idl
index 70157d95..82e6e9e4 100644
--- a/arts/midi/artsmidi.idl
+++ b/arts/midi/artsmidi.idl
@@ -54,7 +54,7 @@ struct TimeStamp {
 /**
  * different status of a midi command
  */
-enum MidiCommandStatus {
+enum MidiCommandtqStatus {
 // Masks:
 	mcsCommandMask		= 0xf0,
 	mcsChannelMask		= 0x0f,
diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc
index 0f4db5e8..3e80e603 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cc
@@ -49,7 +49,7 @@ public:
 		if(newName != _name)
 		{
 			_name = newName;
-		  	amClient.title(i18n("Mixer (\"%1\")").arg(TQString::fromUtf8(_name.c_str())).utf8().data());
+		  	amClient.title(i18n("Mixer (\"%1\")").tqarg(TQString::fromUtf8(_name.c_str())).utf8().data());
 		  	amClient.autoRestoreID("mixer_"+_name);
 			for(unsigned int i = 0; i < _inputs.size(); i++)
 				_inputs[i].busname(channelName(i));
diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl
index 42ff393a..2da25a68 100644
--- a/arts/runtime/artsbuilder.idl
+++ b/arts/runtime/artsbuilder.idl
@@ -42,7 +42,7 @@ module Arts {
 	 * isMultiPort specifies if the port can take multiple incoming
 	 * connections or not. This is only relevant/allowed for input ports,
 	 * the output of all output ports may be connected to any amount of
-	 * receivers.
+	 * tqreceivers.
 	 *
 	 * Ports which can take multiple connections are handled differently
 	 * internally. (Also, artsbuilder needs to know whether to allow multi-
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index e4a7e16a..f59bc9ff 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->layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
-	p->layout->setSpacing( 2 );
+	p->tqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
+	p->tqlayout->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->layout->addWidget( p->vuw );
+		p->tqlayout->addWidget( p->vuw );
 	}
 
-	p->layout->activate();
+	p->tqlayout->activate();
 
-	TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) );
+	TQTimer::singleShot( 100, this, TQT_SLOT( supdatetqlayout() ) );
 
 kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl;
 }
@@ -93,12 +93,12 @@ kdDebug()<<k_funcinfo<<endl;
 
 int ArtsControlApplet::widthForHeight( int h ) const {
 kdDebug()<<"ArtsControlApplet::widthForHeight( int "<<h<<" )"<<endl;
-	return p->layout->sizeHint().width();
+	return p->tqlayout->tqsizeHint().width();
 }
 
 int ArtsControlApplet::heightForWidth( int w ) const {
 kdDebug()<<"ArtsControlApplet::heightForWidth( int "<<w<<" )"<<endl;
-	return p->layout->sizeHint().height();
+	return p->tqlayout->tqsizeHint().height();
 }
 
 void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) {
@@ -122,12 +122,12 @@ kdDebug()<<k_funcinfo<<" position()="<<position()<<endl;
 	{
 		case pTop:
 		case pBottom:
-			p->layout->setDirection( TQBoxLayout::LeftToRight );
+			p->tqlayout->setDirection( TQBoxLayout::LeftToRight );
 			if ( p->barts ) p->vu.direction( Arts::LeftToRight );
 			break;
 		case pRight:
 		case pLeft:
-			p->layout->setDirection( TQBoxLayout::TopToBottom );
+			p->tqlayout->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() ) );
-		layout->addWidget( svinline );
+		tqlayout->addWidget( svinline );
 	} else {
 		delete svinline;
 		svinline = 0;
 	}
-	_parent->supdatelayout();
+	_parent->supdatetqlayout();
 }
 
 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->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(); }
+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(); }
 
 // vim: sw=4 ts=4
 #include "artscontrolapplet.moc"
diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h
index 21a50b3e..e1722ebf 100644
--- a/arts/tools/artscontrolapplet.h
+++ b/arts/tools/artscontrolapplet.h
@@ -120,7 +120,7 @@ protected:
 	void positionChange( Position );
 
 public slots:
-	void supdatelayout() { emit updateLayout(); }
+	void supdatetqlayout() { emit updateLayout(); }
 
 protected slots:
 	void resetLayout();
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index eb22ed74..3f6417b1 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqslider.h>
 #include <tqpushbutton.h>
@@ -52,7 +52,7 @@ private:
 	ArtsControlApplet *_parent;
 	ArtsActions* _artsactions;
 public:
-	TQBoxLayout *layout;
+	TQBoxLayout *tqlayout;
 	KArtsServer *arts;
 	KArtsDispatcher *dispatcher;
 	Arts::StereoVolumeControl volume;
@@ -63,7 +63,7 @@ public:
 	Arts::StereoVolumeControlGui vu;
 
 	KPopupMenu *menu;
-	KAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
+	KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_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 );
-		_showArtsStatus = _artsactions->actionArtsStatusView();
-		_showArtsStatus->plug( menu );
+		_showArtstqStatus = _artsactions->actionArtsStatusView();
+		_showArtstqStatus->plug( menu );
 		_showMidiManager = _artsactions->actionMidiManagerView();
 		_showMidiManager->plug( menu );
 		_showEnvironment = _artsactions->actionEnvironmentView();
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index eb127d1c..439ab191 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -25,7 +25,7 @@
 #include "choosebusdlg.h"
 
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <klistview.h>
@@ -72,13 +72,13 @@ void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget)
 }
 #endif
 
-void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
+void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*tqlayout*/)
 {
 /************************************************************************
  * From Gui_INSTRUMENT_MAPPER:
  *
  * I am still not sure wether this kind of putting yourself into a parent
- * widget (with own layout etc.) is a good idea (there may not even be
+ * widget (with own tqlayout 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 * /*layout*/)
  * else would be appropriate. Check that. FIXME
  ************************************************************************/
 
-	TQVBoxLayout *mainlayout = new TQVBoxLayout(parent);
-	/*TQHBoxLayout *contentslayout = new TQHBoxLayout;*/
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(parent);
+	/*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/
 
 // list
 
@@ -106,10 +106,10 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
 	TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy,
 								TQT_SLOT(edit(TQListViewItem *)));
 
-	mainlayout->addWidget(listview);
+	maintqlayout->addWidget(listview);
 
-	mainlayout->activate();
-	//mainlayout->freeze();
+	maintqlayout->activate();
+	//maintqlayout->freeze();
 	ParentWidget = parent;
 }
 
diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h
index 39ac8362..6f86778e 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 *layout);
+	void setParent(TQWidget *Parent,TQBoxLayout *tqlayout);
 
 	void edit(TQListViewItem *item);
 public slots:
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index f138436c..29a1bb69 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -23,7 +23,7 @@
 
 #include <artsflow.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
@@ -39,7 +39,7 @@
 using namespace std;
 
 static void min_size(TQWidget *w) {
-  w->setMinimumSize(w->sizeHint());
+  w->setMinimumSize(w->tqsizeHint());
 }
 
 ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
@@ -48,27 +48,27 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 {
 	setCaption(i18n("Choose Bus"));
 
-	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
 
 // caption label: "Synthesis running..."
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *captionlabel = new TQLabel(this);
 	TQFont labelfont(captionlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(TQString(" ")+i18n("Available busses:")+TQString(" "));
-	captionlabel->setAlignment(AlignCenter);
+	captionlabel->tqsetAlignment(AlignCenter);
 	min_size(captionlabel);
-	mainlayout->addWidget(captionlabel);
+	maintqlayout->addWidget(captionlabel);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler2);
+	maintqlayout->addWidget(ruler2);
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 
 // listwidget
 
@@ -89,41 +89,41 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 	if( listbox->count() > 0 )
 		listbox->setCurrentItem( 0 );
 
-	mainlayout->addWidget(listbox);
+	maintqlayout->addWidget(listbox);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(ruler);
+	maintqlayout->addSpacing(5);
 
 // new bus lineedit
 
-	TQBoxLayout * layout2 = new TQHBoxLayout( mainlayout );
-	//mainlayout->addLayout( layout2 );
+	TQBoxLayout * tqlayout2 = new TQHBoxLayout( maintqlayout );
+	//maintqlayout->addLayout( tqlayout2 );
 	TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this );
-	layout2->addWidget( newbuslabel );
+	tqlayout2->addWidget( newbuslabel );
 	lineedit = new KLineEdit( this );
 	connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) );
-	layout2->addWidget( lineedit );
+	tqlayout2->addWidget( lineedit );
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler3 = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler3);
+	maintqlayout->addWidget(ruler3);
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 
 // buttons
 
-	mainlayout->addSpacing(5);
-	TQHBoxLayout *buttonlayout = new TQHBoxLayout( mainlayout );
-	//mainlayout->addLayout(buttonlayout);
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
+	TQHBoxLayout *buttontqlayout = new TQHBoxLayout( maintqlayout );
+	//maintqlayout->addLayout(buttontqlayout);
+	maintqlayout->addSpacing(5);
 
-	buttonlayout->addSpacing(5);
+	buttontqlayout->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->layout();
+	bbox->tqlayout();
 
-	buttonlayout->addWidget(bbox);
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addWidget(bbox);
+	buttontqlayout->addSpacing(5);
 
-	mainlayout->freeze();
+	maintqlayout->freeze();
 }
 
 TQString ChooseBusDlg::result()
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index 447cdce7..f62a5c06 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -34,7 +34,7 @@
 #include <fstream>
 #include <vector>
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #define DEFAULT_ENV_FILENAME "~/default.arts-env"
 
@@ -57,7 +57,7 @@ public:
 		printf("~ItemView()\n");
 	}
 	TQString text() const {
-		return TQString::fromLatin1(item._interfaceName().c_str());
+		return TQString::tqfromLatin1(item._interfaceName().c_str());
 	}
 };
 
@@ -84,11 +84,11 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c
 	connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delItem()));
 
 	TQPushButton *loadButton = new
-		TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this);
+		TQPushButton(i18n("Load %1").tqarg(DEFAULT_ENV_FILENAME), this);
 	connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load()));
 
 	TQPushButton *saveButton = new
-		TQPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this);
+		TQPushButton(i18n("Save %1").tqarg(DEFAULT_ENV_FILENAME), this);
 	connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save()));
 	show();
 }
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index 498c5c78..ab15dc59 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -22,7 +22,7 @@
 
 #include "fftscopeview.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcursor.h>
 #include <tqtimer.h>
 #include <kaction.h>
diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp
index 63213cda..08d9099b 100644
--- a/arts/tools/levelmeters.cpp
+++ b/arts/tools/levelmeters.cpp
@@ -1,4 +1,4 @@
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqfontmetrics.h>
 #include <tqptrlist.h>
@@ -20,7 +20,7 @@ PeakBar::PeakBar(TQWidget *parent)
 	lastValues.setAutoDelete( TRUE );
 	
 	setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
-	setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
 	setBackgroundMode(NoBackground);
 	setMinimumSize(frameWidth()+7, 70);
 }
@@ -30,7 +30,7 @@ void PeakBar::frameChanged() {
 	TQFrame::frameChanged();
 }
 
-TQSize PeakBar::sizeHint() const {
+TQSize PeakBar::tqsizeHint() const {
 	return TQSize(13, 250);
 }
 
@@ -104,7 +104,7 @@ void PeakBar::setValue(float f) {
 		
 	lastValues.append(new Observation(f));
 	
-	repaint();
+	tqrepaint();
 }
 
 // -------------------------------------------------------------
@@ -112,17 +112,17 @@ void PeakBar::setValue(float f) {
 PeakLevelMeters::PeakLevelMeters(TQWidget *parent):
 	StereoLevelMeter(parent), left(this), right(this), scaleView(this)
 {
-	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);
+	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);
 	left.setLineWidth(2);
 	right.setLineWidth(2);
 	scaleView.setScaleMargins(right.frameWidth());
-	setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
 
 	setDbRange(36);
 }
@@ -144,15 +144,15 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) {
 
 ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) {
 	font.setPixelSize(10);
-	setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
+	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
 }
 
 void ScaleView::setDbRange(int db) {
 	dbRange= db;
-	repaint();
+	tqrepaint();
 }
 
-TQSize ScaleView::sizeHint() const {
+TQSize ScaleView::tqsizeHint() const {
 	return TQSize(TQFontMetrics(font).width("-88")+8, 250);
 }
 
@@ -226,9 +226,9 @@ void LedMeter::setValue(float f)
 StereoLedMeters::StereoLedMeters(TQWidget *parent)
 	: StereoLevelMeter(parent), left(this), right(this)
 {
-	TQBoxLayout *layout= new TQHBoxLayout(this);
-	layout->addWidget(&left);
-	layout->addWidget(&right);
+	TQBoxLayout *tqlayout= new TQHBoxLayout(this);
+	tqlayout->addWidget(&left);
+	tqlayout->addWidget(&right);
 }
 	
 void StereoLedMeters::setValues(float leftVal, float rightVal) {
diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h
index 5bb867ab..8046d745 100644
--- a/arts/tools/levelmeters.h
+++ b/arts/tools/levelmeters.h
@@ -94,7 +94,7 @@ protected:
 public:
 	PeakBar(TQWidget *parent);
 	
-	TQSize sizeHint() const;
+	TQSize tqsizeHint() 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 sizeHint() const;
+	TQSize tqsizeHint() const;
 	void drawContents(TQPainter *p);
 };
 
diff --git a/arts/tools/main.h b/arts/tools/main.h
index 7f2fd7a3..41bcccdd 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -32,7 +32,7 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kstdaction.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <artsflow.h>
 #include <soundserver.h>
diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp
index c779ac44..9353cda6 100644
--- a/arts/tools/mediatypesview.cpp
+++ b/arts/tools/mediatypesview.cpp
@@ -21,7 +21,7 @@
 
     */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kartsserver.h>
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 05179e0d..8fe922b7 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 
 #include <kapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqfile.h>
 #include <tqdir.h>
@@ -66,26 +66,26 @@ static TQStringList listFiles(TQString directory, TQString extension)
 MidiInstDlg::MidiInstDlg(TQWidget *parent)
 	:TQDialog(parent,"instrument",TRUE)
 {
-	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
 
 // caption label: title
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *captionlabel = new TQLabel(this);
 	TQFont labelfont(captionlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(TQString(" ")+i18n("Instrument")+TQString(" "));
-	captionlabel->setAlignment(AlignCenter);
+	captionlabel->tqsetAlignment(AlignCenter);
 	//min_size(captionlabel);
-	mainlayout->addWidget(captionlabel);
+	maintqlayout->addWidget(captionlabel);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler2);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(ruler2);
+	maintqlayout->addSpacing(5);
 
 // combobox
 
@@ -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::fromLatin1("instrument_");
+        TQString prefix = TQString::tqfromLatin1("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::fromLatin1("instrument_");
+        TQString prefix = TQString::tqfromLatin1("instrument_");
         if (modname.length() > 9)
             modname.truncate(modname.length()-9);  // kill .arts-map extension
         if (modname.startsWith(prefix))
@@ -116,23 +116,23 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
             //kdDebug() << "inserted map: " << modname.mid(prefix.length()) << endl;
     }
 
-	mainlayout->addWidget(box);
+	maintqlayout->addWidget(box);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(ruler);
+	maintqlayout->addSpacing(5);
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(buttonlayout);
-	mainlayout->addSpacing(5);
+	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(buttontqlayout);
+	maintqlayout->addSpacing(5);
 
-	buttonlayout->addSpacing(5);
+	buttontqlayout->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->layout();
+	bbox->tqlayout();
 
-	buttonlayout->addWidget(bbox);
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addWidget(bbox);
+	buttontqlayout->addSpacing(5);
 
-	mainlayout->freeze();
+	maintqlayout->freeze();
 }
 
 TQCString MidiInstDlg::filename()
@@ -157,12 +157,12 @@ TQCString MidiInstDlg::filename()
     TQStringList::Iterator it;
 
     for ( it = artsPath.begin(); it != artsPath.end(); it++ ) {
-        TQString pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts");
+        TQString pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts");
         TQFileInfo fi(pathname);
         if (fi.exists() && fi.isReadable())
             return TQFile::encodeName(pathname);
 
-        pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts-map");
+        pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".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 0c51d419..3f137dea 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -29,7 +29,7 @@
 #undef protected
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <stdio.h>
 #include <kaction.h>
@@ -96,8 +96,8 @@ public:
 					conn != item->info.connections.end(); conn++)
 			{
 				MidiManagerItem *outitem = v->itemMap[*conn];
-				TQRect r1 = v->widget->inputsListBox->itemRect(item);
-				TQRect r2 = v->widget->outputsListBox->itemRect(outitem);
+				TQRect r1 = v->widget->inputsListBox->tqitemRect(item);
+				TQRect r2 = v->widget->outputsListBox->tqitemRect(outitem);
 
 				if(r1.height() > 0 && r2.height() > 0)
 				{
@@ -185,7 +185,7 @@ void MidiManagerView::updateLists()
 		widget->inputsListBox->setSelected(itemMap[srcID],true);
 	if(destID && itemMap[destID])
 		widget->outputsListBox->setSelected(itemMap[destID],true);
-	connectionWidget->repaint();
+	connectionWidget->tqrepaint();
 }
 
 void MidiManagerView::slotConnect()
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 39919f1a..1c46d9e5 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 
 #include <kapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <kseparator.h>
 #include <kbuttonbox.h>
@@ -34,26 +34,26 @@
 
 MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,TRUE)
 {
-	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
 
 // caption label: title
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *captionlabel = new TQLabel(this);
 	TQFont labelfont(captionlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(i18n("OSS MIDI Port"));
-	captionlabel->setAlignment(AlignCenter);
+	captionlabel->tqsetAlignment(AlignCenter);
 	//min_size(captionlabel);
-	mainlayout->addWidget(captionlabel);
+	maintqlayout->addWidget(captionlabel);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler2);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(ruler2);
+	maintqlayout->addSpacing(5);
 
 // editwidget
 
@@ -61,23 +61,23 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
 	edit->setText(oldname);
 	//min_size(edit);
 
-	mainlayout->addWidget(edit);
+	maintqlayout->addWidget(edit);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(ruler);
+	maintqlayout->addSpacing(5);
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(buttonlayout);
-	mainlayout->addSpacing(5);
+	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(buttontqlayout);
+	maintqlayout->addSpacing(5);
 
-	buttonlayout->addSpacing(5);
+	buttontqlayout->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->layout();
+	bbox->tqlayout();
 
-	buttonlayout->addWidget(bbox);
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addWidget(bbox);
+	buttontqlayout->addSpacing(5);
 
-	mainlayout->freeze();
+	maintqlayout->freeze();
 }
 
 const char *MidiPortDlg::device()
diff --git a/arts/tools/midiportdlg.h b/arts/tools/midiportdlg.h
index a49d7f01..59cb4f0f 100644
--- a/arts/tools/midiportdlg.h
+++ b/arts/tools/midiportdlg.h
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqscrollbar.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 class MidiPortDlg :public TQDialog {
 	Q_OBJECT
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index fdcd6c8f..37d8cbe2 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -21,7 +21,7 @@
 
     */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
 #include <tqwidget.h>
@@ -41,7 +41,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con
 	TQBoxLayout *l= new TQVBoxLayout(this);
 	//l->setAutoAdd(TRUE);
 
-	RealtimeStatus rs= server.realtimeStatus();
+	RealtimetqStatus rs= server.realtimetqStatus();
 	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(updateStatus()));
+	connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatetqStatus()));
 	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::updateStatus()
+void ArtsStatusView::updatetqStatus()
 {
 	long seconds= server.secondsUntilSuspend();
 	if (seconds<0)
diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h
index 37487588..59f757c2 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 updateStatus();
+	void updatetqStatus();
 	void suspendButtonClicked();
 	
 protected: