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

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.

321 files changed, 1535 insertions, 1535 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:
diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp
index 5b9f3b86..711c1275 100644
--- a/juk/advancedsearchdialog.cpp
+++ b/juk/advancedsearchdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbuttongroup.h>
 
 #include "collectionlist.h"
diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp
index eb1b5d42..2816f85e 100644
--- a/juk/collectionlist.cpp
+++ b/juk/collectionlist.cpp
@@ -162,7 +162,7 @@ void CollectionList::slotRefreshItems(const KFileItemList &items)
 	    // If the item is no longer on disk, remove it from the collection.
 
 	    if(item->file().fileInfo().exists())
-		item->repaint();
+		item->tqrepaint();
 	    else
 		clearItem(item);
 	}
@@ -392,13 +392,13 @@ void CollectionListItem::refresh()
     file().coverInfo()->setCover();
 
     if(listView()->isVisible())
-	repaint();
+	tqrepaint();
 
-    for(PlaylistItemList::Iterator it = m_children.begin(); it != m_children.end(); ++it) {
+    for(PlaylistItemList::Iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) {
 	(*it)->playlist()->update();
 	(*it)->playlist()->dataChanged();
 	if((*it)->listView()->isVisible())
-	    (*it)->repaint();
+	    (*it)->tqrepaint();
     }
 
     CollectionList::instance()->dataChanged();
@@ -411,7 +411,7 @@ PlaylistItem *CollectionListItem::itemForPlaylist(const Playlist *playlist)
 	return this;
 
     PlaylistItemList::ConstIterator it;
-    for(it = m_children.begin(); it != m_children.end(); ++it)
+    for(it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
 	if((*it)->playlist() == playlist)
 	    return *it;
     return 0;
@@ -428,11 +428,11 @@ void CollectionListItem::updateCollectionDict(const TQString &oldPath, const TQS
     collection->addToDict(newPath, this);
 }
 
-void CollectionListItem::repaint() const
+void CollectionListItem::tqrepaint() const
 {
-    TQListViewItem::repaint();
-    for(PlaylistItemList::ConstIterator it = m_children.begin(); it != m_children.end(); ++it)
-	(*it)->repaint();
+    TQListViewItem::tqrepaint();
+    for(PlaylistItemList::ConstIterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+	(*it)->tqrepaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -468,8 +468,8 @@ CollectionListItem::~CollectionListItem()
 {
     m_shuttingDown = true;
 
-    for(PlaylistItemList::ConstIterator it = m_children.begin();
-	it != m_children.end();
+    for(PlaylistItemList::ConstIterator it = m_tqchildren.begin();
+	it != m_tqchildren.end();
 	++it)
     {
         (*it)->playlist()->clearItem(*it);
@@ -486,13 +486,13 @@ CollectionListItem::~CollectionListItem()
 
 void CollectionListItem::addChildItem(PlaylistItem *child)
 {
-    m_children.append(child);
+    m_tqchildren.append(child);
 }
 
 void CollectionListItem::removeChildItem(PlaylistItem *child)
 {
     if(!m_shuttingDown)
-	m_children.remove(child);
+	m_tqchildren.remove(child);
 }
 
 bool CollectionListItem::checkCurrent()
diff --git a/juk/collectionlist.h b/juk/collectionlist.h
index 8ddab9a6..e26a8c3a 100644
--- a/juk/collectionlist.h
+++ b/juk/collectionlist.h
@@ -21,7 +21,7 @@
 #include <kfileitem.h>
 
 #include <tqdict.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqvaluevector.h>
 
 #include "playlist.h"
@@ -96,7 +96,7 @@ public:
     virtual bool canReload() const { return true; }
 
 public slots:
-    virtual void paste() { decode(kapp->clipboard()->data()); }
+    virtual void paste() { decode(kapp->tqclipboard()->data()); }
     virtual void clear();
     void slotCheckCache();
 
@@ -172,8 +172,8 @@ public:
     virtual void refresh();
     PlaylistItem *itemForPlaylist(const Playlist *playlist);
     void updateCollectionDict(const TQString &oldPath, const TQString &newPath);
-    void repaint() const;
-    PlaylistItemList children() const { return m_children; }
+    void tqrepaint() const;
+    PlaylistItemList tqchildren() const { return m_tqchildren; }
 
 protected:
     CollectionListItem(const FileHandle &file);
@@ -192,7 +192,7 @@ protected:
 
 private:
     bool m_shuttingDown;
-    PlaylistItemList m_children;
+    PlaylistItemList m_tqchildren;
 };
 
 #endif
diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui
index dbdcda9c..a94fac63 100644
--- a/juk/coverdialogbase.ui
+++ b/juk/coverdialogbase.ui
@@ -50,7 +50,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>164</width>
                     <height>0</height>
@@ -65,7 +65,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -73,7 +73,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/juk/covericonview.cpp b/juk/covericonview.cpp
index fc400e78..58b5a2b9 100644
--- a/juk/covericonview.cpp
+++ b/juk/covericonview.cpp
@@ -22,7 +22,7 @@ CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *parent) :
     KIconViewItem(parent), m_id(id)
 {
     CoverDataPtr data = CoverManager::coverInfo(id);
-    setText(TQString("%1 - %2").arg(data->artist, data->album));
+    setText(TQString("%1 - %2").tqarg(data->artist, data->album));
     setPixmap(data->thumbnail());
 }
 
diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp
index 52e0d4ae..2ae531bc 100644
--- a/juk/coverinfo.cpp
+++ b/juk/coverinfo.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 
 #include <tqregexp.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcursor.h>
 
@@ -34,10 +34,10 @@ struct CoverPopup : public TQWidget
     CoverPopup(const TQPixmap &image, const TQPoint &p) :
         TQWidget(0, 0, WDestructiveClose | WX11BypassWM)
     {
-        TQHBoxLayout *layout = new TQHBoxLayout(this);
+        TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
         TQLabel *label = new TQLabel(this);
 
-        layout->addWidget(label);
+        tqlayout->addWidget(label);
         label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
         label->setLineWidth(1);
         label->setPixmap(image);
diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp
index 59c488d2..7cd3d014 100644
--- a/juk/covermanager.cpp
+++ b/juk/covermanager.cpp
@@ -269,7 +269,7 @@ const char *CoverDrag::format(int i) const
     return 0;
 }
 
-TQByteArray CoverDrag::encodedData(const char *mimetype) const
+TQByteArray CoverDrag::tqencodedData(const char *mimetype) const
 {
     if(qstrcmp(CoverDrag::mimetype, mimetype) == 0) {
         TQByteArray data;
@@ -303,7 +303,7 @@ bool CoverDrag::decode(const TQMimeSource *e, coverKey &id)
     if(!canDecode(e))
         return false;
 
-    TQByteArray data = e->encodedData(mimetype);
+    TQByteArray data = e->tqencodedData(mimetype);
     TQDataStream ds(data, IO_ReadOnly);
     TQ_UINT32 i;
 
@@ -395,7 +395,7 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c
 
     // Save it to file first!
 
-    TQString ext = TQString("/coverdb/coverID-%1.png").arg(id);
+    TQString ext = TQString("/coverdb/coverID-%1.png").tqarg(id);
     coverData->path = KGlobal::dirs()->saveLocation("appdata") + ext;
 
     kdDebug() << "Saving pixmap to " << coverData->path << endl;
@@ -413,8 +413,8 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c
     data()->covers[id] = coverData;
 
     // Make sure the new cover isn't inadvertently cached.
-    data()->pixmapCache.remove(TQString("f%1").arg(coverData->path));
-    data()->pixmapCache.remove(TQString("t%1").arg(coverData->path));
+    data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path));
+    data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path));
 
     return id;
 }
@@ -436,8 +436,8 @@ bool CoverManager::removeCover(coverKey id)
 
     // Remove cover from cache.
     CoverDataPtr coverData = coverInfo(id);
-    data()->pixmapCache.remove(TQString("f%1").arg(coverData->path));
-    data()->pixmapCache.remove(TQString("t%1").arg(coverData->path));
+    data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path));
+    data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path));
 
     // Remove references to files that had that track ID.
     TQDictIterator<coverKey> it(data()->tracks);
@@ -462,8 +462,8 @@ bool CoverManager::replaceCover(coverKey id, const TQPixmap &large)
     CoverDataPtr coverData = coverInfo(id);
 
     // Empty old pixmaps from cache.
-    data()->pixmapCache.remove(TQString("%1%2").arg("t", coverData->path));
-    data()->pixmapCache.remove(TQString("%1%2").arg("f", coverData->path));
+    data()->pixmapCache.remove(TQString("%1%2").tqarg("t", coverData->path));
+    data()->pixmapCache.remove(TQString("%1%2").tqarg("f", coverData->path));
 
     large.save(coverData->path, "PNG");
     return true;
diff --git a/juk/covermanager.h b/juk/covermanager.h
index 61ecc567..b5c5d6e7 100644
--- a/juk/covermanager.h
+++ b/juk/covermanager.h
@@ -68,7 +68,7 @@ public:
     CoverDrag(coverKey id, TQWidget *src);
 
     virtual const char *format(int i) const;
-    virtual TQByteArray encodedData(const char *mimetype) const;
+    virtual TQByteArray tqencodedData(const char *mimetype) const;
 
     void setId(coverKey id) { m_id = id; }
 
diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp
index 61f21a80..e780eec0 100644
--- a/juk/deletedialog.cpp
+++ b/juk/deletedialog.cpp
@@ -22,7 +22,7 @@
 
 #include <tqstringlist.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui
index 2a7837af..50e13fe7 100644
--- a/juk/deletedialogbase.ui
+++ b/juk/deletedialogbase.ui
@@ -12,7 +12,7 @@
             <height>374</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>420</width>
             <height>320</height>
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -48,7 +48,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -61,7 +61,7 @@
                             <property name="text">
                                 <string>Are you sure that you want to remove these items?</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -72,7 +72,7 @@
                             <property name="text">
                                 <string>Deletion method placeholder, never shown to user.</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -101,7 +101,7 @@
             <property name="text">
                 <string>Placeholder for number of files, not in GUI</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp
index 43df3dda..ceb0d71d 100644
--- a/juk/directorylist.cpp
+++ b/juk/directorylist.cpp
@@ -50,9 +50,9 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis
 
     m_base->importPlaylistsCheckBox->setChecked(importPlaylists);
 
-    TQSize sz = sizeHint();
+    TQSize sz = tqsizeHint();
     setMinimumSize(kMax(350, sz.width()), kMax(250, sz.height()));
-    resize(sizeHint());
+    resize(tqsizeHint());
 }
 
 DirectoryList::~DirectoryList()
diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui
index 02aae023..64a23800 100644
--- a/juk/directorylistbase.ui
+++ b/juk/directorylistbase.ui
@@ -63,7 +63,7 @@
                     <property name="text">
                         <string>These folders will be scanned on startup for new files.</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -77,7 +77,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp
index ab688793..e365546a 100644
--- a/juk/exampleoptions.cpp
+++ b/juk/exampleoptions.cpp
@@ -17,7 +17,7 @@
 #include <klocale.h>
 
 #include <tqradiobutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "exampleoptions.h"
 
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index e4ddee28..6f479313 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -44,7 +44,7 @@
 #include <tqcheckbox.h>
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsignalmapper.h>
 #include <tqheader.h>
 
@@ -232,7 +232,7 @@ FileRenamerWidget::FileRenamerWidget(TQWidget *parent) :
     m_exampleText->setPaletteBackgroundColor(temp->paletteBackgroundColor());
     delete temp;
 
-    layout()->setMargin(0); // We'll be wrapped by KDialogBase
+    tqlayout()->setMargin(0); // We'll be wrapped by KDialogBase
     
     // This must be created before createTagRows() is called.
 
@@ -352,10 +352,10 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
     downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
     downMapper->setMapping(TQT_TQOBJECT(row.downButton), id);
 
-    TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category));
+    TQString labelText = TQString("<b>%1</b>").tqarg(TagRenamerOptions::tagTypeText(category));
     TQLabel *label = new TQLabel(labelText, frame);
     frame->setStretchFactor(label, 1);
-    label->setAlignment(AlignCenter);
+    label->tqsetAlignment(AlignCenter);
 
     TQVBox *options = new TQVBox(frame);
     row.enableButton = new KPushButton(i18n("Remove"), options);
@@ -410,7 +410,7 @@ bool FileRenamerWidget::removeRow(unsigned id)
     if(m_rows[id].position > 0)
         checkboxPosition = m_rows[id].position - 1;
 
-    // The checkbox is contained within a layout widget, so the layout
+    // The checkbox is contained within a tqlayout widget, so the tqlayout
     // widget is the one the needs to die.
     delete m_folderSwitches[checkboxPosition]->parent();
     m_folderSwitches.erase(&m_folderSwitches[checkboxPosition]);
@@ -675,17 +675,17 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction)
     // Move the item two spaces above/below its previous position.  It has to
     // be 2 spaces because of the checkbox.
 
-    TQBoxLayout *layout = dynamic_cast<TQBoxLayout *>(m_mainFrame->layout());
+    TQBoxLayout *tqlayout = dynamic_cast<TQBoxLayout *>(m_mainFrame->tqlayout());
 
-    layout->remove(l);
-    layout->insertWidget(2 * newPos, l);
+    tqlayout->remove(l);
+    tqlayout->insertWidget(2 * newPos, l);
 
     // Move the top item two spaces in the opposite direction, for a similar
     // reason.
 
-    layout->remove(w);
-    layout->insertWidget(2 * pos, w);
-    layout->invalidate();
+    tqlayout->remove(w);
+    tqlayout->insertWidget(2 * pos, w);
+    tqlayout->tqinvalidate();
 
     TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged()));
 }
@@ -778,7 +778,7 @@ void FileRenamerWidget::insertCategory()
     // Set its down button to be disabled.
     m_rows[id].downButton->setEnabled(false);
 
-    m_mainFrame->layout()->invalidate();
+    m_mainFrame->tqlayout()->tqinvalidate();
     m_mainView->update();
 
     // Now update according to the code in loadConfig().
@@ -875,7 +875,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
             setFolderIcon(it.data(), itemMap[it.key()]);
         }
         else
-            errorFiles << i18n("%1 to %2").arg(it.key()).arg(it.data());
+            errorFiles << i18n("%1 to %2").tqarg(it.key()).tqarg(it.data());
 
         processEvents();
     }
@@ -952,7 +952,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item)
             config.setGroup("Desktop Entry");
 
             if(!config.hasKey("Icon")) {
-                config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").arg(path));
+                config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").tqarg(path));
                 config.sync();
             }
 
diff --git a/juk/filerenamer.h b/juk/filerenamer.h
index 46f17bf0..93f4e4cb 100644
--- a/juk/filerenamer.h
+++ b/juk/filerenamer.h
@@ -61,7 +61,7 @@ struct Row
 /**
  * A list of rows, each of which may have its own category options and other
  * associated data.  There is no relation between the order of rows in the vector and their
- * GUI layout.  Instead, each Row has a position member which indicates what GUI position it
+ * GUI tqlayout.  Instead, each Row has a position member which indicates what GUI position it
  * takes up.  The index into the vector is known as the row identifier (which is unique but
  * not necessarily constant).
  */
@@ -186,7 +186,7 @@ private:
 
     /**
      * This function adds a "Insert Folder separator" checkbox to the end of
-     * the current layout.  The setting defaults to being unchecked.
+     * the current tqlayout.  The setting defaults to being unchecked.
      */
     void addFolderSeparatorCheckbox();
 
@@ -336,7 +336,7 @@ private:
     /**
      * This moves the widget \p l in the direction given by \p direction, taking
      * care to make sure that the checkboxes are not moved, and that they are
-     * enabled or disabled as appropriate for the new layout, and that the up and
+     * enabled or disabled as appropriate for the new tqlayout, and that the up and
      * down buttons are also adjusted as necessary.
      *
      * @param id the identifier of the row to move
@@ -427,14 +427,14 @@ private slots:
     virtual void slotRemoveRow(int id);
 
     /**
-     * This function moves \p category up in the layout.
+     * This function moves \p category up in the tqlayout.
      *
      * @param id the unique id of the widget to move up.
      */
     virtual void moveItemUp(int id);
 
     /**
-     * This function moves \p category down in the layout.
+     * This function moves \p category down in the tqlayout.
      *
      * @param id the unique id of the widget to move down.
      */
diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui
index d7abb413..dfd5d0fd 100644
--- a/juk/filerenamerbase.ui
+++ b/juk/filerenamerbase.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -68,7 +68,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="1">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -216,7 +216,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -232,7 +232,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -257,7 +257,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -295,7 +295,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp
index 2db9e26d..d800d2e2 100644
--- a/juk/filerenameroptions.cpp
+++ b/juk/filerenameroptions.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <knuminput.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqradiobutton.h>
 #include <tqlineedit.h>
@@ -29,28 +29,28 @@ FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent,
                                              const TagRenamerOptions &options) :
     FileRenamerTagOptionsBase(parent), m_options(options)
 {
-    layout()->setSpacing(KDialog::spacingHint());
-    layout()->setMargin(0);
+    tqlayout()->setSpacing(KDialog::spacingHint());
+    tqlayout()->setMargin(0);
 
-    m_emptyTagGroup->layout()->setSpacing(KDialog::spacingHint());
-    m_trackGroup->layout()->setSpacing(KDialog::spacingHint());
+    m_emptyTagGroup->tqlayout()->setSpacing(KDialog::spacingHint());
+    m_trackGroup->tqlayout()->setSpacing(KDialog::spacingHint());
     m_emptyValueLayout->setSpacing(KDialog::spacingHint());
     m_exampleLayout->setSpacing(KDialog::spacingHint());
     m_spinLayout->setSpacing(KDialog::spacingHint());
     m_widthLayout->setSpacing(KDialog::spacingHint());
     m_tagLayout->setSpacing(KDialog::spacingHint());
-    m_tagFormatGroup->layout()->setSpacing(KDialog::spacingHint());
+    m_tagFormatGroup->tqlayout()->setSpacing(KDialog::spacingHint());
 
     if(m_options.category() != Track)
         m_trackGroup->hide();
 
     TQString tagText = m_options.tagTypeText();
 
-    setCaption(caption().arg(tagText));
-    m_tagFormatGroup->setTitle(m_tagFormatGroup->title().arg(tagText));
-    m_emptyTagGroup->setTitle(m_emptyTagGroup->title().arg(tagText));
-    m_description->setText(m_description->text().arg(tagText));
-    m_tagLabel->setText(m_tagLabel->text().arg(tagText));
+    setCaption(caption().tqarg(tagText));
+    m_tagFormatGroup->setTitle(m_tagFormatGroup->title().tqarg(tagText));
+    m_emptyTagGroup->setTitle(m_emptyTagGroup->title().tqarg(tagText));
+    m_description->setText(m_description->text().tqarg(tagText));
+    m_tagLabel->setText(m_tagLabel->text().tqarg(tagText));
 
     m_prefixText->setText(options.prefix());
     m_suffixText->setText(options.suffix());
diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui
index d90953c0..265685dc 100644
--- a/juk/filerenameroptionsbase.ui
+++ b/juk/filerenameroptionsbase.ui
@@ -40,7 +40,7 @@
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignCenter</set>
                     </property>
                 </widget>
@@ -65,7 +65,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -76,7 +76,7 @@
                             <property name="name">
                                 <cstring>m_prefixText</cstring>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignRight</set>
                             </property>
                         </widget>
@@ -92,7 +92,7 @@
                             <property name="name">
                                 <cstring>m_suffixText</cstring>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignLeft</set>
                             </property>
                         </widget>
@@ -106,7 +106,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -127,7 +127,7 @@
                     <property name="text">
                         <string>Substitution Example</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -218,7 +218,7 @@
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignCenter</set>
                     </property>
                 </widget>
@@ -315,7 +315,7 @@
                                     <property name="text">
                                         <string>3 -&gt;</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                 </widget>
@@ -326,7 +326,7 @@
                                     <property name="text">
                                         <string>14 -&gt;</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                 </widget>
@@ -346,7 +346,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp
index 204197c0..a9bded13 100644
--- a/juk/historyplaylist.cpp
+++ b/juk/historyplaylist.cpp
@@ -92,14 +92,14 @@ void HistoryPlaylist::slotCreateNewItem()
 
 HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) :
     PlaylistItem(item, parent, after),
-    m_dateTime(TQDateTime::currentDateTime())
+    m_dateTime(TQDateTime::tqcurrentDateTime())
 {
     setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
 }
 
 HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) :
     PlaylistItem(item, parent),
-    m_dateTime(TQDateTime::currentDateTime())
+    m_dateTime(TQDateTime::tqcurrentDateTime())
 {
     setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
 }
diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp
index 09a77546..3838d8bc 100644
--- a/juk/ktrm.cpp
+++ b/juk/ktrm.cpp
@@ -43,7 +43,7 @@ class KTRMLookup;
 extern "C"
 {
 #if HAVE_MUSICBRAINZ >= 4
-    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status);
+    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFiletqStatus status);
 #else
     static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
 #endif
@@ -205,14 +205,14 @@ private:
 class KTRMEvent : public TQCustomEvent
 {
 public:
-    enum Status {
+    enum tqStatus {
         Recognized,
         Unrecognized,
         Collision,
         Error
     };
 
-    KTRMEvent(int fileId, Status status) :
+    KTRMEvent(int fileId, tqStatus status) :
         TQCustomEvent(id),
         m_fileId(fileId),
         m_status(status) {}
@@ -222,7 +222,7 @@ public:
         return m_fileId;
     }
 
-    Status status() const
+    tqStatus status() const
     {
         return m_status;
     }
@@ -231,7 +231,7 @@ public:
 
 private:
     int m_fileId;
-    Status m_status;
+    tqStatus m_status;
 };
 
 /**
@@ -242,7 +242,7 @@ private:
 class KTRMEventHandler : public TQObject
 {
 public:
-    static void send(int fileId, KTRMEvent::Status status)
+    static void send(int fileId, KTRMEvent::tqStatus status)
     {
         KApplication::postEvent(instance(), new KTRMEvent(fileId, status));
     }
@@ -303,7 +303,7 @@ protected:
  * Callback fuction for TunePimp lookup events.
  */
 #if HAVE_MUSICBRAINZ >= 4
-static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFileStatus status)
+static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFiletqStatus status)
 #else
 static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId)
 #endif
@@ -313,7 +313,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type,
 
 #if HAVE_MUSICBRAINZ < 4
     track_t track = tp_GetTrack(pimp, fileId);
-    TPFileStatus status = tr_GetStatus(track);
+    TPFiletqStatus status = tr_GettqStatus(track);
 #endif
 
     switch(status) {
@@ -496,7 +496,7 @@ void KTRMLookup::unrecognized()
     tr_Lock(track);
     tr_GetTRM(track, trm, 255);
     if ( !trm[0] ) {
-        tr_SetStatus(track, ePending);
+        tr_SettqStatus(track, ePending);
         tp_Wake(KTRMRequestHandler::instance()->tunePimp(), track);
     }
     else
diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp
index c87a883c..6a6eb45e 100644
--- a/juk/musicbrainzquery.cpp
+++ b/juk/musicbrainzquery.cpp
@@ -68,7 +68,7 @@ void MusicBrainzLookup::error()
 void MusicBrainzLookup::message(const TQString &s) const
 {
     KMainWindow *w = static_cast<KMainWindow *>(kapp->mainWidget());
-    w->statusBar()->message(TQString("%1 (%2)").arg(s).arg(m_file.fileInfo().fileName()), 3000);
+    w->statusBar()->message(TQString("%1 (%2)").tqarg(s).tqarg(m_file.fileInfo().fileName()), 3000);
 }
 
 void MusicBrainzLookup::confirmation()
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index e553127e..8e14f1e9 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -20,7 +20,7 @@
 #include <kio/netaccess.h>
 
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqevent.h>
 #include <tqdragobject.h>
 #include <tqimage.h>
@@ -58,9 +58,9 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c
 
     CollectionList::instance()->addObserver(&m_observer);
 
-    layout()->setMargin(5);
-    layout()->setSpacing(3);
-    setFixedHeight(imageSize + 2 + layout()->margin() * 2);
+    tqlayout()->setMargin(5);
+    tqlayout()->setSpacing(3);
+    setFixedHeight(imageSize + 2 + tqlayout()->margin() * 2);
 
     setStretchFactor(new CoverItem(this), 0);
     setStretchFactor(new TrackItem(this), 2);
@@ -109,7 +109,7 @@ CoverItem::CoverItem(NowPlaying *parent) :
     TQLabel(parent, "CoverItem"),
     NowPlayingItem(parent)
 {
-    setFixedHeight(parent->height() - parent->layout()->margin() * 2);
+    setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
     setFrameStyle(Box | Plain);
     setLineWidth(1);
     setMargin(1);
@@ -218,17 +218,17 @@ TrackItem::TrackItem(NowPlaying *parent) :
     TQWidget(parent, "TrackItem"),
     NowPlayingItem(parent)
 {
-    setFixedHeight(parent->height() - parent->layout()->margin() * 2);
-    setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+    setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
+    tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
 
     m_label = new LinkLabel(this);
     m_label->setLinkUnderline(false);
 
-    layout->addStretch();
-    layout->addWidget(m_label);
-    layout->addStretch();
+    tqlayout->addStretch();
+    tqlayout->addWidget(m_label);
+    tqlayout->addStretch();
 
     connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this,
             TQT_SLOT(slotOpenLink(const TQString &)));
@@ -270,13 +270,13 @@ void TrackItem::slotUpdate()
         "<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>";
 
     if(NowPlayingItem::parent()->collection()->showMoreActive())
-        format.append(TQString(" (<a href=\"clear\">%1</a>)").arg(i18n("back to playlist")));
+        format.append(TQString(" (<a href=\"clear\">%1</a>)").tqarg(i18n("back to playlist")));
 
     format.append("</font>");
 
     do {
-        m_label->setText(format.arg(size).arg(title).arg(size - 2)
-                         .arg(artist).arg(separator).arg(album));
+        m_label->setText(format.tqarg(size).tqarg(title).tqarg(size - 2)
+                         .tqarg(artist).tqarg(separator).tqarg(album));
         --size;
     } while(m_label->heightForWidth(m_label->width()) > imageSize && size >= 0);
 
@@ -291,10 +291,10 @@ HistoryItem::HistoryItem(NowPlaying *parent) :
     LinkLabel(parent, "HistoryItem"),
     NowPlayingItem(parent)
 {
-    setFixedHeight(parent->height() - parent->layout()->margin() * 2);
-    setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+    setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
+    tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
     setLinkUnderline(false);
-    setText(TQString("<b>%1</b>").arg(i18n("History")));
+    setText(TQString("<b>%1</b>").tqarg(i18n("History")));
 
     m_timer = new TQTimer(this);
     connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying()));
@@ -309,14 +309,14 @@ void HistoryItem::update(const FileHandle &file)
         m_history.remove(m_history.fromLast());
 
     TQString format = "<br /><a href=\"%1\"><font size=\"-1\">%2</font></a>";
-    TQString current = TQString("<b>%1</b>").arg(i18n("History"));
+    TQString current = TQString("<b>%1</b>").tqarg(i18n("History"));
     TQString previous;
 
     for(TQValueList<Item>::ConstIterator it = m_history.begin();
         it != m_history.end(); ++it)
     {
         previous = current;
-        current.append(format.arg((*it).anchor).arg(TQStyleSheet::escape((*it).file.tag()->title())));
+        current.append(format.tqarg((*it).anchor).tqarg(TQStyleSheet::escape((*it).file.tag()->title())));
         setText(current);
         if(heightForWidth(width()) > imageSize) {
             setText(previous);
diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp
index 0ecc9e84..db01392c 100644
--- a/juk/playermanager.cpp
+++ b/juk/playermanager.cpp
@@ -46,7 +46,7 @@
 
 using namespace ActionCollection;
 
-enum PlayerManagerStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 };
+enum PlayerManagertqStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // helper functions
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 047bba00..41f18228 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -102,7 +102,7 @@ public:
 	   (column == m_playlist->columnOffset() + PlaylistItem::CoverColumn &&
 	    item->file().coverInfo()->hasCover()))
 	{
-	    TQRect r = m_playlist->itemRect(item);
+	    TQRect r = m_playlist->tqitemRect(item);
 	    int headerPosition = m_playlist->header()->sectionPos(column);
 	    r.setLeft(headerPosition);
 	    r.setRight(headerPosition + m_playlist->header()->sectionSize(column));
@@ -543,7 +543,7 @@ void Playlist::save()
     TQFile file(m_fileName);
 
     if(!file.open(IO_WriteOnly))
-	return KMessageBox::error(this, i18n("Could not save to file %1.").arg(m_fileName));
+	return KMessageBox::error(this, i18n("Could not save to file %1.").tqarg(m_fileName));
 
     TQTextStream stream(&file);
 
@@ -727,12 +727,12 @@ void Playlist::synchronizePlayingItems(const PlaylistList &sources, bool setMast
 
 void Playlist::copy()
 {
-    kapp->clipboard()->setData(dragObject(0), TQClipboard::Clipboard);
+    kapp->tqclipboard()->setData(dragObject(0), TQClipboard::Clipboard);
 }
 
 void Playlist::paste()
 {
-    decode(kapp->clipboard()->data(), static_cast<PlaylistItem *>(currentItem()));
+    decode(kapp->tqclipboard()->data(), static_cast<PlaylistItem *>(currentItem()));
 }
 
 void Playlist::clear()
@@ -2127,7 +2127,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c
 
     if(showEdit)
 	m_rmbMenu->changeItem(m_rmbEditID,
-		i18n("Edit '%1'").arg(columnText(column + columnOffset())));
+		i18n("Edit '%1'").tqarg(columnText(column + columnOffset())));
 
     m_rmbMenu->setItemVisible(m_rmbEditID, showEdit);
 
diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp
index f3701edb..d0e82d27 100644
--- a/juk/playlistbox.cpp
+++ b/juk/playlistbox.cpp
@@ -208,7 +208,7 @@ void PlaylistBox::duplicate()
 void PlaylistBox::paste()
 {
     Item *i = static_cast<Item *>(currentItem());
-    decode(kapp->clipboard()->data(), i);
+    decode(kapp->tqclipboard()->data(), i);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -445,7 +445,7 @@ void PlaylistBox::contentsDropEvent(TQDropEvent *e)
     if(m_dropItem) {
 	Item *old = m_dropItem;
 	m_dropItem = 0;
-	old->repaint();
+	old->tqrepaint();
     }
 }
 
@@ -493,14 +493,14 @@ void PlaylistBox::contentsDragMoveEvent(TQDragMoveEvent *e)
 
 	    if(e->isAccepted()) {
 		m_dropItem = target;
-		target->repaint();
+		target->tqrepaint();
 		m_showTimer->start(1500, true);
 	    }
 	    else
 		m_dropItem = 0;
 
 	    if(old)
-		old->repaint();
+		old->tqrepaint();
 	}
     }
     else {
@@ -517,7 +517,7 @@ void PlaylistBox::contentsDragLeaveEvent(TQDragLeaveEvent *e)
     if(m_dropItem) {
 	Item *old = m_dropItem;
 	m_dropItem = 0;
-	old->repaint();
+	old->tqrepaint();
     }
     KListView::contentsDragLeaveEvent(e);
 }
@@ -722,10 +722,10 @@ int PlaylistBox::Item::compare(TQListViewItem *i, int col, bool) const
     return text(col).lower().localeAwareCompare(i->text(col).lower());
 }
 
-void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &colorGroup, int column, int width, int align)
+void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &tqcolorGroup, int column, int width, int align)
 {
     PlaylistBox *playlistBox = static_cast<PlaylistBox *>(listView());
-    playlistBox->viewMode()->paintCell(this, painter, colorGroup, column, width, align);
+    playlistBox->viewMode()->paintCell(this, painter, tqcolorGroup, column, width, align);
 }
 
 void PlaylistBox::Item::setText(int column, const TQString &text)
diff --git a/juk/playlistbox.h b/juk/playlistbox.h
index 42003634..793ae654 100644
--- a/juk/playlistbox.h
+++ b/juk/playlistbox.h
@@ -162,7 +162,7 @@ protected:
     void setSortedFirst(bool first = true) { m_sortedFirst = first; }
 
     virtual int compare(TQListViewItem *i, int col, bool) const;
-    virtual void paintCell(TQPainter *p, const TQColorGroup &colorGroup, int column, int width, int align);
+    virtual void paintCell(TQPainter *p, const TQColorGroup &tqcolorGroup, int column, int width, int align);
     virtual void paintFocus(TQPainter *, const TQColorGroup &, const TQRect &) {}
     virtual void setText(int column, const TQString &text);
 
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index 0b0a5c50..95ac971a 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -747,11 +747,11 @@ TQString PlaylistCollection::uniquePlaylistName(const TQString &suggest) const
     base.remove(TQRegExp("\\s\\([0-9]+\\)$"));
 
     int count = 1;
-    TQString s = TQString("%1 (%2)").arg(base).arg(count);
+    TQString s = TQString("%1 (%2)").tqarg(base).tqarg(count);
 
     while(m_playlistNames.contains(s)) {
         count++;
-        s = TQString("%1 (%2)").arg(base).arg(count);
+        s = TQString("%1 (%2)").tqarg(base).tqarg(count);
     }
 
     return s;
diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp
index 2a9a2412..81aad977 100644
--- a/juk/playlistitem.cpp
+++ b/juk/playlistitem.cpp
@@ -272,10 +272,10 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
     if(!m_playingItems.contains(this))
 	return KListViewItem::paintCell(p, cg, column, width, align);
 
-    TQColorGroup colorGroup = cg;
+    TQColorGroup tqcolorGroup = cg;
 
-    TQColor base = colorGroup.base();
-    TQColor selection = colorGroup.highlight();
+    TQColor base = tqcolorGroup.base();
+    TQColor selection = tqcolorGroup.highlight();
 
     int r = (base.red() + selection.red()) / 2;
     int b = (base.blue() + selection.blue()) / 2;
@@ -283,8 +283,8 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
 
     TQColor c(r, g, b);
 
-    colorGroup.setColor(TQColorGroup::Base, c);
-    TQListViewItem::paintCell(p, colorGroup, column, width, align);
+    tqcolorGroup.setColor(TQColorGroup::Base, c);
+    TQListViewItem::paintCell(p, tqcolorGroup, column, width, align);
 }
 
 int PlaylistItem::compare(TQListViewItem *item, int column, bool ascending) const
diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp
index 0d3ce710..caf2ce00 100644
--- a/juk/playlistsplitter.cpp
+++ b/juk/playlistsplitter.cpp
@@ -16,7 +16,7 @@
 #include <kaction.h>
 #include <kdebug.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqevent.h>
 
 #include "playlistsplitter.h"
@@ -94,7 +94,7 @@ void PlaylistSplitter::slotFocusCurrentPlaylist()
         if(!item)
             return;
 
-        // A little bit of a hack to make TQListView repaint things properly.  Switch
+        // A little bit of a hack to make TQListView tqrepaint things properly.  Switch
         // to single selection mode, set the selection and then switch back.
 
         playlist->setSelectionMode(TQListView::Single);
diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h
index 2162d9b8..b0ed1a75 100644
--- a/juk/playlistsplitter.h
+++ b/juk/playlistsplitter.h
@@ -30,7 +30,7 @@ class PlaylistInterface;
 class TagEditor;
 
 /**
- * This is the main layout class of JuK.  It should contain a PlaylistBox and
+ * This is the main tqlayout class of JuK.  It should contain a PlaylistBox and
  * a TQWidgetStack of the Playlists.
  *
  * This class serves as a "mediator" (see "Design Patterns") between the JuK
diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp
index e95a570e..8201f931 100644
--- a/juk/searchwidget.cpp
+++ b/juk/searchwidget.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kaction.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
@@ -163,7 +163,7 @@ void SearchLine::updateColumns()
 
     TQStringList columnHeaders;
 
-    columnHeaders.append(TQString("<%1>").arg(i18n("All Visible")));
+    columnHeaders.append(TQString("<%1>").tqarg(i18n("All Visible")));
 
     Playlist *playlist = CollectionList::instance();
 
diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp
index 14919170..cf68043c 100644
--- a/juk/slideraction.cpp
+++ b/juk/slideraction.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 
 #include <tqtooltip.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtimer.h>
 
diff --git a/juk/splashscreen.cpp b/juk/splashscreen.cpp
index d20e5896..21f037b0 100644
--- a/juk/splashscreen.cpp
+++ b/juk/splashscreen.cpp
@@ -77,7 +77,7 @@ SplashScreen::SplashScreen() : TQLabel(0 , "splashScreen", TQt::WStyle_Splash)
     setPaletteBackgroundPixmap(background);
 
     setMargin(7);
-    setAlignment(AlignLeft | AlignBottom);
+    tqsetAlignment(AlignLeft | AlignBottom);
 
     setPaletteForegroundColor(TQColor(107, 158, 194));
 
diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp
index 268588aa..951604cd 100644
--- a/juk/statuslabel.cpp
+++ b/juk/statuslabel.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 
 #include <tqtooltip.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "statuslabel.h"
 #include "filehandle.h"
@@ -42,7 +42,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch
 {
     TQFrame *trackAndPlaylist = new TQFrame(this);
     trackAndPlaylist->setFrameStyle(Box | Sunken);
-    trackAndPlaylist->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    trackAndPlaylist->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 
     // Make sure that we have enough of a margin to suffice for the borders,
     // hence the "lineWidth() * 2"
@@ -53,23 +53,23 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch
 
     m_playlistLabel = new KSqueezedTextLabel(trackAndPlaylist, "playlistLabel");
     trackAndPlaylistLayout->addWidget(m_playlistLabel);
-    m_playlistLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    m_playlistLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     m_playlistLabel->setTextFormat(PlainText);
-    m_playlistLabel->setAlignment(AlignLeft | AlignVCenter);
+    m_playlistLabel->tqsetAlignment(AlignLeft | AlignVCenter);
 
     m_trackLabel = new KSqueezedTextLabel(trackAndPlaylist, "trackLabel");
     trackAndPlaylistLayout->addWidget(m_trackLabel);
-    m_trackLabel->setAlignment(AlignRight | AlignVCenter);
-    m_trackLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    m_trackLabel->tqsetAlignment(AlignRight | AlignVCenter);
+    m_trackLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     m_trackLabel->setTextFormat(PlainText);
 
     trackAndPlaylistLayout->addSpacing(5);
 
     m_itemTimeLabel = new TQLabel(this);
     TQFontMetrics fontMetrics(font());
-    m_itemTimeLabel->setAlignment(AlignCenter);
+    m_itemTimeLabel->tqsetAlignment(AlignCenter);
     m_itemTimeLabel->setMinimumWidth(fontMetrics.boundingRect("000:00 / 000:00").width());
-    m_itemTimeLabel->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+    m_itemTimeLabel->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
     m_itemTimeLabel->setFrameStyle(Box | Sunken);
     m_itemTimeLabel->installEventFilter(this);
 
@@ -78,7 +78,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch
 
     TQHBox *jumpBox = new TQHBox(this);
     jumpBox->setFrameStyle(Box | Sunken);
-    jumpBox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum);
+    jumpBox->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum);
 
     TQPushButton *jumpButton = new TQPushButton(jumpBox);
     jumpButton->setPixmap(SmallIcon("up"));
diff --git a/juk/stringhash.h b/juk/stringhash.h
index eaf5b6b9..bf866958 100644
--- a/juk/stringhash.h
+++ b/juk/stringhash.h
@@ -118,7 +118,7 @@ protected:
 
 inline char hashStringAccess(const TQString &in, int index)
 {
-    return in.unicode()[index].cell();
+    return in.tqunicode()[index].cell();
 }
 
 inline char hashStringAccess(const TQCString &in, int index)
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index 429ca388..ad1eb7c8 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -31,8 +31,8 @@
 #include <tqtooltip.h>
 #include <tqpainter.h>
 #include <tqvaluevector.h>
-#include <stylesheet.h>
-#include <palette.h>
+#include <tqstylesheet.h>
+#include <tqpalette.h>
 
 #include <netwm.h>
 
@@ -370,7 +370,7 @@ void SystemTray::createPopup()
 
     for(unsigned i = 0; i < m_labels.capacity(); ++i) {
         m_labels[i] = new FlickerFreeLabel(" ", infoBox);
-        m_labels[i]->setAlignment(AlignRight | AlignVCenter);
+        m_labels[i]->tqsetAlignment(AlignRight | AlignVCenter);
     }
 
     // We don't want an autodelete popup.  There are times when it will need
@@ -385,7 +385,7 @@ void SystemTray::createPopup()
     int labelCount = 0;
 
     TQString title = TQStyleSheet::escape(playingInfo->title());
-    m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").arg(title));
+    m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").tqarg(title));
 
     if(!playingInfo->artist().isEmpty())
         m_labels[labelCount++]->setText(playingInfo->artist());
@@ -393,8 +393,8 @@ void SystemTray::createPopup()
     if(!playingInfo->album().isEmpty()) {
         TQString album = TQStyleSheet::escape(playingInfo->album());
         TQString s = playingInfo->year() > 0
-            ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").arg(album).arg(playingInfo->year())
-            : TQString("<qt><nobr>%1</nobr></qt>").arg(album);
+            ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").tqarg(album).tqarg(playingInfo->year())
+            : TQString("<qt><nobr>%1</nobr></qt>").tqarg(album);
         m_labels[labelCount++]->setText(s);
     }
 
@@ -531,8 +531,8 @@ void SystemTray::setToolTip(const TQString &tip, const TQPixmap &cover)
         TQString html = i18n("%1 is Cover Art, %2 is the playing track, %3 is the appname",
                             "<center><table cellspacing=\"2\"><tr><td valign=\"middle\">%1</td>"
                             "<td valign=\"middle\">%2</td></tr></table><em>%3</em></center>");
-        html = html.arg("<img valign=\"middle\" src=\"tipCover\"");
-        html = html.arg(TQString("<nobr>%1</nobr>").arg(tip), i18n("JuK"));
+        html = html.tqarg("<img valign=\"middle\" src=\"tipCover\"");
+        html = html.tqarg(TQString("<nobr>%1</nobr>").tqarg(tip), i18n("JuK"));
 
         TQToolTip::add(this, html);
     }
diff --git a/juk/systemtray.h b/juk/systemtray.h
index 66f76111..fb6e91f9 100644
--- a/juk/systemtray.h
+++ b/juk/systemtray.h
@@ -90,7 +90,7 @@ private:
 
     void createButtonBox(TQWidget *parent);
 
-    // Creates the widget layout for the popup, returning the TQVBox that
+    // Creates the widget tqlayout for the popup, returning the TQVBox that
     // holds the text labels.  Uses buttonsToLeft() to figure out which
     // order to create them in.  @p file is used to grab the cover.
     TQVBox *createPopupLayout(TQWidget *parent, const FileHandle &file);
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index c7d0e06e..c9f866c4 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -33,7 +33,7 @@
 
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdir.h>
 #include <tqvalidator.h>
 #include <tqtooltip.h>
@@ -90,11 +90,11 @@ public:
 	m_width(-1) {}
     void setWidth(int w = -1)
     {
-	m_width = w == -1 ? TQHBoxLayout::minimumSize().width() : w;
+	m_width = w == -1 ? TQHBoxLayout::tqminimumSize().width() : w;
     }
-    virtual TQSize minimumSize() const
+    virtual TQSize tqminimumSize() const
     {
-	TQSize s = TQHBoxLayout::minimumSize();
+	TQSize s = TQHBoxLayout::tqminimumSize();
 	s.setWidth(m_width);
 	return s;
     }
@@ -481,16 +481,16 @@ void TagEditor::setupLayout()
     static const int horizontalSpacing = 12;
     static const int verticalSpacing = 2;
 
-    TQHBoxLayout *layout = new TQHBoxLayout(this, 6, horizontalSpacing);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 6, horizontalSpacing);
 
     //////////////////////////////////////////////////////////////////////////////
-    // define two columns of the bottem layout
+    // define two columns of the bottem tqlayout
     //////////////////////////////////////////////////////////////////////////////
-    TQVBoxLayout *leftColumnLayout = new TQVBoxLayout(layout, verticalSpacing);
-    TQVBoxLayout *rightColumnLayout = new TQVBoxLayout(layout, verticalSpacing);
+    TQVBoxLayout *leftColumnLayout = new TQVBoxLayout(tqlayout, verticalSpacing);
+    TQVBoxLayout *rightColumnLayout = new TQVBoxLayout(tqlayout, verticalSpacing);
 
-    layout->setStretchFactor(leftColumnLayout, 2);
-    layout->setStretchFactor(rightColumnLayout, 3);
+    tqlayout->setStretchFactor(leftColumnLayout, 2);
+    tqlayout->setStretchFactor(rightColumnLayout, 3);
 
     //////////////////////////////////////////////////////////////////////////////
     // put stuff in the left column -- all of the field names are class wide
@@ -560,7 +560,7 @@ void TagEditor::setupLayout()
 	    // addItem(i18n("Length:"), m_lengthBox, trackRowLayout);
 	    m_lengthBox->setMinimumWidth(fontMetrics().width("00:00") + trackRowLayout->spacing());
 	    m_lengthBox->setMaximumWidth(50);
-	    m_lengthBox->setAlignment(TQt::AlignRight);
+	    m_lengthBox->tqsetAlignment(TQt::AlignRight);
 	    m_lengthBox->setReadOnly(true);
 	    trackRowLayout->addWidget(addHidden(m_lengthBox));
 
@@ -572,7 +572,7 @@ void TagEditor::setupLayout()
 	    // addItem(i18n("Bitrate:"), m_bitrateBox, trackRowLayout);
 	    m_bitrateBox->setMinimumWidth(fontMetrics().width("000") + trackRowLayout->spacing());
 	    m_bitrateBox->setMaximumWidth(50);
-	    m_bitrateBox->setAlignment(TQt::AlignRight);
+	    m_bitrateBox->tqsetAlignment(TQt::AlignRight);
 	    m_bitrateBox->setReadOnly(true);
 	    trackRowLayout->addWidget(addHidden(m_bitrateBox));
 
@@ -711,9 +711,9 @@ void TagEditor::saveChangesPrompt()
     }
 }
 
-void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layout, const TQString &iconName)
+void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlayout, const TQString &iconName)
 {
-    if(!item || !layout)
+    if(!item || !tqlayout)
 	return;
 
     TQLabel *label = new TQLabel(item, text, this);
@@ -727,14 +727,14 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou
 
     label->setMinimumHeight(enableBox->height());
 
-    if(layout->direction() == TQBoxLayout::LeftToRight) {
-    	layout->addWidget(iconLabel);
-	layout->addWidget(label);
-	layout->addWidget(item);
-	layout->addWidget(enableBox);
+    if(tqlayout->direction() == TQBoxLayout::LeftToRight) {
+    	tqlayout->addWidget(iconLabel);
+	tqlayout->addWidget(label);
+	tqlayout->addWidget(item);
+	tqlayout->addWidget(enableBox);
     }
     else {
-	TQHBoxLayout *l = new TQHBoxLayout(layout);
+	TQHBoxLayout *l = new TQHBoxLayout(tqlayout);
 	
 	l->addWidget(iconLabel);
 	l->addWidget(label);
@@ -745,7 +745,7 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou
 	l->addWidget(enableBox);
 	l->setStretchFactor(enableBox, 0);
 
-	layout->addWidget(item);
+	tqlayout->addWidget(item);
     }
 
     enableBox->hide();
diff --git a/juk/tageditor.h b/juk/tageditor.h
index 10649494..35526380 100644
--- a/juk/tageditor.h
+++ b/juk/tageditor.h
@@ -67,10 +67,10 @@ private:
     void save(const PlaylistItemList &list);
     void saveChangesPrompt();
     /**
-     * Adds an item to JuK's tagging layout.  This handles the creation and
+     * Adds an item to JuK's tagging tqlayout.  This handles the creation and
      * placement of the "enable" box as well.
      */
-    void addItem(const TQString &text, TQWidget *item, TQBoxLayout *layout, const TQString &iconName = TQString());
+    void addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlayout, const TQString &iconName = TQString());
 
     /**
      * Adds a widget to m_hideList and returns that widget.
diff --git a/juk/tagguesserconfigdlgwidget.ui b/juk/tagguesserconfigdlgwidget.ui
index f3b3b2e5..08a03ed6 100644
--- a/juk/tagguesserconfigdlgwidget.ui
+++ b/juk/tagguesserconfigdlgwidget.ui
@@ -136,7 +136,7 @@ Note that the order in which the schemes appear in the list is relevant, since t
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>130</height>
diff --git a/juk/tagrenameroptions.cpp b/juk/tagrenameroptions.cpp
index c25f3dd1..fc97ac8e 100644
--- a/juk/tagrenameroptions.cpp
+++ b/juk/tagrenameroptions.cpp
@@ -69,12 +69,12 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category)
     if(categoryNum > 0)
         typeKey.append(TQString::number(categoryNum));
 
-    setSuffix(config.readEntry(TQString("%1Suffix").arg(typeKey)));
-    setPrefix(config.readEntry(TQString("%1Prefix").arg(typeKey)));
+    setSuffix(config.readEntry(TQString("%1Suffix").tqarg(typeKey)));
+    setPrefix(config.readEntry(TQString("%1Prefix").tqarg(typeKey)));
 
     // Default the emptyAction to ignoring the empty tag.
 
-    const TQString emptyAction = config.readEntry(TQString("%1EmptyAction").arg(typeKey)).lower();
+    const TQString emptyAction = config.readEntry(TQString("%1EmptyAction").tqarg(typeKey)).lower();
     setEmptyAction(IgnoreEmptyTag);
 
     if(emptyAction == "forceemptyinclude")
@@ -82,9 +82,9 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category)
     else if(emptyAction == "usereplacementvalue")
         setEmptyAction(UseReplacementValue);
 
-    setEmptyText(config.readEntry(TQString("%1EmptyText").arg(typeKey)));
-    setTrackWidth(config.readUnsignedNumEntry(TQString("%1TrackWidth").arg(typeKey)));
-    setDisabled(config.readBoolEntry(TQString("%1Disabled").arg(typeKey), disabled));
+    setEmptyText(config.readEntry(TQString("%1EmptyText").tqarg(typeKey)));
+    setTrackWidth(config.readUnsignedNumEntry(TQString("%1TrackWidth").tqarg(typeKey)));
+    setDisabled(config.readBoolEntry(TQString("%1Disabled").tqarg(typeKey), disabled));
 }
 
 TQString TagRenamerOptions::tagTypeText(TagType type, bool translate)
@@ -117,8 +117,8 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const
 
     KConfigGroup config(KGlobal::config(), "FileRenamer");
 
-    config.writeEntry(TQString("%1Suffix").arg(typeKey), suffix());
-    config.writeEntry(TQString("%1Prefix").arg(typeKey), prefix());
+    config.writeEntry(TQString("%1Suffix").tqarg(typeKey), suffix());
+    config.writeEntry(TQString("%1Prefix").tqarg(typeKey), prefix());
 
     TQString emptyStr;
 
@@ -136,12 +136,12 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const
     break;
     }
 
-    config.writeEntry(TQString("%1EmptyAction").arg(typeKey), emptyStr);
-    config.writeEntry(TQString("%1EmptyText").arg(typeKey), emptyText());
-    config.writeEntry(TQString("%1Disabled").arg(typeKey), disabled());
+    config.writeEntry(TQString("%1EmptyAction").tqarg(typeKey), emptyStr);
+    config.writeEntry(TQString("%1EmptyText").tqarg(typeKey), emptyText());
+    config.writeEntry(TQString("%1Disabled").tqarg(typeKey), disabled());
 
     if(category() == Track)
-        config.writeEntry(TQString("%1TrackWidth").arg(typeKey), trackWidth());
+        config.writeEntry(TQString("%1TrackWidth").tqarg(typeKey), trackWidth());
 
     config.sync();
 }
diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp
index bf12bf98..97028983 100644
--- a/juk/tagtransactionmanager.cpp
+++ b/juk/tagtransactionmanager.cpp
@@ -176,7 +176,7 @@ bool TagTransactionManager::processChangeList(bool undo)
 
             item->file().setFile(tag->fileName());
             item->refreshFromDisk();
-            item->repaint();
+            item->tqrepaint();
             item->playlist()->dataChanged();
             item->playlist()->update();
         }
diff --git a/juk/trackpickerdialogbase.ui b/juk/trackpickerdialogbase.ui
index ddf72c2a..8f20c43d 100644
--- a/juk/trackpickerdialogbase.ui
+++ b/juk/trackpickerdialogbase.ui
@@ -31,7 +31,7 @@
                     <property name="title">
                         <string>File Name</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <hbox>
@@ -50,7 +50,7 @@
                             <property name="text">
                                 <string></string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                             <property name="indent">
@@ -76,7 +76,7 @@
                     <property name="title">
                         <string>Select Best Possible Match</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <vbox>
diff --git a/juk/treeviewitemplaylist.cpp b/juk/treeviewitemplaylist.cpp
index 22872760..38f85f10 100644
--- a/juk/treeviewitemplaylist.cpp
+++ b/juk/treeviewitemplaylist.cpp
@@ -52,7 +52,7 @@ void TreeViewItemPlaylist::retag(const TQStringList &files, Playlist *)
 
     if(KMessageBox::warningContinueCancelList(
            this,
-           i18n("You are about to change the %1 on these files.").arg(changedTag),
+           i18n("You are about to change the %1 on these files.").tqarg(changedTag),
            files,
            i18n("Changing Track Tags"),
            KStdGuiItem::cont(),
diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp
index d1877730..b95d8cbc 100644
--- a/juk/viewmode.cpp
+++ b/juk/viewmode.cpp
@@ -49,7 +49,7 @@ ViewMode::~ViewMode()
 
 void ViewMode::paintCell(PlaylistBox::Item *item,
                          TQPainter *painter, 
-                         const TQColorGroup &colorGroup,
+                         const TQColorGroup &tqcolorGroup,
                          int column, int width, int)
 {
     if(width < item->pixmap(column)->width())
@@ -79,8 +79,8 @@ void ViewMode::paintCell(PlaylistBox::Item *item,
         painter->setPen(oldPen);
 
         painter->fillRect(border, border, width - border * 2, item->height() - border * 2 + 1,
-                          colorGroup.brush(TQColorGroup::Highlight));
-        painter->setPen(colorGroup.highlightedText());
+                          tqcolorGroup.brush(TQColorGroup::Highlight));
+        painter->setPen(tqcolorGroup.highlightedText());
     }
     else
         painter->eraseRect(0, 0, width, item->height());
@@ -224,10 +224,10 @@ CompactViewMode::~CompactViewMode()
 
 void CompactViewMode::paintCell(PlaylistBox::Item *item,
                                 TQPainter *painter, 
-                                const TQColorGroup &colorGroup,
+                                const TQColorGroup &tqcolorGroup,
                                 int column, int width, int align)
 {
-    item->KListViewItem::paintCell(painter, colorGroup, column, width, align);
+    item->KListViewItem::paintCell(painter, tqcolorGroup, column, width, align);
     if(item == item->listView()->dropItem())
         paintDropIndicator(painter, width, item->height());
 }
diff --git a/juk/viewmode.h b/juk/viewmode.h
index a2d30a9a..2ef4f007 100644
--- a/juk/viewmode.h
+++ b/juk/viewmode.h
@@ -40,7 +40,7 @@ public:
 
     virtual void paintCell(PlaylistBox::Item *item,
                            TQPainter *painter, 
-                           const TQColorGroup &colorGroup,
+                           const TQColorGroup &tqcolorGroup,
                            int column, int width, int align);
 
     virtual bool eventFilter(TQObject *watched, TQEvent *e);
@@ -106,7 +106,7 @@ public:
 
     virtual void paintCell(PlaylistBox::Item *item,
                            TQPainter *painter,
-                           const TQColorGroup &colorGroup,
+                           const TQColorGroup &tqcolorGroup,
                            int column, int width, int align);
 
     virtual void setupItem(PlaylistBox::Item *item) const { item->KListViewItem::setup(); }
diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp
index a34309d2..24670db7 100644
--- a/juk/webimagefetcher.cpp
+++ b/juk/webimagefetcher.cpp
@@ -37,7 +37,7 @@ WebImage::WebImage(const TQString &imageURL, const TQString &thumbURL,
                          int width, int height) :
     m_imageURL(imageURL),
     m_thumbURL(thumbURL),
-    m_size(TQString("\n%1 x %2").arg(width).arg(height))
+    m_size(TQString("\n%1 x %2").tqarg(width).tqarg(height))
 {
 }
 
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index cca6739b..eb2b1c2a 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -25,7 +25,7 @@
 #include <kurllabel.h>
 
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqimage.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -86,15 +86,15 @@ void WebImageFetcherDialog::showCreditURL(const TQString &url)
 {
     // Don't use static member since I'm sure that someday knowing my luck
     // Yahoo will change their mimetype they serve.
-    (void) new KRun(KURL(url), topLevelWidget());
+    (void) new KRun(KURL(url), tqtopLevelWidget());
 }
 
 void WebImageFetcherDialog::setLayout()
 {
     setCaption(TQString("%1 - %2 (%3)")
-              .arg(m_file.tag()->artist())
-              .arg(m_file.tag()->album())
-              .arg(m_imageList.size()));
+              .tqarg(m_file.tag()->artist())
+              .tqarg(m_file.tag()->album())
+              .tqarg(m_imageList.size()));
 
     m_iconWidget->clear();
     for(uint i = 0; i < m_imageList.size(); i++)
@@ -218,7 +218,7 @@ CoverIconViewItem::~CoverIconViewItem()
 void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data)
 {
     int currentSize = m_buffer.size();
-    m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim);
+    m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim);
     memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
 }
 
diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp
index 70517c2d..0d384ded 100644
--- a/kaboodle/player.cpp
+++ b/kaboodle/player.cpp
@@ -244,8 +244,8 @@ void Kaboodle::Player::tickerTimeout(void)
 
 		if(extension)
 			emit setStatusBarText(i18n("Playing %1 - %2")
-			                      .arg(current.prettyURL())
-			                      .arg(positionString() + "/" + lengthString()));
+			                      .tqarg(current.prettyURL())
+			                      .tqarg(positionString() + "/" + lengthString()));
 
 	}
 	updateTitle();
diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp
index 2308f31d..10f7e56e 100644
--- a/kaboodle/userinterface.cpp
+++ b/kaboodle/userinterface.cpp
@@ -35,7 +35,7 @@
 #include <kstdaction.h>
 #include <kurldrag.h>
 #include <tqdragobject.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlcdnumber.h>
 #include <tqvbox.h>
 #include <kkeydialog.h>
diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp
index 0b586843..437af5b0 100644
--- a/kaboodle/view.cpp
+++ b/kaboodle/view.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kvideowidget.h>
 #include <tqdragobject.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
@@ -80,10 +80,10 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
 	sliderBox->setFocusPolicy(TQ_ClickFocus);
 	sliderBox->setAcceptDrops(true);
 
-	TQHBoxLayout *layout = new TQHBoxLayout(sliderBox);
-	layout->setSpacing(KDialog::spacingHint());
-	layout->setMargin(0);
-	layout->setAutoAdd(true);
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(sliderBox);
+	tqlayout->setSpacing(KDialog::spacingHint());
+	tqlayout->setMargin(0);
+	tqlayout->setAutoAdd(true);
 
 	playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, TQT_SLOT(play()), sliderBox);
 	pauseButton = createButton(BarIconSet("player_pause"), i18n("Pause"), player, TQT_SLOT(pause()), sliderBox);
@@ -99,7 +99,7 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
 	labelFont.setBold(true);
 	TQFontMetrics labelFontMetrics(labelFont);
 	elapsedLabel->setFont(labelFont);
-	elapsedLabel->setAlignment(AlignCenter | AlignVCenter | ExpandTabs);
+	elapsedLabel->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs);
 	elapsedLabel->setFixedHeight(labelFontMetrics.height());
 	elapsedLabel->setMinimumWidth(labelFontMetrics.width("00:00"));
 
diff --git a/kaboodle/view.h b/kaboodle/view.h
index 284f5621..75ed28b4 100644
--- a/kaboodle/view.h
+++ b/kaboodle/view.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kurl.h>
 #include <tqevent.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlcdnumber.h>
 #include <tqwidget.h>
 
diff --git a/kaudiocreator/cdconfig.ui b/kaudiocreator/cdconfig.ui
index c0756c83..cc317a9e 100644
--- a/kaudiocreator/cdconfig.ui
+++ b/kaudiocreator/cdconfig.ui
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kaudiocreator/encodefile.ui b/kaudiocreator/encodefile.ui
index 93a4055f..ccbb6313 100644
--- a/kaudiocreator/encodefile.ui
+++ b/kaudiocreator/encodefile.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -74,7 +74,7 @@
                     <property name="text">
                         <string>Track:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -85,7 +85,7 @@
                     <property name="text">
                         <string>Comment:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -101,7 +101,7 @@
                     <property name="text">
                         <string>Title:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -114,7 +114,7 @@
                     <property name="text">
                         <string>Artist:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -153,7 +153,7 @@
                     <property name="text">
                         <string>Artist:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -166,7 +166,7 @@
                     <property name="text">
                         <string>Album:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -192,7 +192,7 @@
                     <property name="text">
                         <string>Year:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -205,7 +205,7 @@
                     <property name="text">
                         <string>Genre:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -223,7 +223,7 @@
                     <property name="text">
                         <string>Comment:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -244,7 +244,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -267,7 +267,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -283,7 +283,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
diff --git a/kaudiocreator/encodefileimp.cpp b/kaudiocreator/encodefileimp.cpp
index 59f32405..28d46320 100644
--- a/kaudiocreator/encodefileimp.cpp
+++ b/kaudiocreator/encodefileimp.cpp
@@ -70,7 +70,7 @@ void EncodeFileImp::encode(){
   int counter(1);
   KMessageBox::information(this,
   i18n("%1 Job(s) have been started.  You can watch their progress in the " \
-	  "jobs section.").arg(counter),
+	  "jobs section.").tqarg(counter),
  i18n("Jobs have started"), i18n("Jobs have started"));
 }
 
diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp
index 0be1fef1..e528a29a 100644
--- a/kaudiocreator/encoder.cpp
+++ b/kaudiocreator/encoder.cpp
@@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <kinputdialog.h>
 
 /**
@@ -53,7 +53,7 @@ void Encoder::loadSettings() {
 
 EncoderPrefs* Encoder::loadEncoder( int encoder ){
 	EncoderPrefs* prefs;
-	TQString currentEncoderGroup = TQString("Encoder_%1").arg(encoder);
+	TQString currentEncoderGroup = TQString("Encoder_%1").tqarg(encoder);
 	prefs = EncoderPrefs::prefs(currentEncoderGroup);
 	if ( !EncoderPrefs::hasPrefs(currentEncoderGroup) ) {
 		KMessageBox::sorry(0, i18n("No encoder has been selected.\nPlease select an encoder in the configuration."), i18n("No Encoder Selected"));
@@ -132,8 +132,8 @@ void Encoder::removeJob(int id ) {
  * @param job the job to encode.
  */
 void Encoder::encodeWav(Job *job ) {
-	emit(addJob(job, i18n("Encoding (%1): %2 - %3").arg(loadEncoder(job->encoder)->extension())
-		                                             .arg(job->track_artist).arg(job->track_title)));
+	emit(addJob(job, i18n("Encoding (%1): %2 - %3").tqarg(loadEncoder(job->encoder)->extension())
+		                                             .tqarg(job->track_artist).tqarg(job->track_title)));
 	pendingJobs.append(job);
 	tendToNewJobs();
 }
@@ -252,12 +252,12 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length )
 		reportCount++;
 		return;
 	}
-	//qDebug(TQString("Pre cropped: %1").arg(output).latin1());
+	//qDebug(TQString("Pre cropped: %1").tqarg(output).latin1());
 	output = output.mid(output.find('%')-loadEncoder(job->encoder)->percentLength(),2);
-	//qDebug(TQString("Post cropped: %1").arg(output).latin1());
+	//qDebug(TQString("Post cropped: %1").tqarg(output).latin1());
 	bool conversionSuccessfull = false;
 	int percent = output.toInt(&conversionSuccessfull);
-	//qDebug(TQString("number: %1").arg(percent).latin1());
+	//qDebug(TQString("number: %1").tqarg(percent).latin1());
 	if ( percent >= 0 && percent < 100 && conversionSuccessfull ) {
 		emit(updateProgress(job->id, percent));
 	}
@@ -284,7 +284,7 @@ void Encoder::jobDone(KProcess *process ) {
 
 	bool showDebugBox = false;
 	if ( process->exitStatus() == 127 ) {
-		KMessageBox::sorry(0, i18n("The selected encoder was not found.\nThe wav file has been removed. Command was: %1").arg(job->errorString), i18n("Encoding Failed"));
+		KMessageBox::sorry(0, i18n("The selected encoder was not found.\nThe wav file has been removed. Command was: %1").tqarg(job->errorString), i18n("Encoding Failed"));
 		emit(updateProgress(job->id, -1));
 	}
 	else if ( TQFile::exists(job->newLocation) ) {
diff --git a/kaudiocreator/encoderconfig.ui b/kaudiocreator/encoderconfig.ui
index 51e00ef1..67f256c0 100644
--- a/kaudiocreator/encoderconfig.ui
+++ b/kaudiocreator/encoderconfig.ui
@@ -131,7 +131,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -140,7 +140,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -188,7 +188,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -241,7 +241,7 @@
                     <property name="text">
                         <string>Lowest</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -252,7 +252,7 @@
                     <property name="text">
                         <string>Normal</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp
index e49dd6a9..98321887 100644
--- a/kaudiocreator/encoderconfigimp.cpp
+++ b/kaudiocreator/encoderconfigimp.cpp
@@ -93,7 +93,7 @@ void EncoderConfigImp::loadEncoderList(){
   int lastKnownEncoder = Prefs::lastKnownEncoder();
   lastKnownEncoder++;
   for( int i=0; i<=lastKnownEncoder; i++ ){
-    TQString currentGroup = TQString("Encoder_%1").arg(i);
+    TQString currentGroup = TQString("Encoder_%1").tqarg(i);
     if(EncoderPrefs::hasPrefs(currentGroup)){
       lastEncoder = i;
       EncoderPrefs *encPrefs = EncoderPrefs::prefs(currentGroup);
@@ -123,7 +123,7 @@ void EncoderConfigImp::addEncoderSlot(){
   uint number = 0;
   TQString groupName;
   while(!foundEmptyGroup){
-    groupName = TQString("Encoder_%1").arg(number);
+    groupName = TQString("Encoder_%1").tqarg(number);
     if(!EncoderPrefs::hasPrefs(groupName))
       foundEmptyGroup = true;
     else
diff --git a/kaudiocreator/encoderedit.ui b/kaudiocreator/encoderedit.ui
index 1023611b..f5c3c072 100644
--- a/kaudiocreator/encoderedit.ui
+++ b/kaudiocreator/encoderedit.ui
@@ -28,7 +28,7 @@
             <property name="name">
                 <cstring>kcfg_encoderName</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>320</width>
                     <height>0</height>
@@ -80,7 +80,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kaudiocreator/encoderoutput.ui b/kaudiocreator/encoderoutput.ui
index 8851d0f4..94779b68 100644
--- a/kaudiocreator/encoderoutput.ui
+++ b/kaudiocreator/encoderoutput.ui
@@ -63,7 +63,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kaudiocreator/general.ui b/kaudiocreator/general.ui
index f372e507..765cbb1c 100644
--- a/kaudiocreator/general.ui
+++ b/kaudiocreator/general.ui
@@ -65,7 +65,7 @@
                         <string>Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines.
 </string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -194,7 +194,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -240,7 +240,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kaudiocreator/infodialog.ui b/kaudiocreator/infodialog.ui
index 5a22fb56..1add6372 100644
--- a/kaudiocreator/infodialog.ui
+++ b/kaudiocreator/infodialog.ui
@@ -46,7 +46,7 @@
                     <property name="text">
                         <string>Comment:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -62,7 +62,7 @@
                     <property name="text">
                         <string>Title:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -80,7 +80,7 @@
                     <property name="text">
                         <string>Artist:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -114,7 +114,7 @@
                     <property name="text">
                         <string>Artist:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -127,7 +127,7 @@
                     <property name="text">
                         <string>Album:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -153,7 +153,7 @@
                     <property name="text">
                         <string>Year:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -166,7 +166,7 @@
                     <property name="text">
                         <string>Genre:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -184,7 +184,7 @@
                     <property name="text">
                         <string>Comment:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -205,7 +205,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>100</height>
@@ -214,7 +214,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kaudiocreator/jobque.ui b/kaudiocreator/jobque.ui
index eb158f54..3c76a257 100644
--- a/kaudiocreator/jobque.ui
+++ b/kaudiocreator/jobque.ui
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -106,7 +106,7 @@
             <property name="text">
                 <string>No jobs are in the queue</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">
diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp
index 81c0431d..8ca6d087 100644
--- a/kaudiocreator/jobqueimp.cpp
+++ b/kaudiocreator/jobqueimp.cpp
@@ -64,7 +64,7 @@ JobQueImp::JobQueImp( TQWidget* parent, const char* name) :
  */
 TQString JobQueImp::getStringFromNumber(int number){
 	if(number > highestNumber){
-		int diff = TQString("%1").arg(number).length() - TQString("%1").arg(highestNumber).length();
+		int diff = TQString("%1").tqarg(number).length() - TQString("%1").tqarg(highestNumber).length();
 		highestNumber = number;
 		if(diff > 0){
 			// We have to update all of the cells.
@@ -77,7 +77,7 @@ TQString JobQueImp::getStringFromNumber(int number){
 	}
 
 	TQString buffer = "";
-	uint newLength = TQString("%1").arg(highestNumber).length() - TQString("%1").arg(number).length();
+	uint newLength = TQString("%1").tqarg(highestNumber).length() - TQString("%1").tqarg(number).length();
 	for(uint i=0; i < newLength; i++)
 		buffer += "0";
 	return buffer;
@@ -92,9 +92,9 @@ void JobQueImp::addJob(Job*job, const TQString &name ){
 	if(!job)
 		return;
 	job->id = ++currentId;
-	QueListViewItem *currentItem = new QueListViewItem(todoQue, TQString("%1%2").arg(getStringFromNumber(currentId)).arg(currentId), "0", name);
+	QueListViewItem *currentItem = new QueListViewItem(todoQue, TQString("%1%2").tqarg(getStringFromNumber(currentId)).tqarg(currentId), "0", name);
 	currentItem->setPixmap(ICON_LOC, SmallIcon("player_pause", currentItem->height()-2));
-	queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount()));
+	queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount()));
 }
 
 /**
@@ -106,7 +106,7 @@ void JobQueImp::updateProgress(int id, int progress){
 	int currentJobCount = numberOfJobsNotFinished();
 	QueListViewItem * currentItem = (QueListViewItem*)todoQue->firstChild();
 	TQString buffer = getStringFromNumber(id);
-	buffer += TQString("%1").arg(id);
+	buffer += TQString("%1").tqarg(id);
 
 	// Find the current item
 	while( currentItem != NULL ){
@@ -124,7 +124,7 @@ void JobQueImp::updateProgress(int id, int progress){
 		return;
 
 	currentItem->percentDone = progress;
-	currentItem->repaint();
+	currentItem->tqrepaint();
 
 	// Update the icon if needed
 	if(progress > 0 && progress < 100 && !currentItem->progressing ){
@@ -158,7 +158,7 @@ bool JobQueImp::removeJob(QueListViewItem *item, bool kill, bool prompt){
 	if(!item)
 		return false;
 
-	if(item->percentDone < 100 && item->percentDone > -1 && (prompt && KMessageBox::questionYesNo(this, i18n("KAudioCreator has not finished %1. Remove anyway?").arg(item->text(HEADER_DESCRIPTION)), i18n("Unfinished Job in Queue"), KStdGuiItem::del(), i18n("Keep"))
+	if(item->percentDone < 100 && item->percentDone > -1 && (prompt && KMessageBox::questionYesNo(this, i18n("KAudioCreator has not finished %1. Remove anyway?").tqarg(item->text(HEADER_DESCRIPTION)), i18n("Unfinished Job in Queue"), KStdGuiItem::del(), i18n("Keep"))
 		  == KMessageBox::No ))
 		return false;
 
@@ -180,7 +180,7 @@ bool JobQueImp::removeJob(QueListViewItem *item, bool kill, bool prompt){
 		currentId = 0;
 	}
 	else
-		queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount()));
+		queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount()));
 	return true;
 }
 
@@ -248,7 +248,7 @@ void JobQueImp::clearDoneJobs(){
 		currentId = 0;
 	}
 	else
-		queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount()));
+		queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount()));
 }
 
 /**
@@ -270,7 +270,7 @@ int JobQueImp::numberOfJobsNotFinished(){
 }
 
 /**
- * The repaint function overloaded so that we can have a built in progressbar.
+ * The tqrepaint function overloaded so that we can have a built in progressbar.
  */
 void QueListViewItem::paintCell (TQPainter * p,const TQColorGroup &cg,int column,
 			int width,int align){
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index c5db6337..91c0de17 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -92,7 +92,7 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
                                 TQT_SLOT( startSession() ), actionCollection(), "rip_selected" );
     rip->setEnabled( false );
 
-    connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this),    TQT_SLOT( updateStatus() ) );
+    connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this),    TQT_SLOT( updatetqStatus() ) );
     connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(ripper), TQT_SLOT( removeJob(int) ) );
     connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(encoder), TQT_SLOT( removeJob(int)) );
 
@@ -100,11 +100,11 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
     connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), TQT_TQOBJECT(jobQue),  TQT_SLOT( addJob(Job*, const TQString &)) );
     connect( ripper, TQT_SIGNAL( eject(const TQString &) )       , TQT_TQOBJECT(tracks),  TQT_SLOT( ejectDevice(const TQString &)) );
     connect( ripper, TQT_SIGNAL( encodeWav(Job *) )             , TQT_TQOBJECT(encoder), TQT_SLOT( encodeWav(Job *)) );
-    connect( ripper, TQT_SIGNAL( jobsChanged() )                , TQT_TQOBJECT(this),    TQT_SLOT( updateStatus() ) );   
+    connect( ripper, TQT_SIGNAL( jobsChanged() )                , TQT_TQOBJECT(this),    TQT_SLOT( updatetqStatus() ) );   
 
     connect( encoder, TQT_SIGNAL( updateProgress(int, int) )   , TQT_TQOBJECT(jobQue),  TQT_SLOT( updateProgress(int,int)) );
     connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), TQT_TQOBJECT(jobQue),  TQT_SLOT( addJob(Job*, const TQString &)) );
-    connect( encoder, TQT_SIGNAL( jobsChanged() )              , TQT_TQOBJECT(this),    TQT_SLOT( updateStatus() ) );
+    connect( encoder, TQT_SIGNAL( jobsChanged() )              , TQT_TQOBJECT(this),    TQT_SLOT( updatetqStatus() ) );
 
     connect( tracks, TQT_SIGNAL( hasCD(bool) )    , TQT_TQOBJECT(this),          TQT_SLOT( hasCD(bool) ) );
     connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), TQT_TQOBJECT(ripper),       TQT_SLOT( ripTrack(Job *)) );
@@ -153,10 +153,10 @@ void KAudioCreator::getRipMenu(){
     ripMenu->clear();
 
     int i=0;
-    TQString currentGroup = TQString("Encoder_%1").arg(i);
+    TQString currentGroup = TQString("Encoder_%1").tqarg(i);
     while(EncoderPrefs::hasPrefs(currentGroup)){
         ripMenu->insertItem(EncoderPrefs::prefs(currentGroup)->encoderName(), i);
-        currentGroup = TQString("Encoder_%1").arg(++i);
+        currentGroup = TQString("Encoder_%1").tqarg(++i);
     }
 }
 
@@ -170,28 +170,28 @@ void KAudioCreator::hasCD(bool cd){
         statusBar()->changeItem(i18n("No Audio CD detected"), 0 );
 }
 
-void KAudioCreator::updateStatus() {
+void KAudioCreator::updatetqStatus() {
     TQString status = i18n("Idle.");
-    TQString rippingStatus;
-    TQString encodingStatus;
+    TQString rippingtqStatus;
+    TQString encodingtqStatus;
     int activeRippingJobs = ripper->activeJobCount();
     int pendingRippingJobs = ripper->pendingJobCount();
     int activeEncodingJobs = encoder->activeJobCount();
     int pendingEncodingJobs = encoder->pendingJobCount();
 
     if ( activeRippingJobs ) {
-        rippingStatus = i18n("Ripping (%1 active, %2 queued)").arg( activeRippingJobs ).arg( pendingRippingJobs );
-        status = rippingStatus;
+        rippingtqStatus = i18n("Ripping (%1 active, %2 queued)").tqarg( activeRippingJobs ).tqarg( pendingRippingJobs );
+        status = rippingtqStatus;
     }
     if ( activeEncodingJobs ) {
-        encodingStatus = i18n("Encoding (%1 active, %2 queued)").arg( activeEncodingJobs ).arg( pendingEncodingJobs );
+        encodingtqStatus = i18n("Encoding (%1 active, %2 queued)").tqarg( activeEncodingJobs ).tqarg( pendingEncodingJobs );
 
         if ( activeRippingJobs ) {
             status.append(" : ");
-            status.append( encodingStatus );
+            status.append( encodingtqStatus );
         }
         else {
-            status = encodingStatus;
+            status = encodingtqStatus;
         }
     }
 
diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h
index 64bca008..5e901d77 100644
--- a/kaudiocreator/kaudiocreator.h
+++ b/kaudiocreator/kaudiocreator.h
@@ -47,7 +47,7 @@ protected:
 
 private slots:
   void showSettings();
-  void updateStatus();
+  void updatetqStatus();
 
   void hasCD(bool);
   void configureNotifications();
diff --git a/kaudiocreator/ripconfig.ui b/kaudiocreator/ripconfig.ui
index 7d655de1..8c47615b 100644
--- a/kaudiocreator/ripconfig.ui
+++ b/kaudiocreator/ripconfig.ui
@@ -151,7 +151,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>280</height>
diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp
index cb9c012b..2e953ce6 100644
--- a/kaudiocreator/ripper.cpp
+++ b/kaudiocreator/ripper.cpp
@@ -120,7 +120,7 @@ void Ripper::removeJob(int id){
 		pendingJobs.remove(job);
 		delete job;
 	}
-	//qDebug(TQString("Done removing Job:%1").arg(id).latin1());
+	//qDebug(TQString("Done removing Job:%1").tqarg(id).latin1());
 	tendToNewJobs();
 }
 
@@ -132,7 +132,7 @@ void Ripper::removeJob(int id){
 void Ripper::ripTrack(Job *job){
 	if(!job)
 		return;
-	emit(addJob(job, i18n("Ripping: %1 - %2").arg(job->track_artist).arg(job->track_title)));
+	emit(addJob(job, i18n("Ripping: %1 - %2").tqarg(job->track_artist).tqarg(job->track_title)));
 	pendingJobs.append(job);
 	tendToNewJobs();
 }
@@ -172,12 +172,12 @@ void Ripper::tendToNewJobs(){
 	TQString wavFile;
 	TQString args = job->device;
 	if(!args.isEmpty())
-		args = TQString("?device=%1").arg(args);
+		args = TQString("?device=%1").tqarg(args);
 	args = args+"&fileNameTemplate=Track %{number}";
 	if(job->track < 10)
-		wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").arg(job->track).arg(args);
+		wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").tqarg(job->track).tqarg(args);
 	else
-		wavFile = TQString("audiocd:/Wav/Track %1.wav%2").arg(job->track).arg(args);
+		wavFile = TQString("audiocd:/Wav/Track %1.wav%2").tqarg(job->track).tqarg(args);
 
 	KURL source(wavFile);
 	KURL dest(tmp.name());
diff --git a/kaudiocreator/tracks.ui b/kaudiocreator/tracks.ui
index 0f9a5743..8b7e5a5e 100644
--- a/kaudiocreator/tracks.ui
+++ b/kaudiocreator/tracks.ui
@@ -35,7 +35,7 @@
             <property name="text">
                 <string>Unknown Artist - Unknown Album</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">
@@ -120,7 +120,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -147,7 +147,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -200,7 +200,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>246</width>
                             <height>20</height>
diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp
index 36419871..81dbe1c9 100644
--- a/kaudiocreator/tracksimp.cpp
+++ b/kaudiocreator/tracksimp.cpp
@@ -198,7 +198,7 @@ void TracksImp::changeDevice(const TQString &file ) {
         TQString errstring =
           i18n("CDROM read or access error (or no audio disk in drive).\n"\
             "Please make sure you have access permissions to:\n%1")
-            .arg(file);
+            .tqarg(file);
         KMessageBox::error(this, errstring, i18n("Error"));
     }
 }
@@ -247,8 +247,8 @@ void TracksImp::lookupCDDBDone(CDDB::Result result ) {
         CDInfoList::iterator it;
         TQStringList list;
         for ( it = cddb_info.begin(); it != cddb_info.end(); ++it  ) {
-            list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title)
-              .arg((*it).genre));
+            list.append( TQString("%1, %2, %3").tqarg((*it).artist).tqarg((*it).title)
+              .tqarg((*it).genre));
         }
 
         bool ok(false);
@@ -378,7 +378,7 @@ void TracksImp::startSession( int encoder )
     if( Prefs::promptIfIncompleteInfo() && list.count() > 0 )
     {
         int r = KMessageBox::questionYesNo( this, 
-                 i18n( "Part of the album is not set: %1.\n (To change album information click the \"Edit Information\" button.)\n Would you like to rip the selected tracks anyway?").arg(list.join(", ")), i18n("Album Information Incomplete"), i18n("Rip"), KStdGuiItem::cancel() );
+                 i18n( "Part of the album is not set: %1.\n (To change album information click the \"Edit Information\" button.)\n Would you like to rip the selected tracks anyway?").tqarg(list.join(", ")), i18n("Album Information Incomplete"), i18n("Rip"), KStdGuiItem::cancel() );
 
         if( r == KMessageBox::No )
             return;
@@ -417,7 +417,7 @@ void TracksImp::startSession( int encoder )
 
     KMessageBox::information(this,
     i18n("%1 Job(s) have been started.  You can watch their progress in the "
-         "jobs section.").arg( selected.count() ),
+         "jobs section.").tqarg( selected.count() ),
     i18n("Jobs have started"), i18n("Jobs have started"));
 }
 
diff --git a/kaudiocreator/wizard.ui b/kaudiocreator/wizard.ui
index 34a49d8e..f289cb2d 100644
--- a/kaudiocreator/wizard.ui
+++ b/kaudiocreator/wizard.ui
@@ -51,7 +51,7 @@
             <property name="textFormat">
                 <enum>RichText</enum>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignTop|AlignLeft</set>
             </property>
         </widget>
@@ -65,7 +65,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -117,7 +117,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout15</cstring>
+                <cstring>tqlayout15</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -251,7 +251,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kaudiocreator/wizard.ui.h b/kaudiocreator/wizard.ui.h
index cbd6ca68..7c22638e 100644
--- a/kaudiocreator/wizard.ui.h
+++ b/kaudiocreator/wizard.ui.h
@@ -105,6 +105,6 @@ void fileWizard::fileFormatTextChanged(const TQString& text)
 	TQMap<TQString,TQString> map;
 	map.insert("extension", "mp3");
 	string = job.replaceSpecialChars(string, false, map);
-	exampleLabel->setText(i18n("Example: %1").arg(string));
+	exampleLabel->setText(i18n("Example: %1").tqarg(string));
 }
 
diff --git a/kfile-plugins/m3u/kfile_m3u.cpp b/kfile-plugins/m3u/kfile_m3u.cpp
index a7ffeb66..12c3315c 100644
--- a/kfile-plugins/m3u/kfile_m3u.cpp
+++ b/kfile-plugins/m3u/kfile_m3u.cpp
@@ -28,7 +28,7 @@
 
 #include <tqcstring.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdatetime.h>
 #include <tqdict.h>
 #include <tqvalidator.h>
@@ -75,7 +75,7 @@ bool KM3uPlugin::readInfo( KFileMetaInfo& info, uint )
             if (s.endsWith("\n")) s.truncate(s.length()-1);
 
             if (!s.stripWhiteSpace().isEmpty()) {
-                appendItem(group, i18n("Track %1").arg(num, 3), s);
+                appendItem(group, i18n("Track %1").tqarg(num, 3), s);
                 num++;
             }
         }
diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp
index c41a6543..5c2068b5 100644
--- a/kioslave/audiocd/audiocd.cpp
+++ b/kioslave/audiocd/audiocd.cpp
@@ -59,7 +59,7 @@ extern "C"
 using namespace KIO;
 using namespace KCDDB;
 
-#define TQFL1(x) TQString::fromLatin1(x)
+#define TQFL1(x) TQString::tqfromLatin1(x)
 #define DEFAULT_CD_DEVICE "/dev/cdrom"
 #define CDDB_INFORMATION "CDDB Information"
 
@@ -251,9 +251,9 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url)
 			// circumstances, so build a representation from
 			// the unit number and SCSI device name.
 			//
-			TQString devname = TQString::fromLatin1( "/dev/%1%2" )
-				.arg( drive->dev->given_dev_name )
-				.arg( drive->dev->given_unit_number ) ;
+			TQString devname = TQString::tqfromLatin1( "/dev/%1%2" )
+				.tqarg( drive->dev->given_dev_name )
+				.tqarg( drive->dev->given_unit_number ) ;
 			kdDebug(7117) << "  Using derived name " << devname << endl;
 			d->cd.setDevice( devname );
 		}
@@ -399,7 +399,7 @@ void AudioCDProtocol::get(const KURL & url)
 
 	if( d->fname.contains(i18n(CDDB_INFORMATION))){
 		uint choice = 1;
-		if(d->fname != TQString("%1.txt").arg(i18n(CDDB_INFORMATION))){
+		if(d->fname != TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION))){
 			choice= d->fname.section('_',1,1).section('.',0,0).toInt();
 		}
 		uint count = 1;
@@ -610,15 +610,15 @@ void AudioCDProtocol::listDir(const KURL & url)
 		for ( it = d->cddbList.begin(); it != d->cddbList.end(); ++it ){
 			(*it).toString();
 			if(count == 1)
-				app_file(entry, TQString("%1.txt").arg(i18n(CDDB_INFORMATION)), ((*it).toString().length())+1);
+				app_file(entry, TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION)), ((*it).toString().length())+1);
 			else
-				app_file(entry, TQString("%1_%2.txt").arg(i18n(CDDB_INFORMATION)).arg(count), ((*it).toString().length())+1);
+				app_file(entry, TQString("%1_%2.txt").tqarg(i18n(CDDB_INFORMATION)).tqarg(count), ((*it).toString().length())+1);
 			count++;
 			listEntry(entry, false);
 		}
 		// Error
 		if( count == 1 ) {
-			app_file(entry, TQString("%1: %2.txt").arg(i18n(CDDB_INFORMATION)).arg(CDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1);
+			app_file(entry, TQString("%1: %2.txt").tqarg(i18n(CDDB_INFORMATION)).tqarg(CDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1);
 			count++;
 			listEntry(entry, false);
 		}
@@ -838,7 +838,7 @@ void AudioCDProtocol::paranoiaRead(
 		if (0 == buf) {
 			kdDebug(7117) << "Unrecoverable error in paranoia_read" << endl;
 			ok = false;
-			error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).arg( fileName ) );
+			error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).tqarg( fileName ) );
 			break;
 		}
 
@@ -848,7 +848,7 @@ void AudioCDProtocol::paranoiaRead(
 		if(encoderProcessed == -1){
 			kdDebug(7117) << "Encoder processing error, stopping." << endl;
 			ok = false;
-			TQString errMsg = i18n( "Couldn't read %1: encoding failed" ).arg( fileName );
+			TQString errMsg = i18n( "Couldn't read %1: encoding failed" ).tqarg( fileName );
 			TQString details = encoder->lastErrorMessage();
 			if ( !details.isEmpty() )
 			    errMsg += "\n" + details;
@@ -926,7 +926,7 @@ void AudioCDProtocol::paranoiaRead(
 		processedSize(processed);
 	}
 	else if ( ok ) // i.e. no error message already emitted
-		error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).arg( fileName ) );
+		error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).tqarg( fileName ) );
 
 	paranoia_free(paranoia);
 	paranoia = 0;
@@ -1058,7 +1058,7 @@ void AudioCDProtocol::generateTemplateTitles()
 	{
 		for (unsigned int i = 0; i < d->tracks; i++){
 			TQString n;
-			d->templateTitles.append( i18n("Track %1").arg(n.sprintf("%02d", i + 1)));
+			d->templateTitles.append( i18n("Track %1").tqarg(n.sprintf("%02d", i + 1)));
 		}
 		return;
 	}
@@ -1076,7 +1076,7 @@ void AudioCDProtocol::generateTemplateTitles()
 		macros["title"] = (info.trackInfoList[i].title);
 		TQString n;
 		macros["number"] = n.sprintf("%02d", i + 1);
-		//macros["number"] = TQString("%1").arg(i+1, 2, 10);
+		//macros["number"] = TQString("%1").tqarg(i+1, 2, 10);
 		macros["genre"] = info.genre;
 		macros["year"] = TQString::number(info.year);
 
diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
index df27fffb..448749a9 100644
--- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
+++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui
@@ -63,7 +63,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>210</height>
@@ -116,7 +116,7 @@
                                 <property name="text">
                                     <string>Lowest</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
@@ -127,7 +127,7 @@
                                 <property name="text">
                                     <string>Normal</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
@@ -193,7 +193,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -234,7 +234,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout7</cstring>
+                                    <cstring>tqlayout7</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -372,7 +372,7 @@
                                     <string>Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines.
 </string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
@@ -460,7 +460,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>16</height>
@@ -488,7 +488,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -570,7 +570,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>31</height>
diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
index 87614806..1e1868fb 100644
--- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
+++ b/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
@@ -51,7 +51,7 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
         KConfigSkeleton *config = NULL;
         TQWidget *widget = encoder->getConfigureWidget(&config);
         if(widget && config){
-	   tabWidget->addTab(widget, i18n("%1 Encoder").arg(encoder->type()));
+	   tabWidget->addTab(widget, i18n("%1 Encoder").tqarg(encoder->type()));
              KConfigDialogManager *configManager = new KConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1());
            encoderSettings.append(configManager);
         }
diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp
index dfb4f7ba..6b71d515 100644
--- a/kioslave/audiocd/plugins/flac/encoderflac.cpp
+++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp
@@ -80,7 +80,7 @@ static void MetadataCallback (const FLAC__StreamEncoder *encoder, const FLAC__St
 }
 
 /*
-static FLAC__SeekableStreamEncoderSeekStatus  SeekCallback(const FLAC__SeekableStreamEncoder *encoder,  FLAC__uint64 absolute_byte_offset, void *client_data)
+static FLAC__SeekableStreamEncoderSeektqStatus  SeekCallback(const FLAC__SeekableStreamEncoder *encoder,  FLAC__uint64 absolute_byte_offset, void *client_data)
 {} ; */
 
 
diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/kioslave/audiocd/plugins/lame/encoderlame.cpp
index 1b8568a2..f44218a0 100644
--- a/kioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/kioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -126,31 +126,31 @@ void EncoderLame::loadSettings(){
 	if (method == 0) {
 		// Constant Bitrate Encoding
 		args.append("-b");
-		args.append(TQString("%1").arg(bitrates[settings->cbr_bitrate()]));
+		args.append(TQString("%1").tqarg(bitrates[settings->cbr_bitrate()]));
 		d->bitrate = bitrates[settings->cbr_bitrate()];
 		args.append("-q");
-		args.append(TQString("%1").arg(quality));
+		args.append(TQString("%1").tqarg(quality));
 	}
 	else {
 		// Variable Bitrate Encoding
 		if (settings->vbr_average_br()) {
 			args.append("--abr");
-			args.append(TQString("%1").arg(bitrates[settings->vbr_mean_brate()]));
+			args.append(TQString("%1").tqarg(bitrates[settings->vbr_mean_brate()]));
 			d->bitrate = bitrates[settings->vbr_mean_brate()];
 			if (settings->vbr_min_br()){
 				args.append("-b");
-				args.append(TQString("%1").arg(bitrates[settings->vbr_min_brate()]));
+				args.append(TQString("%1").tqarg(bitrates[settings->vbr_min_brate()]));
 			}
 			if (settings->vbr_min_hard())
 				args.append("-F");
 			if (settings->vbr_max_br()){
 				args.append("-B");
-				args.append(TQString("%1").arg(bitrates[settings->vbr_max_brate()]));
+				args.append(TQString("%1").tqarg(bitrates[settings->vbr_max_brate()]));
 			}
 		} else {
 			d->bitrate = 128;
 			args.append("-V");
-			args.append(TQString("%1").arg(quality));
+			args.append(TQString("%1").tqarg(quality));
 		}
 		if ( !settings->vbr_xing_tag() )
 			args.append("-t");
@@ -186,21 +186,21 @@ void EncoderLame::loadSettings(){
 
 	if ( settings->enable_lowpass() ) {
 		args.append("--lowpass");
-		args.append(TQString("%1").arg(settings->lowfilterfreq()));
+		args.append(TQString("%1").tqarg(settings->lowfilterfreq()));
 
 		if (settings->set_lpf_width()){
 			args.append("--lowpass-width");
-			args.append(TQString("%1").arg(settings->lowfilterwidth()));
+			args.append(TQString("%1").tqarg(settings->lowfilterwidth()));
 		}
 	}
 
 	if ( settings->enable_highpass()) {
 		args.append("--hipass");
-		args.append(TQString("%1").arg(settings->highfilterfreq()));
+		args.append(TQString("%1").tqarg(settings->highfilterfreq()));
 
 		if (settings->set_hpf_width()){
 			args.append("--hipass-width");
-			args.append(TQString("%1").arg(settings->highfilterwidth()));
+			args.append(TQString("%1").tqarg(settings->highfilterwidth()));
 		}
 	}
 }
@@ -341,13 +341,13 @@ void EncoderLame::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c
 	trackInfo.append(info.get("title").toString());
 
 	trackInfo.append("--ty");
-	trackInfo.append(TQString("%1").arg(info.get("year").toString()));
+	trackInfo.append(TQString("%1").tqarg(info.get("year").toString()));
 
 	trackInfo.append("--tc");
 	trackInfo.append(comment);
 
 	trackInfo.append("--tn");
-	trackInfo.append(TQString("%1").arg(track+1));
+	trackInfo.append(TQString("%1").tqarg(track+1));
 
 	const TQString genre = info.get( "genre" ).toString();
 	if ( d->genreList.find( genre ) != d->genreList.end() )
diff --git a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui
index f8149741..3951bb00 100644
--- a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui
+++ b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui
@@ -178,7 +178,7 @@
                     <property name="text">
                         <string>&amp;Quality:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignLeft</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -244,7 +244,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -698,7 +698,7 @@
             <property name="title">
                 <string>Filter Settings</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
             <property name="hAlign" stdset="0">
diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui
index e442ade2..2d5fd2dc 100644
--- a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui
+++ b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui
@@ -383,7 +383,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>
diff --git a/kmid/channel.cpp b/kmid/channel.cpp
index 7d077dd7..2fe22de6 100644
--- a/kmid/channel.cpp
+++ b/kmid/channel.cpp
@@ -48,7 +48,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
     keyboard = TQPixmap(locate("appdata","icons/keyboard.xpm"));
     penB = new TQPen (black);
     penW = new TQPen (white);
-    penT = new TQPen (colorGroup().background());
+    penT = new TQPen (tqcolorGroup().background());
 
     KConfig *kcfg=KGlobal::instance()->config();
     kcfg->setGroup("KMid");
@@ -87,7 +87,7 @@ void KMidChannel::paintEvent( TQPaintEvent * )
 
     TQPainter *qpaint=new TQPainter(this);
 
-    TQString tmp = i18n("Channel %1").arg(channel);
+    TQString tmp = i18n("Channel %1").tqarg(channel);
     qpaint->setFont(*qcvfont);
     qpaint->setPen(*penB);
     qpaint->drawText(2,20,tmp);
@@ -185,7 +185,7 @@ void KMidChannel::reset(int level)
         replay=TRUE;
     };
 
-    repaint(FALSE);
+    tqrepaint(FALSE);
 }
 
 void KMidChannel::saveState(bool *p,int *pgm)
@@ -198,7 +198,7 @@ void KMidChannel::loadState(bool *p,int *pgm)
 {
     for (int i=0;i<128;i++) pressed[i]=p[i];
     instrumentCombo->setCurrentItem(*pgm);
-    repaint(FALSE);
+    tqrepaint(FALSE);
 }
 
 void KMidChannel::pgmChanged(int i)
diff --git a/kmid/channelcfgdlg.cpp b/kmid/channelcfgdlg.cpp
index 45d8fa0f..db320a28 100644
--- a/kmid/channelcfgdlg.cpp
+++ b/kmid/channelcfgdlg.cpp
@@ -9,7 +9,7 @@
 #include "channelview.h"
 #include "channelcfgdlg.h"
 #include "version.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbuttongroup.h>
 
 ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok)
diff --git a/kmid/collectdlg.cpp b/kmid/collectdlg.cpp
index 20ac8def..11158b18 100644
--- a/kmid/collectdlg.cpp
+++ b/kmid/collectdlg.cpp
@@ -164,7 +164,7 @@ void CollectionDialog::newCollection()
    int i=slman->createCollection(name.ascii());
    if (i==-1)
 	{
-	TQString s = i18n("The name '%1' is already used").arg(name);
+	TQString s = i18n("The name '%1' is already used").tqarg(name);
 	KMessageBox::sorry(this, s);
 	}
 	else
@@ -190,7 +190,7 @@ int i;
    i=slman->createCollection(name.ascii());
    if (i==-1)
 	{
-	TQString s = i18n("The name '%1' is already used").arg(name);
+	TQString s = i18n("The name '%1' is already used").tqarg(name);
 	KMessageBox::sorry(this, s);
 	}
 	else
@@ -232,7 +232,7 @@ if (idx==0) return;
   {
    if (slman->getCollection(name.ascii())!=NULL)
 	{
-	TQString s = i18n("The name '%1' is already used").arg(name);
+	TQString s = i18n("The name '%1' is already used").tqarg(name);
 	KMessageBox::sorry(this, s);
 	}
 	else
diff --git a/kmid/kdisptext.cpp b/kmid/kdisptext.cpp
index a0e7461d..72436009 100644
--- a/kmid/kdisptext.cpp
+++ b/kmid/kdisptext.cpp
@@ -26,7 +26,7 @@
 #include <tqfont.h>
 #include <tqfontmetrics.h>
 #include <tqrect.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kconfig.h>
 #include <kglobal.h>
@@ -125,7 +125,7 @@ void KDisplayText::ClearEv(bool totally)
     TQT_TQOBJECT(this)->killTimers();
     autoscrollv=0;
     resizeContents(0,0);
-    viewport()->repaint(TRUE);
+    viewport()->tqrepaint(TRUE);
   }
 }
 
@@ -367,7 +367,7 @@ void KDisplayText::CursorToHome(void)
 
 
     setContentsPos(0,0);
-    viewport()->repaint(true);
+    viewport()->tqrepaint(true);
 } 
 
 void KDisplayText::PaintIn(int type)
@@ -487,7 +487,7 @@ void KDisplayText::gotomsec(ulong i)
 	TQT_TQOBJECT(this)->killTimers();
 	autoscrollv=0;
         setContentsPos(0,first_line->ypos);
-        viewport()->repaint();
+        viewport()->tqrepaint();
         
     }
 }
@@ -508,7 +508,7 @@ void KDisplayText::fontChanged(void)
     qfmetr=new TQFontMetrics(*qtextfont);
     calculatePositions();
     nvisiblelines=height()/qfmetr->lineSpacing();
-    viewport()->repaint(TRUE);
+    viewport()->tqrepaint(TRUE);
 }
 
 void KDisplayText::ChangeTypeOfTextEvents(int type)
@@ -534,7 +534,7 @@ void KDisplayText::ChangeTypeOfTextEvents(int type)
 
         setContentsPos(0,first_line->ypos);
     }
-    viewport()->repaint(TRUE);
+    viewport()->tqrepaint(TRUE);
 }
 
 int KDisplayText::ChooseTypeOfTextEvents(void)
diff --git a/kmid/kdisptext.h b/kmid/kdisptext.h
index 2c331425..8cd9939f 100644
--- a/kmid/kdisptext.h
+++ b/kmid/kdisptext.h
@@ -113,7 +113,7 @@ public:
     
     void setLyricsEncoding(const TQString &enc);
 
-//    TQSize sizeHint();
+//    TQSize tqsizeHint();
  
 public slots:
     void ScrollDown();
diff --git a/kmid/klcdnumber.cpp b/kmid/klcdnumber.cpp
index 3fdf80c4..355f9578 100644
--- a/kmid/klcdnumber.cpp
+++ b/kmid/klcdnumber.cpp
@@ -197,7 +197,7 @@ void KLCDNumber::setValue(double v)
 void KLCDNumber::display (double v)
 {
     setValue(v);
-    repaint(FALSE);
+    tqrepaint(FALSE);
 }
 
 void KLCDNumber::display (int v)
@@ -317,13 +317,13 @@ void KLCDNumber::defaultValueClicked()
 void KLCDNumber::setLCDBackgroundColor(int r,int g,int b)
 {
     backgcolor=TQColor(r,g,b);
-    repaint(FALSE);
+    tqrepaint(FALSE);
 }
 
 void KLCDNumber::setLCDColor(int r,int g,int b)
 {
     LCDcolor=TQColor(r,g,b);
-    repaint(FALSE);
+    tqrepaint(FALSE);
 }
 
 void KLCDNumber::setRange(double min, double max)
@@ -332,7 +332,7 @@ void KLCDNumber::setRange(double min, double max)
     maxValue=max;
 }
 
-TQSize KLCDNumber::sizeHint()
+TQSize KLCDNumber::tqsizeHint()
 {
     return TQSize(83,28);
 }
diff --git a/kmid/klcdnumber.h b/kmid/klcdnumber.h
index 6f9096c4..cf1fca4e 100644
--- a/kmid/klcdnumber.h
+++ b/kmid/klcdnumber.h
@@ -121,7 +121,7 @@ public:
     void display (int v);
     void display (double v);
 
-    TQSize sizeHint ();
+    TQSize tqsizeHint ();
 //    TQSizePolicy sizePolicy();
 
 protected:
diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp
index ce4a18fd..706e7cbf 100644
--- a/kmid/kmidclient.cpp
+++ b/kmid/kmidclient.cpp
@@ -35,7 +35,7 @@
 #include <tqlabel.h>
 #include <tqfile.h>
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kapplication.h>
 #include <kcharsets.h>
@@ -96,7 +96,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
     connect (timebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSeek(int)));
 
     timetags = new QSliderTime(timebar,this);
-    timetags->setMinimumSize(timetags->sizeHint());
+    timetags->setMinimumSize(timetags->tqsizeHint());
 
     qlabelTempo= new TQLabel(i18n("Tempo:"), this,"tempolabel",
                             TQLabel::NoFrame);
@@ -108,7 +108,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
     tempoLCD->setRange(3,999);
     tempoLCD->setDefaultValue(120);
     tempoLCD->setUserSetDefaultValue(true);
-    tempoLCD->setMinimumSize(tempoLCD->sizeHint());
+    tempoLCD->setMinimumSize(tempoLCD->tqsizeHint());
     connect(tempoLCD,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(slotSetTempo(double)));
 
     comboSongs = new TQComboBox(FALSE, this,"Songs");
@@ -290,10 +290,10 @@ int kmidClient::openFile(const char *filename)
         switch (r)
         {
         case (-1) : errormsg =
-                            i18n("The file %1 does not exist or cannot be opened.").arg(filename);
+                            i18n("The file %1 does not exist or cannot be opened.").tqarg(filename);
         break;
         case (-2) : errormsg =
-                            i18n("The file %1 is not a MIDI file.").arg(filename);break;
+                            i18n("The file %1 is not a MIDI file.").tqarg(filename);break;
         case (-3) : errormsg =
                             i18n("Ticks per quarter note is negative. Please send this file to larrosa@kde.org");break;
         case (-4) : errormsg =
@@ -301,7 +301,7 @@ int kmidClient::openFile(const char *filename)
         case (-5) : errormsg =
                             i18n("This file is corrupted or not well built.");break;
         case (-6) : errormsg =
-                            i18n("%1 is not a regular file.").arg(filename);break;
+                            i18n("%1 is not a regular file.").tqarg(filename);break;
         default :   errormsg = i18n("Unknown error message");break;
         }
         KMessageBox::error(this, errormsg);
@@ -310,10 +310,10 @@ int kmidClient::openFile(const char *filename)
         midifile_opened=0L;
         timebar->setRange(0,240000);
         timebar->setValue(0);
-        timetags->repaint(TRUE);
+        timetags->tqrepaint(TRUE);
         kdispt->ClearEv();
-        kdispt->repaint(TRUE);
-        topLevelWidget()->setCaption("KMid");
+        kdispt->tqrepaint(TRUE);
+        tqtopLevelWidget()->setCaption("KMid");
 
         return -1;
     }
@@ -327,7 +327,7 @@ int kmidClient::openFile(const char *filename)
     //    noteArray=player->parseNotes();
     noteArray=player->noteArray();
     timebar->setRange(0,(int)(player->information()->millisecsTotal));
-    timetags->repaint(TRUE);
+    timetags->tqrepaint(TRUE);
     kdispt->ClearEv();
     spev=player->specialEvents();
     while (spev)
@@ -343,7 +343,7 @@ int kmidClient::openFile(const char *filename)
     kdispt->CursorToHome();
 //    kdispt->updateScrollBars();
     emit mustRechooseTextEvent();
-    kdispt->repaint(TRUE);
+    kdispt->tqrepaint(TRUE);
     tempoLCD->display(tempoToMetronomeTempo(m_kMid.pctl->tempo));
     currentTempo=tempoLCD->getValue();
     tempoLCD->setDefaultValue(tempoToMetronomeTempo(m_kMid.pctl->tempo)*m_kMid.pctl->ratioTempo);
@@ -353,7 +353,7 @@ int kmidClient::openFile(const char *filename)
     char *capt=new char[strlen(fn)+20];
     sprintf(capt,"KMid - %s",fn);
     delete fn;
-    topLevelWidget()->setCaption(capt);
+    tqtopLevelWidget()->setCaption(capt);
     delete capt;
 
     timebar->setValue(0);
@@ -1129,7 +1129,7 @@ void kmidClient::repaintText(int type)
 {
     kdispt->ChangeTypeOfTextEvents(type);
     typeoftextevents=type;
-    kdispt->repaint(TRUE);
+    kdispt->tqrepaint(TRUE);
 }
 
 int kmidClient::ChooseTypeOfTextEvents(void)
@@ -1265,12 +1265,12 @@ void kmidClient::slotSelectSong(int i)
         player->removeSong();
         timebar->setRange(0,240000);
         timebar->setValue(0);
-        timetags->repaint(TRUE);
+        timetags->tqrepaint(TRUE);
         kdispt->ClearEv();
-        kdispt->repaint(TRUE);
+        kdispt->tqrepaint(TRUE);
         comboSongs->clear();
-        comboSongs->repaint(TRUE);
-        topLevelWidget()->setCaption("KMid");
+        comboSongs->tqrepaint(TRUE);
+        tqtopLevelWidget()->setCaption("KMid");
         return;
     }
 
@@ -1487,7 +1487,7 @@ void kmidClient::slotSetTempo(double value)
 
     timebar->setRange(0,(int)(player->information()->millisecsTotal));
     timebar->setValue(pausedatmillisec);
-    timetags->repaint(TRUE);
+    timetags->tqrepaint(TRUE);
 
     kdispt->ClearEv(false);
 
@@ -1522,9 +1522,9 @@ void kmidClient::downloadFinished(KIO::Job *)
     kapp->exit_loop();
 }
 
-TQSize kmidClient::sizeHint() const
+TQSize kmidClient::tqsizeHint() const
 {
-    TQSize sh = TQWidget::sizeHint();
+    TQSize sh = TQWidget::tqsizeHint();
     return sh.expandedTo(TQSize(560,420));
 }
 
diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h
index 3b6fbad8..dbfa7518 100644
--- a/kmid/kmidclient.h
+++ b/kmid/kmidclient.h
@@ -217,7 +217,7 @@ public:
     void setCurrentSong(int i);
     void setPlayListMode(int i);
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 private:
     TQSlider *timebar;
     QSliderTime *timetags;
diff --git a/kmid/kmidframe.cpp b/kmid/kmidframe.cpp
index 0b02c608..9ebf9f84 100644
--- a/kmid/kmidframe.cpp
+++ b/kmid/kmidframe.cpp
@@ -567,7 +567,7 @@ void kmidFrame::file_SaveLyrics()
 
   if (stat(TQFile::encodeName(filename), &statbuf)!=-1)
   {
-    TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").arg(filename);
+    TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").tqarg(filename);
     if (KMessageBox::warningYesNo(this,s,TQString(),i18n("Overwrite"),KStdGuiItem::cancel())==1)
       return;
   }
diff --git a/kmid/ktrianglebutton.cpp b/kmid/ktrianglebutton.cpp
index e94f0980..155daf31 100644
--- a/kmid/ktrianglebutton.cpp
+++ b/kmid/ktrianglebutton.cpp
@@ -47,7 +47,7 @@ void KTriangleButton::enterEvent( TQEvent* )
   if ( isEnabled() )
     {
       raised = TRUE;
-      repaint(FALSE);
+      tqrepaint(FALSE);
     }
 }
 
@@ -56,7 +56,7 @@ void KTriangleButton::leaveEvent( TQEvent * )
   if( raised != FALSE )
     {
       raised = FALSE;
-      repaint();
+      tqrepaint();
     }
 }
 
@@ -75,21 +75,21 @@ void KTriangleButton::paint( TQPainter *painter )
 {
   if ( isDown() || isOn() )
     {
-      if ( tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+      if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
 	qDrawWinButton( painter, 0, 0, width(),
-			height(), colorGroup(), TRUE );
+			height(), tqcolorGroup(), TRUE );
       else
 	qDrawShadePanel( painter, 0, 0, width(),
-			 height(), colorGroup(), TRUE, 2, 0L );
+			 height(), tqcolorGroup(), TRUE, 2, 0L );
     }
   else if ( raised )
     {
-      if ( tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+      if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
 	qDrawWinButton( painter, 0, 0, width(), height(),
-			colorGroup(), FALSE );
+			tqcolorGroup(), FALSE );
       else
 	qDrawShadePanel( painter, 0, 0, width(), height(),
-			 colorGroup(), FALSE, 2, 0L );
+			 tqcolorGroup(), FALSE, 2, 0L );
     }
 
   if (dir==Right)
diff --git a/kmid/main.cpp b/kmid/main.cpp
index 4e83d57f..45cd1fab 100644
--- a/kmid/main.cpp
+++ b/kmid/main.cpp
@@ -26,7 +26,7 @@
 #include <signal.h>
 
 #include <tqwidget.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kapplication.h>
 #include <klocale.h>
diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp
index 8a434711..00497d05 100644
--- a/kmid/midicfgdlg.cpp
+++ b/kmid/midicfgdlg.cpp
@@ -24,7 +24,7 @@
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 #include <tqlabel.h> 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kapplication.h>
 #include <kfiledialog.h>
@@ -56,7 +56,7 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
   for (int i=0;i<devman->midiPorts()+devman->synthDevices();i++)
   {
     if (strcmp(devman->type(i),"")!=0)    
-      temp = TQString("%1 - %2").arg(devman->name(i)).arg(devman->type(i));
+      temp = TQString("%1 - %2").tqarg(devman->name(i)).tqarg(devman->type(i));
     else
       temp = devman->name(i);
 
diff --git a/kmid/qslidertime.cpp b/kmid/qslidertime.cpp
index aa879da5..ba1b62f8 100644
--- a/kmid/qslidertime.cpp
+++ b/kmid/qslidertime.cpp
@@ -108,7 +108,7 @@ if (kslider==NULL) return;
 }  
 
 
-TQSize QSliderTime::sizeHint()
+TQSize QSliderTime::tqsizeHint()
 {
   return TQSize(10,fontheight+2);
 }
diff --git a/kmid/qslidertime.h b/kmid/qslidertime.h
index 3dda085d..a409332b 100644
--- a/kmid/qslidertime.h
+++ b/kmid/qslidertime.h
@@ -43,7 +43,7 @@ public:
 
   int getFontHeight(void) {return fontheight;};
 
-  TQSize sizeHint();
+  TQSize tqsizeHint();
   TQSizePolicy sizePolicy();
 
 private:
diff --git a/kmid/rhythmview.cpp b/kmid/rhythmview.cpp
index 240ee242..49499d46 100644
--- a/kmid/rhythmview.cpp
+++ b/kmid/rhythmview.cpp
@@ -95,7 +95,7 @@ void RhythmView::resizeEvent(TQResizeEvent *)
     }
 }
 
-TQSize RhythmView::sizeHint()
+TQSize RhythmView::tqsizeHint()
 {
     return TQSize(10,10);
 }
diff --git a/kmid/rhythmview.h b/kmid/rhythmview.h
index 8af09613..97a7ae1a 100644
--- a/kmid/rhythmview.h
+++ b/kmid/rhythmview.h
@@ -43,7 +43,7 @@ public:
 
     void Beat(void); // Just increase the beat
 
-    TQSize sizeHint();
+    TQSize tqsizeHint();
     TQSizePolicy sizePolicy();
 
 private:
diff --git a/kmix/colorwidget.ui b/kmix/colorwidget.ui
index 27739653..d91d9ea9 100644
--- a/kmix/colorwidget.ui
+++ b/kmix/colorwidget.ui
@@ -236,7 +236,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp
index b2e09726..b70c2b6c 100644
--- a/kmix/dialogselectmaster.cpp
+++ b/kmix/dialogselectmaster.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <tqbuttongroup.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqptrlist.h>
 #include <tqradiobutton.h>
@@ -67,15 +67,15 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer)
       TQHBoxLayout* mixerNameLayout = new TQHBoxLayout( _layout );
       //widgetsLayout->setStretchFactor( mixerNameLayout, 0 );
       //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
-      //mixerNameLayout->setSizePolicy(qsp);
+      //mixerNameLayout->tqsetSizePolicy(qsp);
       mixerNameLayout->setSpacing(KDialog::spacingHint());
 
       TQLabel *qlbl = new TQLabel( i18n("Current Mixer"), m_mainFrame );
       mixerNameLayout->addWidget(qlbl);
-      qlbl->setFixedHeight(qlbl->sizeHint().height());
+      qlbl->setFixedHeight(qlbl->tqsizeHint().height());
 
       m_cMixer = new KComboBox( FALSE, m_mainFrame, "mixerCombo" );
-      m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
+      m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height());
       connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( createPageByID( int ) ) );
 
       //int id=1;
diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp
index 5395dd13..28cf3c3f 100644
--- a/kmix/dialogviewconfiguration.cpp
+++ b/kmix/dialogviewconfiguration.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqptrlist.h>
 
@@ -58,7 +58,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view)
 	}
     }
     _layout->activate();
-    resize(_layout->sizeHint() );
+    resize(_layout->tqsizeHint() );
     connect( this, TQT_SIGNAL(okClicked())   , this, TQT_SLOT(apply()) );
 }
 
@@ -93,9 +93,9 @@ void DialogViewConfiguration::apply()
     _view.configurationUpdate();
 }
 
-TQSize DialogViewConfiguration::sizeHint() const {
-    //    kdDebug(67100) << "DialogViewConfiguration::sizeHint() is (100,500)\n";
-    return _layout->sizeHint();
+TQSize DialogViewConfiguration::tqsizeHint() const {
+    //    kdDebug(67100) << "DialogViewConfiguration::tqsizeHint() is (100,500)\n";
+    return _layout->tqsizeHint();
 }
 
 #include "dialogviewconfiguration.moc"
diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h
index 8d64bd27..c0a80bae 100644
--- a/kmix/dialogviewconfiguration.h
+++ b/kmix/dialogviewconfiguration.h
@@ -18,7 +18,7 @@ class DialogViewConfiguration : public KDialogBase
     DialogViewConfiguration(TQWidget* parent, ViewBase& view);
     ~DialogViewConfiguration();
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
  public slots:
     void apply();
 
diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp
index 3ad3ba75..7e9fbe02 100644
--- a/kmix/kledbutton.cpp
+++ b/kmix/kledbutton.cpp
@@ -33,8 +33,8 @@ KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
 }
 
 KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
-		       KLed::Shape shape, TQWidget *parent, const char *name)
-   : KLed( col, st, look, shape, parent, name )
+		       KLed::Shape tqshape, TQWidget *parent, const char *name)
+   : KLed( col, st, look, tqshape, parent, name )
 {
 }
 
@@ -66,7 +66,7 @@ bool KLedButton::eventFilter( TQObject* /*obj*/ , TQEvent* /*ev*/ ) {
 
 }	
 
-TQSize KLedButton::sizeHint() const
+TQSize KLedButton::tqsizeHint() const
 {
     return size();
 }
diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h
index 36572ad2..da07d492 100644
--- a/kmix/kledbutton.h
+++ b/kmix/kledbutton.h
@@ -35,11 +35,11 @@ class KLedButton : public KLed  {
   TQ_OBJECT
   public: 
    KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
-   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
+   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
 	      TQWidget *parent=0, const char *name=0);
    ~KLedButton();	
 
-   TQSize sizeHint () const;
+   TQSize tqsizeHint () const;
    TQSizePolicy sizePolicy () const;
   signals:
    void stateChanged( bool newState );
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index 58fe57f6..3db2ec09 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -25,7 +25,7 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqwidgetstack.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 
 // include files for KDE
@@ -145,10 +145,10 @@ KMixWindow::initPrefDlg()
 void
 KMixWindow::initWidgets()
 {
-	// Main widget and layout
+	// Main widget and tqlayout
 	setCentralWidget( new TQWidget(  this, "qt_central_widget" ) );
 
-	// Widgets layout
+	// Widgets tqlayout
 	widgetsLayout = new TQVBoxLayout(   centralWidget(), 0, 0, "widgetsLayout" );
 	widgetsLayout->setResizeMode(TQLayout::Minimum); // works fine
 
@@ -157,16 +157,16 @@ KMixWindow::initWidgets()
 	mixerNameLayout = new TQHBox( centralWidget(), "mixerNameLayout" );
         widgetsLayout->setStretchFactor( mixerNameLayout, 0 );
 	TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
-	mixerNameLayout->setSizePolicy(qsp);
+	mixerNameLayout->tqsetSizePolicy(qsp);
 	mixerNameLayout->setSpacing(KDialog::spacingHint());
 	TQLabel *qlbl = new TQLabel( i18n("Current mixer:"), mixerNameLayout );
-	qlbl->setFixedHeight(qlbl->sizeHint().height());
+	qlbl->setFixedHeight(qlbl->tqsizeHint().height());
 	m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" );
-	m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
+	m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height());
 	connect( m_cMixer, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) );
 	TQToolTip::add( m_cMixer, i18n("Current mixer" ) );
 
-	// Add first layout to widgets
+	// Add first tqlayout to widgets
 	widgetsLayout->addWidget( mixerNameLayout );
 
 	m_wsMixers = new TQWidgetStack( centralWidget(), "MixerWidgetStack" );
@@ -522,11 +522,11 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg )
    }
    if ( prefDlg->_rbVertical->isChecked() ) {
       //TQString "For a change of language to take place, quit and restart KDiff3.";
-      //kdDebug(67100) << "KMix should change toQt::Vertical layout\n";
+      //kdDebug(67100) << "KMix should change toQt::Vertical tqlayout\n";
       m_toplevelOrientation = Qt::Vertical;
    }
    else if ( prefDlg->_rbHorizontal->isChecked() ) {
-     //kdDebug(67100) << "KMix should change toQt::Horizontal layout\n";
+     //kdDebug(67100) << "KMix should change toQt::Horizontal tqlayout\n";
      m_toplevelOrientation = Qt::Horizontal;
    }
    m_autoStart = prefDlg->m_autoStartChk->isChecked();
@@ -551,7 +551,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg )
        show();
    }
 
-   this->repaint(); // make KMix look fast (saveConfig() often uses several seconds)
+   this->tqrepaint(); // make KMix look fast (saveConfig() often uses several seconds)
    kapp->processEvents();
    saveConfig();
 }
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 871c47a7..741cbd0e 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -27,7 +27,7 @@
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -205,8 +205,8 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
 	// No mixer set by user (kmixappletrc_*) and more than one to choose
 	// We do NOT know which mixer to use => ask the User
 	m_errorLabel = new TQPushButton( i18n("Select Mixer"), this );
-	m_errorLabel->setGeometry(0, 0, m_errorLabel->sizeHint().width(),  m_errorLabel->sizeHint().height() );
-	resize( m_errorLabel->sizeHint() );
+	m_errorLabel->setGeometry(0, 0, m_errorLabel->tqsizeHint().width(),  m_errorLabel->tqsizeHint().height() );
+	resize( m_errorLabel->tqsizeHint() );
 	connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) );
     }
     else {
@@ -375,7 +375,7 @@ void KMixApplet::positionChange(Position pos) {
 	loadConfig();
 	setColors();
 	
-	const TQSize panelAppletConstrainedSize = sizeHint();
+	const TQSize panelAppletConstrainedSize = tqsizeHint();
 	m_mixerWidget->setGeometry( 0, 0, panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
 	resize( panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
 	//setFixedSize(panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
@@ -401,7 +401,7 @@ void KMixApplet::resizeEvent(TQResizeEvent *e)
     }
 
 
-    // resizing changes our own sizeHint(), because we must take the new PanelSize in account.
+    // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account.
     // So updateGeometry() is amust for us.
     //kdDebug(67100) << "KMixApplet::resizeEvent(). UPDATE GEOMETRY" << endl;
     updateGeometry();
@@ -414,21 +414,21 @@ void KMixApplet::updateGeometrySlot() {
 }
 
 
-TQSize KMixApplet::sizeHint() const {
-    //kdDebug(67100) << "KMixApplet::sizeHint()\n";
+TQSize KMixApplet::tqsizeHint() const {
+    //kdDebug(67100) << "KMixApplet::tqsizeHint()\n";
     TQSize qsz;
     if ( m_errorLabel !=0 ) {
-	qsz = m_errorLabel->sizeHint();
+	qsz = m_errorLabel->tqsizeHint();
     }
     else if (  m_mixerWidget != 0) {
-	qsz = m_mixerWidget->sizeHint();
+	qsz = m_mixerWidget->tqsizeHint();
     }
     else {
 	// During construction of m_mixerWidget or if something goes wrong:
-	// Return something that should resemble our former sizeHint().
+	// Return something that should resemble our former tqsizeHint().
 	qsz = size();
     }
-    //kdDebug(67100) << "KMixApplet::sizeHint() leftright =" << qsz << "\n";
+    //kdDebug(67100) << "KMixApplet::tqsizeHint() leftright =" << qsz << "\n";
     return qsz;
 }
 
@@ -437,12 +437,12 @@ TQSize KMixApplet::sizeHint() const {
    using this method. Actually we ignore the passed paramater and just return our preferred size.
 */
 int KMixApplet::widthForHeight(int) const {
-    //kdDebug(67100) << "KMixApplet::widthForHeight() = " << sizeHint().width() << endl;
-    return sizeHint().width();
+    //kdDebug(67100) << "KMixApplet::widthForHeight() = " << tqsizeHint().width() << endl;
+    return tqsizeHint().width();
 }
 int KMixApplet::heightForWidth(int) const {
-    //kdDebug(67100) << "KMixApplet::heightForWidth() = " << sizeHint().height() << endl;
-    return sizeHint().height();
+    //kdDebug(67100) << "KMixApplet::heightForWidth() = " << tqsizeHint().height() << endl;
+    return tqsizeHint().height();
 }
 
 
diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h
index de994c84..5f7136ad 100644
--- a/kmix/kmixapplet.h
+++ b/kmix/kmixapplet.h
@@ -23,7 +23,7 @@
 #define KMIXAPPLET_H
 
 // TQt
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrlist.h>
 #include <tqwidget.h>
 
@@ -88,7 +88,7 @@ public:
    void reportBug();
    void paletteChange ( const TQPalette & oldPalette );
 
-   TQSize sizeHint() const;
+   TQSize tqsizeHint() const;
    TQSizePolicy sizePolicy() const;
    int widthForHeight(int) const;
    int heightForWidth(int) const;
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index aff3e500..039d3237 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -191,7 +191,7 @@ KMixDockWidget::setVolumeTip()
         }
 	newToolTipValue = val + 10000*md->isMuted();
 	if ( _oldToolTipValue != newToolTipValue ) {
-	    tip = i18n( "Volume at %1%" ).arg( val );
+	    tip = i18n( "Volume at %1%" ).tqarg( val );
 	    if ( md->isMuted() ) {
 		tip += i18n( " (Muted)" );
 	    }
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index 3251db09..56c90d03 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -21,7 +21,7 @@
 
 // TQt
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <tqstring.h>
 #include <tqtooltip.h>
@@ -76,13 +76,13 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
    {
        // No mixer found
        // !! Fix this: This is actually never shown!
-       TQBoxLayout *layout = new TQHBoxLayout( this );
+       TQBoxLayout *tqlayout = new TQHBoxLayout( this );
        TQString s = i18n("Invalid mixer");
        if ( !mixerName.isEmpty() )
 	   s.append(" \"").append(mixerName).append("\"");
        TQLabel *errorLabel = new TQLabel( s, this );
-       errorLabel->setAlignment( TQLabel::AlignCenter | TQLabel::WordBreak );
-       layout->addWidget( errorLabel );
+       errorLabel->tqsetAlignment( TQLabel::AlignCenter | TQLabel::WordBreak );
+       tqlayout->addWidget( errorLabel );
    }
 }
 
@@ -103,7 +103,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
 	delete m_topLayout;
     }
 
-    // create main layout
+    // create main tqlayout
     m_topLayout = new TQVBoxLayout( this, 0, 3,  "m_topLayout" );
 
     // Create tabs of input + output + [...]
@@ -136,8 +136,8 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
     m_balanceSlider = new TQSlider( -100, 100, 25, 0, Qt::Horizontal, this, "RightLeft" );
     m_balanceSlider->setTickmarks( TQSlider::Below );
     m_balanceSlider->setTickInterval( 25 );
-    m_balanceSlider->setMinimumSize( m_balanceSlider->sizeHint() );
-    m_balanceSlider->setFixedHeight( m_balanceSlider->sizeHint().height() );
+    m_balanceSlider->setMinimumSize( m_balanceSlider->tqsizeHint() );
+    m_balanceSlider->setFixedHeight( m_balanceSlider->tqsizeHint().height() );
 
     TQLabel *mixerName = new TQLabel(this, "mixerName");
     mixerName->setText( _mixer->mixerName() );
diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp
index 7bcc1d70..3cfa42e5 100644
--- a/kmix/kmixprefdlg.cpp
+++ b/kmix/kmixprefdlg.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <tqbuttongroup.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
@@ -43,36 +43,36 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
    // general buttons
    m_generalTab = plainPage( /* i18n("&General") */ );
 
-   TQBoxLayout *layout = new TQVBoxLayout( m_generalTab );
-   layout->setSpacing( KDialog::spacingHint() );
+   TQBoxLayout *tqlayout = new TQVBoxLayout( m_generalTab );
+   tqlayout->setSpacing( KDialog::spacingHint() );
 
    m_dockingChk = new TQCheckBox( i18n("&Dock into panel"), m_generalTab );
-   layout->addWidget( m_dockingChk );
+   tqlayout->addWidget( m_dockingChk );
    TQWhatsThis::add(m_dockingChk, i18n("Docks the mixer into the KDE panel"));
 
    m_volumeChk = new TQCheckBox(i18n("Enable system tray &volume control"),
 			       m_generalTab);
-   layout->addWidget(m_volumeChk);
+   tqlayout->addWidget(m_volumeChk);
 
    m_showTicks = new TQCheckBox( i18n("Show &tickmarks"), m_generalTab );
-   layout->addWidget( m_showTicks );
+   tqlayout->addWidget( m_showTicks );
    TQWhatsThis::add(m_showTicks,
            i18n("Enable/disable tickmark scales on the sliders"));
 
    m_showLabels = new TQCheckBox( i18n("Show &labels"), m_generalTab );
-   layout->addWidget( m_showLabels );
+   tqlayout->addWidget( m_showLabels );
    TQWhatsThis::add(m_showLabels,
            i18n("Enables/disables description labels above the sliders"));
 
 
    m_onLogin = new TQCheckBox( i18n("Restore volumes on login"), m_generalTab );
-   layout->addWidget( m_onLogin );
+   tqlayout->addWidget( m_onLogin );
 
    m_dockIconMuting = new TQCheckBox( 
             i18n("Middle click on system tray icon toggles muting"), m_generalTab );
-   layout->addWidget( m_dockIconMuting );
+   tqlayout->addWidget( m_dockIconMuting );
 
-   TQBoxLayout *numbersLayout = new TQHBoxLayout( layout );
+   TQBoxLayout *numbersLayout = new TQHBoxLayout( tqlayout );
    TQButtonGroup *numbersGroup = new TQButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab );
    numbersGroup->setRadioButtonExclusive(true);
    TQLabel* qlbl = new TQLabel(  i18n("Volume Values: "), m_generalTab );
@@ -91,10 +91,10 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
    numbersLayout->addStretch();
 
    m_autoStartChk = new TQCheckBox( i18n("&Autostart"), m_generalTab );
-   layout->addWidget( m_autoStartChk );
+   tqlayout->addWidget( m_autoStartChk );
    TQWhatsThis::add(m_autoStartChk, i18n("Automatically start mixer when you login"));
 
-   TQBoxLayout *orientationLayout = new TQHBoxLayout( layout );
+   TQBoxLayout *orientationLayout = new TQHBoxLayout( tqlayout );
    TQButtonGroup* orientationGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Orientation"), m_generalTab );
    //orientationLayout->add(orientationGroup);
    orientationGroup->setRadioButtonExclusive(true);
@@ -112,7 +112,7 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent )
    orientationLayout->add(_rbVertical);
 
    orientationLayout->addStretch();
-   layout->addStretch();
+   tqlayout->addStretch();
    enableButtonSeparator(true);
 
    connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(apply()) );
diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp
index d65f9a1a..fea113b5 100644
--- a/kmix/ksmallslider.cpp
+++ b/kmix/ksmallslider.cpp
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tqpainter.h>
 #include <tqcolor.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqstyle.h>
 
 #include "kglobalsettings.h"
@@ -225,7 +225,7 @@ void KSmallSlider::paintEvent( TQPaintEvent * )
    int sliderPos = positionFromValue( TQRangeControl::value() );
 
    // ------------------------ draw 3d border ---------------------------------------------
-   tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE );
+   tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), tqcolorGroup(), TRUE );
 
 
    // ------------------------ draw lower/left part ----------------------------------------
@@ -396,7 +396,7 @@ int KSmallSlider::goodPart( const TQPoint &p ) const
 }
 
 /***************** SIZE STUFF START ***************/
-TQSize KSmallSlider::sizeHint() const
+TQSize KSmallSlider::tqsizeHint() const
 {
     //constPolish();
     const int length = 25;
@@ -409,7 +409,7 @@ TQSize KSmallSlider::sizeHint() const
 }
 
 
-TQSize KSmallSlider::minimumSizeHint() const
+TQSize KSmallSlider::tqminimumSizeHint() const
 {
     TQSize s(10,10);
     return s;
@@ -486,7 +486,7 @@ void KSmallSlider::setGray( bool value )
    {
       grayed = value;
       update();
-      //repaint();
+      //tqrepaint();
    }
 }
 
@@ -501,7 +501,7 @@ void KSmallSlider::setColors( TQColor high, TQColor low, TQColor back )
     colLow = low;
     colBack = back;
     update();
-    //repaint();
+    //tqrepaint();
 }
 
 void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back )
@@ -510,7 +510,7 @@ void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back )
     grayLow = low;
     grayBack = back;
     update();
-    //repaint();
+    //tqrepaint();
 }
 
 #include "ksmallslider.moc"
diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h
index 2ed0f6e6..7b672720 100644
--- a/kmix/ksmallslider.h
+++ b/kmix/ksmallslider.h
@@ -42,9 +42,9 @@ class KSmallSlider : public TQWidget, public TQRangeControl
 
     //virtual void setTracking( bool enable );
     //bool tracking() const;
-      TQSize sizeHint() const;
+      TQSize tqsizeHint() const;
       TQSizePolicy sizePolicy() const;
-      TQSize minimumSizeHint() const;
+      TQSize tqminimumSizeHint() const;
 
       int minValue() const;
       int maxValue() const;
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index 3cf28ac4..90ac1350 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobject.h>
 #include <tqtooltip.h>
 
@@ -75,21 +75,21 @@ void MDWEnum::createWidgets()
 {
 	if ( _orientation == Qt::Vertical ) {
 		_layout = new TQVBoxLayout( this );
-		_layout->setAlignment(TQt::AlignHCenter);
+		_layout->tqsetAlignment(TQt::AlignHCenter);
 	}
 	else {
 		_layout = new TQHBoxLayout( this );
-		_layout->setAlignment(TQt::AlignVCenter);
+		_layout->tqsetAlignment(TQt::AlignVCenter);
 	}
 	TQToolTip::add( this, m_mixdevice->name() );
 	
         //this->setStretchFactor( _layout, 0 );
         //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum);
-        //_layout->setSizePolicy(qsp);
+        //_layout->tqsetSizePolicy(qsp);
         //_layout->setSpacing(KDialog::spacingHint());
         _label = new TQLabel( m_mixdevice->name(), this);
 	_layout->addWidget(_label);
-        _label->setFixedHeight(_label->sizeHint().height());
+        _label->setFixedHeight(_label->tqsizeHint().height());
         _enumCombo = new KComboBox( FALSE, this, "mixerCombo" );
 	// ------------ fill ComboBox start ------------
 	int maxEnumId= m_mixdevice->enumValues().count();
@@ -98,7 +98,7 @@ void MDWEnum::createWidgets()
 	}
 	// ------------ fill ComboBox end --------------
 	_layout->addWidget(_enumCombo);
-        _enumCombo->setFixedHeight(_enumCombo->sizeHint().height());
+        _enumCombo->setFixedHeight(_enumCombo->tqsizeHint().height());
         connect( _enumCombo, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( setEnumId( int ) ) );
         TQToolTip::add( _enumCombo, m_mixdevice->name() );
 	
@@ -127,13 +127,13 @@ void MDWEnum::showContextMenu()
     menu->popup( pos );
 }
 
-TQSize MDWEnum::sizeHint() const {
+TQSize MDWEnum::tqsizeHint() const {
     if ( _layout != 0 ) {
-	return _layout->sizeHint();
+	return _layout->tqsizeHint();
     }
     else {
-	// layout not (yet) created
-	return TQWidget::sizeHint();
+	// tqlayout not (yet) created
+	return TQWidget::tqsizeHint();
     }
 }
 
diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h
index 398afa93..0a77506f 100644
--- a/kmix/mdwenum.h
+++ b/kmix/mdwenum.h
@@ -51,7 +51,7 @@ public:
     ~MDWEnum();
 
     void addActionToPopup( KAction *action );
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     bool eventFilter( TQObject* obj, TQEvent* e );
 
 public slots:
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 9e6fe11e..8d363c5e 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -33,7 +33,7 @@
 #include <tqcursor.h>
 #include <tqslider.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqtooltip.h>
 #include <tqwmatrix.h>
@@ -81,11 +81,11 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
 	// create widgets
 	createWidgets( showMuteLED, showRecordLED );
 
-	m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
-	m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
-	m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
 
 	installEventFilter( this ); // filter for popup
@@ -115,25 +115,25 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 {
     if ( _orientation == Qt::Vertical ) {
 	_layout = new TQVBoxLayout( this );
-	_layout->setAlignment(TQt::AlignCenter);
+	_layout->tqsetAlignment(TQt::AlignCenter);
     }
     else {
 	_layout = new TQHBoxLayout( this );
-	_layout->setAlignment(TQt::AlignCenter);
+	_layout->tqsetAlignment(TQt::AlignCenter);
     }
 
 	 // -- MAIN SLIDERS LAYOUT  ---
 	 TQBoxLayout *slidersLayout;
 	 if ( _orientation == Qt::Vertical ) {
 		 slidersLayout = new TQHBoxLayout( _layout );
-		 slidersLayout->setAlignment(TQt::AlignVCenter);
+		 slidersLayout->tqsetAlignment(TQt::AlignVCenter);
 	 }
 	 else {
 		 slidersLayout = new TQVBoxLayout( _layout );
-		 slidersLayout->setAlignment(TQt::AlignHCenter);
+		 slidersLayout->tqsetAlignment(TQt::AlignHCenter);
 	 }
 
-	 /* cesken: This is inconsistent. Why should vertical and horizontal layout differ?
+	 /* cesken: This is inconsistent. Why should vertical and horizontal tqlayout differ?
 	  *         Also it eats too much space - especially when you don't show sliders at all.
 	  *         Even more on the vertical panel applet (see Bug #97667)
 	     if ( _orientation == Qt::Horizontal )
@@ -145,11 +145,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 	 TQBoxLayout *labelLayout;
 	 if ( _orientation == Qt::Vertical ) {
 		 labelLayout = new TQVBoxLayout( slidersLayout );
-		 labelLayout->setAlignment(TQt::AlignHCenter);
+		 labelLayout->tqsetAlignment(TQt::AlignHCenter);
 	 }
 	 else {
 		 labelLayout = new TQHBoxLayout( slidersLayout );
-		 labelLayout->setAlignment(TQt::AlignVCenter);
+		 labelLayout->tqsetAlignment(TQt::AlignVCenter);
 	 }
     if ( _orientation == Qt::Vertical ) {
 		 m_label = new VerticalText( this, m_mixdevice->name().utf8().data() );
@@ -183,22 +183,22 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 	 TQBoxLayout *sliLayout;
 	 if ( _orientation == Qt::Vertical ) {
 		 sliLayout = new TQVBoxLayout( slidersLayout );
-		 sliLayout->setAlignment(TQt::AlignHCenter);
+		 sliLayout->tqsetAlignment(TQt::AlignHCenter);
     }
     else {
 		 sliLayout = new TQHBoxLayout( slidersLayout );
-		 sliLayout->setAlignment(TQt::AlignVCenter);
+		 sliLayout->tqsetAlignment(TQt::AlignVCenter);
 	 }
 
 	 // --- ICON  ----------------------------
     TQBoxLayout *iconLayout;
     if ( _orientation == Qt::Vertical ) {
 		 iconLayout = new TQHBoxLayout( sliLayout );
-		 iconLayout->setAlignment(TQt::AlignVCenter);
+		 iconLayout->tqsetAlignment(TQt::AlignVCenter);
 	 }
 	 else {
 		 iconLayout = new TQVBoxLayout( sliLayout );
-		 iconLayout->setAlignment(TQt::AlignHCenter);
+		 iconLayout->tqsetAlignment(TQt::AlignHCenter);
 	 }
 
 	 m_iconLabel = 0L;
@@ -213,36 +213,36 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 
 	 // --- MUTE LED
 	 if ( showMuteLED ) {
-		 TQBoxLayout *ledlayout;
+		 TQBoxLayout *ledtqlayout;
 		 if ( _orientation == Qt::Vertical ) {
-			 ledlayout = new TQHBoxLayout( sliLayout );
-			 ledlayout->setAlignment(TQt::AlignVCenter);
+			 ledtqlayout = new TQHBoxLayout( sliLayout );
+			 ledtqlayout->tqsetAlignment(TQt::AlignVCenter);
 		 }
 		 else {
-			 ledlayout = new TQVBoxLayout( sliLayout );
-			 ledlayout->setAlignment(TQt::AlignHCenter);
+			 ledtqlayout = new TQVBoxLayout( sliLayout );
+			 ledtqlayout->tqsetAlignment(TQt::AlignHCenter);
 		 }
 
 		 if( m_mixdevice->hasMute() )
 		 {
-			 ledlayout->addStretch();
+			 ledtqlayout->addStretch();
 			 // create mute LED
 			 m_muteLED = new KLedButton( TQt::green, KLed::On, KLed::Sunken,
 					 KLed::Circular, this, "MuteLED" );
 			 m_muteLED->setFixedSize( TQSize(16, 16) );
 			 m_muteLED->resize( TQSize(16, 16) );
-			 ledlayout->addWidget( m_muteLED );
+			 ledtqlayout->addWidget( m_muteLED );
 			 TQToolTip::add( m_muteLED, i18n( "Mute" ) );
 			 connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) );
 			 m_muteLED->installEventFilter( this );
-			 ledlayout->addStretch();
+			 ledtqlayout->addStretch();
 		 } // has Mute LED
 		 else {
 			 // we don't have a MUTE LED. We create a dummy widget
 			 // !! possibly not neccesary any more (we are layouted)
 			 TQWidget *qw = new TQWidget(this, "Spacer");
 			 qw->setFixedSize( TQSize(16, 16) );
-			 ledlayout->addWidget(qw);
+			 ledtqlayout->addWidget(qw);
 			 qw->installEventFilter( this );
 		 } // has no Mute LED
 
@@ -253,11 +253,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 	 TQBoxLayout *volLayout;
 	 if ( _orientation == Qt::Vertical ) {
 		 volLayout = new TQHBoxLayout( sliLayout );
-		 volLayout->setAlignment(TQt::AlignVCenter);
+		 volLayout->tqsetAlignment(TQt::AlignVCenter);
 	 }
 	 else {
 		 volLayout = new TQVBoxLayout( sliLayout );
-		 volLayout->setAlignment(TQt::AlignHCenter);
+		 volLayout->tqsetAlignment(TQt::AlignHCenter);
 	 }
 
 	 // Sliders and volume number indication
@@ -273,11 +273,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 
 		 if ( _orientation == Qt::Vertical ) {
 		   slinumLayout = new TQVBoxLayout( volLayout );
-		   slinumLayout->setAlignment(TQt::AlignHCenter);
+		   slinumLayout->tqsetAlignment(TQt::AlignHCenter);
 		 }
 		 else {
 		   slinumLayout = new TQHBoxLayout( volLayout );
-		   slinumLayout->setAlignment(TQt::AlignVCenter);
+		   slinumLayout->tqsetAlignment(TQt::AlignVCenter);
 		 }
 
 		 // create labels to hold volume values (taken from qamix/kamix)
@@ -285,7 +285,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 		 slinumLayout->addWidget( number );
 		 number->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 		 number->setLineWidth( 2 );
-		 number->setMinimumWidth( number->sizeHint().width() );
+		 number->setMinimumWidth( number->tqsizeHint().width() );
 		 number->setPaletteBackgroundColor( TQColor(190, 250, 190) );
 		 // don't show the value by default
 		 number->hide();
@@ -302,7 +302,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 			 slider = new TQSlider( 0, maxvol, maxvol/10,
 					 maxvol - m_mixdevice->getVolume( chid ), _orientation,
 					 this, m_mixdevice->name().ascii() );
-			 slider->setMinimumSize( slider->sizeHint() );
+			 slider->setMinimumSize( slider->tqsizeHint() );
 		 }
 
 		 slider->setBackgroundOrigin(AncestorOrigin);
@@ -314,7 +314,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 			 slider->hide();
 			 number->hide();
 		 }
-		 slinumLayout->addWidget( slider );  // add to layout
+		 slinumLayout->addWidget( slider );  // add to tqlayout
 		 m_sliders.append ( slider );   // add to list
 		 _slidersChids.append(chid);        // Remember slider-chid association
 		 connect( slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volumeChange(int)) );
@@ -327,27 +327,27 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 		 sliLayout->addSpacing( 5 );
 
 		 // --- LED LAYOUT TO CENTER ---
-		 TQBoxLayout *reclayout;
+		 TQBoxLayout *rectqlayout;
 		 if ( _orientation == Qt::Vertical ) {
-			 reclayout = new TQHBoxLayout( sliLayout );
-			 reclayout->setAlignment(TQt::AlignVCenter);
+			 rectqlayout = new TQHBoxLayout( sliLayout );
+			 rectqlayout->tqsetAlignment(TQt::AlignVCenter);
 		 }
 		 else {
-			 reclayout = new TQVBoxLayout( sliLayout );
-			 reclayout->setAlignment(TQt::AlignHCenter);
+			 rectqlayout = new TQVBoxLayout( sliLayout );
+			 rectqlayout->tqsetAlignment(TQt::AlignHCenter);
 		 }
 
 		 if( m_mixdevice->isRecordable() ) {
-			 reclayout->addStretch();
+			 rectqlayout->addStretch();
 			 m_recordLED = new KLedButton( TQt::red,
 					 m_mixdevice->isRecSource()?KLed::On:KLed::Off,
 					 KLed::Sunken, KLed::Circular, this, "RecordLED" );
 			 m_recordLED->setFixedSize( TQSize(16, 16) );
-			 reclayout->addWidget( m_recordLED );
+			 rectqlayout->addWidget( m_recordLED );
 			 connect(m_recordLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(setRecsrc(bool)));
 			 m_recordLED->installEventFilter( this );
                          TQToolTip::add( m_recordLED, i18n( "Record" ) );
-			 reclayout->addStretch();
+			 rectqlayout->addStretch();
 		 }
 		 else
 		 {
@@ -355,12 +355,12 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 			 // !! possibly not neccesary any more (we are layouted)
 			 TQWidget *qw = new TQWidget(this, "Spacer");
 			 qw->setFixedSize( TQSize(16, 16) );
-			 reclayout->addWidget(qw);
+			 rectqlayout->addWidget(qw);
 			 qw->installEventFilter( this );
 		 } // has no Record LED
 	 } // showRecordLED
 
-	layout()->activate();
+	tqlayout()->activate();
 }
 
 
@@ -432,13 +432,13 @@ MDWSlider::setIcon( int icontype )
          m_iconLabel->resize( 10, 10 );
       } else
          m_iconLabel->setPixmap( miniDevPM );
-      m_iconLabel->setAlignment( TQt::AlignCenter );
+      m_iconLabel->tqsetAlignment( TQt::AlignCenter );
    } else
    {
       kdError(67100) << "Pixmap missing." << endl;
    }
 
-   layout()->activate();
+   tqlayout()->activate();
 }
 
 bool
@@ -514,7 +514,7 @@ MDWSlider::setStereoLinked(bool value)
    if( slider && static_cast<TQSlider *>(slider)->tickmarks() )
       setTicks( true );
 
-   layout()->activate();
+   tqlayout()->activate();
 }
 
 
@@ -529,7 +529,7 @@ MDWSlider::setLabeled(bool value)
    else
       m_label->hide();
 
-   layout()->activate();
+   tqlayout()->activate();
 }
 
 void
@@ -558,7 +558,7 @@ MDWSlider::setTicks( bool ticks )
 		}
 	}
 
-	layout()->activate();
+	tqlayout()->activate();
 }
 
 void
@@ -579,7 +579,7 @@ MDWSlider::setValueStyle( ValueStyle valueStyle )
 	    }
 	}
     }
-    layout()->activate();
+    tqlayout()->activate();
 }
 
 void
@@ -592,7 +592,7 @@ MDWSlider::setIcons(bool value)
 	    else
 		m_iconLabel->hide();
 
-	    layout()->activate();
+	    tqlayout()->activate();
 	}
     } // if it has an icon
 }
@@ -934,13 +934,13 @@ void MDWSlider::showContextMenu()
 	menu->popup( pos );
 }
 
-TQSize MDWSlider::sizeHint() const {
+TQSize MDWSlider::tqsizeHint() const {
 	if ( _layout != 0 ) {
-		return _layout->sizeHint();
+		return _layout->tqsizeHint();
 	}
 	else {
-		// layout not (yet) created
-		return TQWidget::sizeHint();
+		// tqlayout not (yet) created
+		return TQWidget::tqsizeHint();
 	}
 }
 
diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h
index 49b3d700..61a95c96 100644
--- a/kmix/mdwslider.h
+++ b/kmix/mdwslider.h
@@ -77,7 +77,7 @@ public:
     void setValueStyle( ValueStyle valueStyle );
     void setColors( TQColor high, TQColor low, TQColor back );
     void setMutedColors( TQColor high, TQColor low, TQColor back );
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     bool eventFilter( TQObject* obj, TQEvent* e );
     TQSizePolicy sizePolicy() const;
 
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index fc2149f2..056bca57 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobject.h>
 #include <tqslider.h>
 #include <tqtooltip.h>
@@ -79,11 +79,11 @@ void MDWSwitch::createWidgets()
 {
 	if ( _orientation == Qt::Vertical ) {
 		_layout = new TQVBoxLayout( this );
-		_layout->setAlignment(TQt::AlignHCenter);
+		_layout->tqsetAlignment(TQt::AlignHCenter);
 	}
 	else {
 		_layout = new TQHBoxLayout( this );
-		_layout->setAlignment(TQt::AlignVCenter);
+		_layout->tqsetAlignment(TQt::AlignVCenter);
 	}
 	TQToolTip::add( this, m_mixdevice->name() );
 	
@@ -164,13 +164,13 @@ void MDWSwitch::showContextMenu()
     menu->popup( pos );
 }
 
-TQSize MDWSwitch::sizeHint() const {
+TQSize MDWSwitch::tqsizeHint() const {
     if ( _layout != 0 ) {
-	return _layout->sizeHint();
+	return _layout->tqsizeHint();
     }
     else {
-	// layout not (yet) created
-	return TQWidget::sizeHint();
+	// tqlayout not (yet) created
+	return TQWidget::tqsizeHint();
     }
 }
 
diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h
index 5b4b15e0..6c6f3bbf 100644
--- a/kmix/mdwswitch.h
+++ b/kmix/mdwswitch.h
@@ -61,7 +61,7 @@ public:
     ~MDWSwitch();
 
     void addActionToPopup( KAction *action );
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     void setBackgroundMode(BackgroundMode m);
     bool eventFilter( TQObject* obj, TQEvent* e );
 
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index f322acbe..f90a9455 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -33,7 +33,7 @@
 #include <tqcursor.h>
 #include <tqslider.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqtooltip.h>
 #include <tqwmatrix.h>
diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index 6c8c1783..dc4935c4 100644
--- a/kmix/mixer_alsa9.cpp
+++ b/kmix/mixer_alsa9.cpp
@@ -115,7 +115,7 @@ Mixer_ALSA::open()
 
     // Card information
     if ((unsigned)m_devnum > 31) m_devnum = -1;
-    devName = m_devnum == -1 ? "default" : TQString("hw:%1").arg(m_devnum);
+    devName = m_devnum == -1 ? "default" : TQString("hw:%1").tqarg(m_devnum);
 
     TQString probeMessage;
 
diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp
index 66e0241c..051f0c53 100644
--- a/kmix/mixertoolbox.cpp
+++ b/kmix/mixertoolbox.cpp
@@ -148,9 +148,9 @@ void MixerToolBox::initMixer(TQPtrList<Mixer> &mixers, bool multiDriverMode, TQS
 			TQString mixerName = mixer->mixerName();
 			mixerName.replace(":","_");
 			TQString primaryKeyOfMixer = TQString("%1::%2:%3")
-			    .arg(driverName)
-			    .arg(mixerName)
-			    .arg(mixerNums[mixer->mixerName()]);
+			    .tqarg(driverName)
+			    .tqarg(mixerName)
+			    .tqarg(mixerNums[mixer->mixerName()]);
 			// The following 3 replaces are for not messing up the config file
 			primaryKeyOfMixer.replace("]","_");
 			primaryKeyOfMixer.replace("[","_"); // not strictly neccesary, but lets play safe
diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp
index 77bda1af..aabe8a23 100644
--- a/kmix/verticaltext.cpp
+++ b/kmix/verticaltext.cpp
@@ -46,7 +46,7 @@ void VerticalText::paintEvent ( TQPaintEvent * /*event*/ ) {
 	paint.drawText( -height()+2, width(), TQString::fromUtf8(name()) );
 }
 
-TQSize VerticalText::sizeHint() const {
+TQSize VerticalText::tqsizeHint() const {
     return TQSize(20,100); // !! UGLY. Should be reworked
 }
 
diff --git a/kmix/verticaltext.h b/kmix/verticaltext.h
index c378bafc..1e621e83 100644
--- a/kmix/verticaltext.h
+++ b/kmix/verticaltext.h
@@ -9,7 +9,7 @@ public:
     VerticalText(TQWidget * parent, const char * name, WFlags f = 0);
     ~VerticalText();
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     TQSizePolicy sizePolicy () const;
 	
 protected:
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index 0615c85e..6b25dde0 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -22,7 +22,7 @@
 
 // TQt
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsize.h>
 
 // KDE
@@ -56,11 +56,11 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas
 
     if ( _viewOrientation == Qt::Horizontal ) {
 	_layoutMDW = new TQHBoxLayout( this );
-	setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
     }
     else {
 	_layoutMDW = new TQVBoxLayout( this );
-	setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+	tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
     }
 
 
@@ -139,10 +139,10 @@ void ViewApplet::constructionFinished() {
 }
 
 
-TQSize ViewApplet::sizeHint() const {
-    // Basically out main layout knows very good what the sizes should be
-    TQSize qsz = _layoutMDW->sizeHint();
-    //kdDebug(67100) << "ViewApplet::sizeHint(): NewSize is " << qsz << "\n";
+TQSize ViewApplet::tqsizeHint() const {
+    // Basically out main tqlayout knows very good what the sizes should be
+    TQSize qsz = _layoutMDW->tqsizeHint();
+    //kdDebug(67100) << "ViewApplet::tqsizeHint(): NewSize is " << qsz << "\n";
     return qsz;
 }
 
@@ -196,7 +196,7 @@ void ViewApplet::resizeEvent(TQResizeEvent *qre)
     //    kdDebug(67100) << "ViewApplet::resizeEvent(). SHOULD resize _layoutMDW to " << qre->size() << endl;
     //TQWidget::resizeEvent(qre);
 
-    // resizing changes our own sizeHint(), because we must take the new PanelSize in account.
+    // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account.
     // So updateGeometry() is amust for us.
     updateGeometry();
 }
diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h
index 400e45f5..38d21465 100644
--- a/kmix/viewapplet.h
+++ b/kmix/viewapplet.h
@@ -25,7 +25,7 @@ public:
     virtual void constructionFinished();
     virtual void configurationUpdate();
 
-    TQSize       sizeHint() const;
+    TQSize       tqsizeHint() const;
     TQSizePolicy sizePolicy() const;
     virtual void resizeEvent(TQResizeEvent*);
 
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index d8fda5a8..859993bb 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -24,7 +24,7 @@
 // TQt
 #include <tqwidget.h>
 #include <tqevent.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqpushbutton.h>
 #include <tqdatetime.h>
@@ -46,9 +46,9 @@
 ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW )
       : ViewBase(parent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW)
 {
-    TQBoxLayout *layout = new TQHBoxLayout( this );
+    TQBoxLayout *tqlayout = new TQHBoxLayout( this );
     _frame = new TQFrame( this );
-    layout->addWidget( _frame );
+    tqlayout->addWidget( _frame );
 
     _frame->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised );
     _frame->setLineWidth( 1 );
@@ -163,9 +163,9 @@ int ViewDockAreaPopup::advice() {
     }
 }
 
-TQSize ViewDockAreaPopup::sizeHint() const {
-    //    kdDebug(67100) << "ViewDockAreaPopup::sizeHint(): NewSize is " << _mdw->sizeHint() << "\n";
-    return( _mdw->sizeHint() );
+TQSize ViewDockAreaPopup::tqsizeHint() const {
+    //    kdDebug(67100) << "ViewDockAreaPopup::tqsizeHint(): NewSize is " << _mdw->tqsizeHint() << "\n";
+    return( _mdw->tqsizeHint() );
 }
 
 void ViewDockAreaPopup::constructionFinished() {
@@ -173,8 +173,8 @@ void ViewDockAreaPopup::constructionFinished() {
 
     _mdw->move(0,0);
     _mdw->show();
-    _mdw->resize(_mdw->sizeHint() );
-    resize(sizeHint());
+    _mdw->resize(_mdw->tqsizeHint() );
+    resize(tqsizeHint());
 	 
 }
 
diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h
index 7a30a1a0..a31afa4b 100644
--- a/kmix/viewdockareapopup.h
+++ b/kmix/viewdockareapopup.h
@@ -32,7 +32,7 @@ public:
     virtual void refreshVolumeLevels();
     virtual void showContextMenu();
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     bool justHidden();
 
 protected:
diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp
index 72bae125..1aba7fcf 100644
--- a/kmix/viewgrid.cpp
+++ b/kmix/viewgrid.cpp
@@ -126,23 +126,23 @@ TQWidget* ViewGrid::add(MixDevice *md)
   return mdw;
 }
 
-TQSize ViewGrid::sizeHint() const {
-    //    kdDebug(67100) << "ViewGrid::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
-    return( m_sizeHint);
+TQSize ViewGrid::tqsizeHint() const {
+    //    kdDebug(67100) << "ViewGrid::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
+    return( m_tqsizeHint);
 }
 
 void ViewGrid::constructionFinished() {
     //_layoutMDW->activate();
 
-    // do a manual layout
+    // do a manual tqlayout
     configurationUpdate();
 }
 
 void ViewGrid::refreshVolumeLevels() {
     //     kdDebug(67100) << "ViewGrid::refreshVolumeLevels()\n";
 
-   m_sizeHint.setWidth (0);
-   m_sizeHint.setHeight(0);
+   m_tqsizeHint.setWidth (0);
+   m_tqsizeHint.setHeight(0);
 
    m_testingX = 0;
    m_testingY = 0;
@@ -178,12 +178,12 @@ void ViewGrid::refreshVolumeLevels() {
 }
 
 /**
-   This implementation makes sure the Grid's geometry is updated
+   This implementation makes sure the Grid's tqgeometry is updated
    after hiding/showing channels.
 */
 void ViewGrid::configurationUpdate() {
-    m_sizeHint.setWidth (0);
-    m_sizeHint.setHeight(0);
+    m_tqsizeHint.setWidth (0);
+    m_tqsizeHint.setHeight(0);
 
     m_testingX = 0;
     m_testingY = 0;
@@ -195,9 +195,9 @@ void ViewGrid::configurationUpdate() {
       int xPos = m_testingX * m_spacingHorizontal;
       int yPos = m_testingY * m_spacingVertical ;
       mdw->move( xPos, yPos );
-      mdw->resize( mdw->sizeHint() );
-      int xMax = xPos + mdw->width() ; if ( xMax > m_sizeHint.width()  ) m_sizeHint.setWidth(xMax);
-      int yMax = yPos + mdw->height(); if ( yMax > m_sizeHint.height() ) m_sizeHint.setHeight(yMax);
+      mdw->resize( mdw->tqsizeHint() );
+      int xMax = xPos + mdw->width() ; if ( xMax > m_tqsizeHint.width()  ) m_tqsizeHint.setWidth(xMax);
+      int yMax = yPos + mdw->height(); if ( yMax > m_tqsizeHint.height() ) m_tqsizeHint.setHeight(yMax);
 
       m_testingX += 5;
       if ( m_testingX > 50 ) {
diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h
index 48592a55..5fd1a183 100644
--- a/kmix/viewgrid.h
+++ b/kmix/viewgrid.h
@@ -23,7 +23,7 @@ public:
     virtual void configurationUpdate();
     virtual void constructionFinished();
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 public slots:
     virtual void refreshVolumeLevels();
@@ -33,7 +33,7 @@ private:
     unsigned int m_spacingVertical;
 
     // m_maxX and m_maxY are the highest coordiantes encountered
-    TQSize m_sizeHint;
+    TQSize m_tqsizeHint;
     
     unsigned int m_testingX;
     unsigned int m_testingY;
diff --git a/kmix/viewsliders.cpp b/kmix/viewsliders.cpp
index af0e7cb3..3cab3c6d 100644
--- a/kmix/viewsliders.cpp
+++ b/kmix/viewsliders.cpp
@@ -22,7 +22,7 @@
 #include "viewsliders.h"
 
 // TQt
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 
 // KDE
@@ -102,9 +102,9 @@ TQWidget* ViewSliders::add(MixDevice *md)
     return mdw;
 }
 
-TQSize ViewSliders::sizeHint() const {
-    //    kdDebug(67100) << "ViewSliders::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
-    return( _layoutMDW->sizeHint() );
+TQSize ViewSliders::tqsizeHint() const {
+    //    kdDebug(67100) << "ViewSliders::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
+    return( _layoutMDW->tqsizeHint() );
 }
 
 void ViewSliders::constructionFinished() {
diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h
index 31e3fda9..168a425c 100644
--- a/kmix/viewsliders.h
+++ b/kmix/viewsliders.h
@@ -21,7 +21,7 @@ public:
     virtual TQWidget* add(MixDevice *mdw);
     virtual void constructionFinished();
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 public slots:
     virtual void refreshVolumeLevels();
diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp
index 6a810c94..5b2ac99f 100644
--- a/kmix/viewsurround.cpp
+++ b/kmix/viewsurround.cpp
@@ -23,7 +23,7 @@
 
 // TQt
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 
 // KDE
@@ -154,7 +154,7 @@ TQWidget* ViewSurround::add(MixDevice *md)
     case MixDevice::SURROUND:
     case MixDevice::AC97:
     default:
-	// Add as slider to the layout on the left side
+	// Add as slider to the tqlayout on the left side
 	_layoutSliders->add(mdw);
 	break;
     } // switch(type)
@@ -162,9 +162,9 @@ TQWidget* ViewSurround::add(MixDevice *md)
     return mdw;
 }
 
-TQSize ViewSurround::sizeHint() const {
-    //    kdDebug(67100) << "ViewSurround::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
-    return( _layoutMDW->sizeHint() );
+TQSize ViewSurround::tqsizeHint() const {
+    //    kdDebug(67100) << "ViewSurround::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
+    return( _layoutMDW->tqsizeHint() );
 }
 
 void ViewSurround::constructionFinished() {
diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h
index 4ba3c5cc..de469292 100644
--- a/kmix/viewsurround.h
+++ b/kmix/viewsurround.h
@@ -24,7 +24,7 @@ public:
     virtual TQWidget* add(MixDevice *mdw);
     virtual void constructionFinished();
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 public slots:
     virtual void refreshVolumeLevels();
diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp
index 607b3397..3d3166bb 100644
--- a/kmix/viewswitches.cpp
+++ b/kmix/viewswitches.cpp
@@ -21,7 +21,7 @@
 
 #include "viewswitches.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 
 #include <kdebug.h>
@@ -46,7 +46,7 @@ ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString &
 	// Place enums right from the switches: This is done, so that there will be no
 	// ugly space on the left side, when no Switch is shown.
 	// Actually it is not really clear yet, why there is empty space at all: There are 0 items in
-	// the _layoutEnum, so it might be a sizeHint() or some other subtle layout issue.
+	// the _layoutEnum, so it might be a tqsizeHint() or some other subtle tqlayout issue.
 	_layoutEnum = new TQVBoxLayout(_layoutMDW);
     }
     init();
@@ -118,9 +118,9 @@ TQWidget* ViewSwitches::add(MixDevice *md)
     return mdw;
 }
 
-TQSize ViewSwitches::sizeHint() const {
-    //kdDebug(67100) << "ViewSwitches::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n";
-    return( _layoutMDW->sizeHint() );
+TQSize ViewSwitches::tqsizeHint() const {
+    //kdDebug(67100) << "ViewSwitches::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n";
+    return( _layoutMDW->tqsizeHint() );
 }
 
 void ViewSwitches::constructionFinished() {
diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h
index 3ddb288f..9e591514 100644
--- a/kmix/viewswitches.h
+++ b/kmix/viewswitches.h
@@ -22,7 +22,7 @@ public:
     virtual void constructionFinished();
     virtual void configurationUpdate();
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 public slots:
     virtual void refreshVolumeLevels();
diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp
index a5ab2a68..4b62ed9c 100644
--- a/krec/krecconfig_files.cpp
+++ b/krec/krecconfig_files.cpp
@@ -18,7 +18,7 @@
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqlineedit.h>
diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp
index faf31fb3..5201c28d 100644
--- a/krec/krecconfigure.cpp
+++ b/krec/krecconfigure.cpp
@@ -18,7 +18,7 @@
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
@@ -87,13 +87,13 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi
 	_tipofday = new TQCheckBox( i18n( "Show tip of the day at startup" ), this );
 	connect( _tipofday, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( tipofdaychanged( bool ) ) );
 	_layout->addWidget( _tipofday );
-	TQBoxLayout* _tmplayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
+	TQBoxLayout* _tmptqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
 	_enableAllMessages = new KPushButton( i18n( "Enable All Hidden Messages" ), this );
 	connect( _enableAllMessages, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableallmessagesclicked() ) );
-	_tmplayout->addWidget( _enableAllMessages );
+	_tmptqlayout->addWidget( _enableAllMessages );
 	TQLabel* _tmplbl = new TQLabel( i18n( "<qt><i>All messages with the \"Don't show this message again\" option are shown again after selecting this button.</i></qt>" ), this );
-	_tmplayout->addWidget( _tmplbl );
-	_layout->addLayout( _tmplayout );
+	_tmptqlayout->addWidget( _tmplbl );
+	_layout->addLayout( _tmptqlayout );
 
 	_layout->addStretch( 100 );
 
diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp
index a1e5c584..29d4640b 100644
--- a/krec/krecfile.cpp
+++ b/krec/krecfile.cpp
@@ -94,7 +94,7 @@ KRecFile::KRecFile( const TQString &filename, TQObject* p, const char* n )
 		_config->setGroup( "File-" + TQString::number( i ) );
 		newBuffer( KRecBuffer::fromConfig( _config, _dir->qDir(), this ) );
 	}
-	KRecGlobal::the()->message( i18n( "\'%1\' loaded." ).arg( filename ) );
+	KRecGlobal::the()->message( i18n( "\'%1\' loaded." ).tqarg( filename ) );
 
 	delete tar;
 
@@ -168,7 +168,7 @@ void KRecFile::save( const TQString &fname ) {
 	delete tar;
 	KIO::file_move( tmpname, filetosave, -1, true, false, true );
 
-	KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).arg( filename() ) );
+	KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).tqarg( filename() ) );
 	_saved = true;
 }
 
@@ -429,7 +429,7 @@ void KRecBuffer::setActive( bool n ) {
 }
 
 void KRecBuffer::deleteBuffer() {
-	if ( KMessageBox::warningContinueCancel( KRecGlobal::the()->mainWidget(), i18n( "Do you really want to delete the selected part '%1'?" ).arg( filename() ), i18n("Delete Part?"), KStdGuiItem::del() ) == KMessageBox::Continue )
+	if ( KMessageBox::warningContinueCancel( KRecGlobal::the()->mainWidget(), i18n( "Do you really want to delete the selected part '%1'?" ).tqarg( filename() ), i18n("Delete Part?"), KStdGuiItem::del() ) == KMessageBox::Continue )
 		_krecfile->deleteBuffer( this );
 }
 
diff --git a/krec/krecfileview.cpp b/krec/krecfileview.cpp
index 03557acc..a5a989d8 100644
--- a/krec/krecfileview.cpp
+++ b/krec/krecfileview.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <tqpointarray.h>
diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp
index cd96914b..26acdb2a 100644
--- a/krec/krecfileviewhelpers.cpp
+++ b/krec/krecfileviewhelpers.cpp
@@ -18,7 +18,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <tqpointarray.h>
@@ -64,12 +64,12 @@ void KRecTimeBar::mouseReleaseEvent( TQMouseEvent* qme ) {
 
 void KRecTimeBar::newPos( int n ) {
 	_pos = n;
-	repaint();
+	tqrepaint();
 }
 
 void KRecTimeBar::newSize( int n ) {
 	_size = n;
-	repaint();
+	tqrepaint();
 }
 
 
@@ -216,10 +216,10 @@ TQString KRecTimeDisplay::formatTime( const int mode, const int sample ) const {
 void KRecTimeDisplay::timeContextMenu( TQPopupMenu* menu ) {
 	if ( !_filename.isNull() ) {
 		menu->insertSeparator( 0 );
-		menu->insertItem( i18n( "kByte: %1" ).arg( formatTime( 3, _posvalue ) ), -1, 0 );
-		menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _posvalue ) ), -1, 0 );
-		menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _posvalue ) ), -1, 0 );
-		menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _posvalue ) ), -1, 0 );
+		menu->insertItem( i18n( "kByte: %1" ).tqarg( formatTime( 3, _posvalue ) ), -1, 0 );
+		menu->insertItem( i18n( "[h:]m:s.f %1" ).tqarg( formatTime( 2, _posvalue ) ), -1, 0 );
+		menu->insertItem( i18n( "[h:]m:s.s %1" ).tqarg( formatTime( 1, _posvalue ) ), -1, 0 );
+		menu->insertItem( i18n( "%1 Samples" ).tqarg( formatTime( 0, _posvalue ) ), -1, 0 );
 		KPopupTitle *tmp = new KPopupTitle( menu );
 		tmp->setTitle( i18n( "Position" ) );
 		menu->insertItem( tmp, -1, 0 );
@@ -235,10 +235,10 @@ void KRecTimeDisplay::timeContextMenu( const TQPoint &point ) {
 void KRecTimeDisplay::sizeContextMenu( TQPopupMenu* menu ) {
 	if ( !_filename.isNull() ) {
 		menu->insertSeparator( 0 );
-		menu->insertItem( i18n( "kByte: %1" ).arg( formatTime( 3, _sizevalue ) ), -1, 0 );
-		menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _sizevalue ) ), -1, 0 );
-		menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _sizevalue ) ), -1, 0 );
-		menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _sizevalue ) ), -1, 0 );
+		menu->insertItem( i18n( "kByte: %1" ).tqarg( formatTime( 3, _sizevalue ) ), -1, 0 );
+		menu->insertItem( i18n( "[h:]m:s.f %1" ).tqarg( formatTime( 2, _sizevalue ) ), -1, 0 );
+		menu->insertItem( i18n( "[h:]m:s.s %1" ).tqarg( formatTime( 1, _sizevalue ) ), -1, 0 );
+		menu->insertItem( i18n( "%1 Samples" ).tqarg( formatTime( 0, _sizevalue ) ), -1, 0 );
 		KPopupTitle *tmp = new KPopupTitle( menu );
 		tmp->setTitle( i18n( "Size" ) );
 		menu->insertItem( tmp, -1, 0 );
@@ -255,10 +255,10 @@ void KRecTimeDisplay::jumpToTime() {
 }
 
 TQString KRecTimeDisplay::positionText( int m, int n ) {
-	return i18n( "Position: %1" ).arg( formatTime( m,n ) );
+	return i18n( "Position: %1" ).tqarg( formatTime( m,n ) );
 }
 TQString KRecTimeDisplay::sizeText( int m, int n ) {
-	return i18n( "Size: %1" ).arg( formatTime( m,n ) );
+	return i18n( "Size: %1" ).tqarg( formatTime( m,n ) );
 }
 
 void AKLabel::mousePressEvent( TQMouseEvent* qme ) {
diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp
index 04283e2b..cbcaba81 100644
--- a/krec/krecfilewidgets.cpp
+++ b/krec/krecfilewidgets.cpp
@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <tqpointarray.h>
@@ -189,18 +189,18 @@ void KRecBufferWidget::initLayout() {
 void KRecBufferWidget::drawFrame( TQPainter* p ) {
 	//kdDebug( 60005 ) << k_funcinfo << endl;
 	if ( _buffer->active() )
-		p->setBrush( colorGroup().highlight() );
+		p->setBrush( tqcolorGroup().highlight() );
 	else
-		p->setBrush( colorGroup().highlight().dark() );
-	p->setPen( TQPen( colorGroup().dark(), 1 ) );
+		p->setBrush( tqcolorGroup().highlight().dark() );
+	p->setPen( TQPen( tqcolorGroup().dark(), 1 ) );
 	p->drawRect( _title_region->boundingRect() );
 	p->drawRect( _fileend_region->boundingRect() );
 
 	p->setBrush( TQBrush() );
-	p->setPen( TQPen( colorGroup().dark(), 1 ) );
+	p->setPen( TQPen( tqcolorGroup().dark(), 1 ) );
 	p->drawRect( _main_region->boundingRect() );
 
-	p->setPen( TQPen( colorGroup().highlightedText() ) );
+	p->setPen( TQPen( tqcolorGroup().highlightedText() ) );
 	p->drawText( _title_region->boundingRect(), TQt::AlignCenter, _buffer->title() );
 
 }
diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp
index 05392748..56ec7228 100644
--- a/krec/krecnewproperties.cpp
+++ b/krec/krecnewproperties.cpp
@@ -21,7 +21,7 @@
 #include <tqbuttongroup.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kseparator.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
@@ -53,7 +53,7 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 	labelfont.setPointSize( labelfont.pointSize()*3/2 );
 	captionlabel->setFont( labelfont );
 	captionlabel->setText( i18n( "Properties for the new File" ) );
-	captionlabel->setAlignment( AlignCenter );
+	captionlabel->tqsetAlignment( AlignCenter );
 	_layout->addWidget( captionlabel );
 
 	_filewidget = new KRecConfigFilesWidget( this );
@@ -74,7 +74,7 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 	_layout->addWidget( new KSeparator( KSeparator::HLine, this ) );
 	_layout->addWidget( _btnWidget );
 
-	setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+	tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
 }
 KRecNewProperties::~KRecNewProperties() {
 kdDebug( 60005 ) << k_funcinfo << endl;
diff --git a/krec/krecord.cpp b/krec/krecord.cpp
index d73b4371..e6205c8a 100644
--- a/krec/krecord.cpp
+++ b/krec/krecord.cpp
@@ -32,7 +32,7 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <kconfig.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 #include <ksettings/dialog.h>
 #include <ktip.h>
@@ -138,7 +138,7 @@ bool KRecPrivate::closeFile() {
 	//kdDebug( 60005 ) << k_funcinfo << endl;
 	if ( _currentFile ) {
 		if ( !_currentFile->saved() ) {
-			int choice = KMessageBox::questionYesNoCancel( _impl, i18n( "The document \"%1\" has been modified.\nDo you want to save it?" ).arg( _currentFile->filename() ), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() );
+			int choice = KMessageBox::questionYesNoCancel( _impl, i18n( "The document \"%1\" has been modified.\nDo you want to save it?" ).tqarg( _currentFile->filename() ), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() );
 			if ( choice == KMessageBox::Yes ) saveFile();
 			if ( choice == KMessageBox::Cancel ) return false;
 			// go on if KMessageBox::No
@@ -179,7 +179,7 @@ void KRecPrivate::exportFile() {
 				      "you did everything right, please file a bugreport saying what " \
 				      "you where about to do and please quote the following line:<br />" \
 				      "%1</li>" \
-				      "</ul></qt>" ).arg( KRecGlobal::the()->exportFormatEndings() ),
+				      "</ul></qt>" ).tqarg( KRecGlobal::the()->exportFormatEndings() ),
 				i18n( "Could not determine encodingmethod" ) );
 		}
 	} else KRecGlobal::the()->message( i18n( "There is nothing to export." ) );
diff --git a/krec/krecord_private.h b/krec/krecord_private.h
index c34f5b10..ab1debde 100644
--- a/krec/krecord_private.h
+++ b/krec/krecord_private.h
@@ -23,7 +23,7 @@
 #include <artsgui.h>
 #include <kartswidget.h>
 #include <kurl.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "krecfileview.h"
 
diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp
index 32f274df..32223cb8 100644
--- a/krec/ogg_export/krecexport_ogg.cpp
+++ b/krec/ogg_export/krecexport_ogg.cpp
@@ -95,7 +95,7 @@ kdDebug( 60005 ) << k_funcinfo << endl;
 				vorbis_comment_add_tag ( &vc, const_cast<char *>( "kde-encoder" ),
 				                         const_cast<char *>( "KRec" ) );
 				if ( write_vorbis_comments ) {
-					TQDateTime dt = TQDateTime::currentDateTime();
+					TQDateTime dt = TQDateTime::tqcurrentDateTime();
 					vorbis_comment_add_tag ( &vc, const_cast<char *>( "title" ),
 					                         const_cast<char *>( "" ) );
 					vorbis_comment_add_tag ( &vc, const_cast<char *>( "artist" ),
diff --git a/kscd/ChangeLog b/kscd/ChangeLog
index 3cb6493c..ab561f86 100644
--- a/kscd/ChangeLog
+++ b/kscd/ChangeLog
@@ -225,7 +225,7 @@ Fri May 15 18:28:40 1998  Bernd Johannes Wuebben  <wuebben@math.cornell.edu>
 
 Tue Apr 14 05:17:36 1998  Bernd Johannes Wuebben  <wuebben@math.cornell.edu>
 
-	* layout corrections for kscd magic dialog 
+	* tqlayout corrections for kscd magic dialog 
 
 Sat Jan 17 21:36:27 1998  Bernd Johannes Wuebben  <wuebben@math.cornell.edu>
 
diff --git a/kscd/TODO b/kscd/TODO
index e10c01c8..2851ae13 100644
--- a/kscd/TODO
+++ b/kscd/TODO
@@ -6,4 +6,4 @@ AJS:
 o fix eject button
 o don't show "no disc" error on startup
 o direct digital playback
-o better GUI layout for LCD panel
+o better GUI tqlayout for LCD panel
diff --git a/kscd/bwlednum.cpp b/kscd/bwlednum.cpp
index eb18917e..385c0c74 100644
--- a/kscd/bwlednum.cpp
+++ b/kscd/bwlednum.cpp
@@ -84,7 +84,7 @@ void BW_LED_Number::setLEDColor( const TQColor& fgColor, const TQColor& bgColor
   fgcolor = fgColor;
   bgcolor = bgColor;
 
-  TQColorGroup old_cg = this->colorGroup();
+  TQColorGroup old_cg = this->tqcolorGroup();
 
 
   TQColorGroup new_cg( fgColor, bgColor,
@@ -168,9 +168,9 @@ void BW_LED_Number::setSmallLED(bool a_boolean){
 }
 
 
-void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){
+void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool tqrepaint ){
 
-  //  printf("drawSymbol repaint = %d\n",repaint);
+  //  printf("drawSymbol tqrepaint = %d\n",tqrepaint);
 
  TQPoint  pos;
 
@@ -194,7 +194,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){
  pos = TQPoint( Xoffset , Yoffset );
 
 
- if(repaint){
+ if(tqrepaint){
 
    // this draw the non-illumintated segments
 
@@ -222,7 +222,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){
      }
    }
  }
- else{ // we are not repainting ourselves due to a repaint event but rather
+ else{ // we are not repainting ourselves due to a tqrepaint event but rather
        // genuinely changing the symbol that is to be displayed
 
    for(int l = 0; l <= NUM_OF_SEGMENTS -1; l++){
@@ -277,7 +277,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter
 
 
   TQPoint pt = pos;
-  TQColorGroup g = colorGroup();
+  TQColorGroup g = tqcolorGroup();
   TQColor lightColor,darkColor;
   if ( erase ){
 
diff --git a/kscd/bwlednum.h b/kscd/bwlednum.h
index 6382946d..13064f44 100644
--- a/kscd/bwlednum.h
+++ b/kscd/bwlednum.h
@@ -68,7 +68,7 @@ private:
 
     bool    seg_contained_in( char c, char* seg);
     void    drawSegment( const TQPoint &, char, TQPainter &, int, bool = FALSE );
-    void    drawSymbol( TQPainter *p,char s ,bool repaint);
+    void    drawSymbol( TQPainter *p,char s ,bool tqrepaint);
 
     char* old_segments;
     char* current_segments;
diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp
index e3dd02e0..fea5ddd6 100644
--- a/kscd/cddbdlg.cpp
+++ b/kscd/cddbdlg.cpp
@@ -4,7 +4,7 @@
 
 #include <tqkeycode.h>
 #include <tqdatetime.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
@@ -90,7 +90,7 @@ void CDDBDlg::submitFinished(KCDDB::CDDB::Result r)
   else
   {
     TQString str = i18n("Error sending record.\n\n%1")
-      .arg(KCDDB::CDDB::resultToString(r));
+      .tqarg(KCDDB::CDDB::resultToString(r));
     KMessageBox::error(this, str, i18n("Record Submission"));
   }
 } // submitFinished()
diff --git a/kscd/configWidget.cpp b/kscd/configWidget.cpp
index 5f7652d4..3a1ceff5 100644
--- a/kscd/configWidget.cpp
+++ b/kscd/configWidget.cpp
@@ -28,7 +28,7 @@
 #include <kurlrequester.h>
 #include <tqcheckbox.h>
 #include <kcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <config.h>
 extern "C" {
diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui
index de755edf..1477a193 100644
--- a/kscd/configWidgetUI.ui
+++ b/kscd/configWidgetUI.ui
@@ -84,7 +84,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>292</width>
                             <height>20</height>
@@ -221,7 +221,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>171</width>
                             <height>81</height>
@@ -401,7 +401,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>45</height>
diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp
index c65df07b..83a9c532 100644
--- a/kscd/kcompactdisc.cpp
+++ b/kscd/kcompactdisc.cpp
@@ -81,7 +81,7 @@ extern "C"
 #endif
 }
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <fixx11h.h>
 
 // Our internal definition of when we have no disc. Used to guard some
@@ -100,7 +100,7 @@ const unsigned KCompactDisc::missingDisc = (unsigned)-1;
 KCompactDisc::KCompactDisc(InformationMode infoMode) :
     m_device(TQString()),
     m_status(0),
-    m_previousStatus(123456),
+    m_previoustqStatus(123456),
     m_discId(missingDisc),
     m_previousDiscId(0),
     m_artist(TQString()),
@@ -143,7 +143,7 @@ unsigned KCompactDisc::discPosition() const
     return cur_pos_abs * 1000 - FRAMES_TO_MS(m_trackStartFrames[0]);
 }
 
-TQString KCompactDisc::discStatus(int status)
+TQString KCompactDisc::disctqStatus(int status)
 {
     TQString message;
 
@@ -282,7 +282,7 @@ bool KCompactDisc::setDevice(
         << m_device << ", "
         << (digitalPlayback ? audioSystem : TQString()) << ", "
         << (digitalPlayback ? audioDevice : TQString()) << ", status: "
-        << discStatus(status) << endl;
+        << disctqStatus(status) << endl;
 
     if (status < 0)
     {
@@ -295,7 +295,7 @@ bool KCompactDisc::setDevice(
         setVolume(volume);
     }
 
-    m_previousStatus = m_status = wm_cd_status();
+    m_previoustqStatus = m_status = wm_cd_status();
     
     if (m_infoMode == Asynchronous)
         timerExpired();
@@ -307,7 +307,7 @@ bool KCompactDisc::setDevice(
 void KCompactDisc::setVolume(unsigned volume)
 {
     int status = wm_cd_volume(volume, WM_BALANCE_SYMMETRED);
-    kdDebug() << "Volume change: " << volume << ", status: " << discStatus(status) << endl;
+    kdDebug() << "Volume change: " << volume << ", status: " << disctqStatus(status) << endl;
 }
 
 void KCompactDisc::stop()
@@ -380,9 +380,9 @@ void KCompactDisc::timerExpired()
 
     if (WM_CDS_NO_DISC(m_status) || (m_device == TQString()))
     {
-        if (m_previousStatus != m_status)
+        if (m_previoustqStatus != m_status)
         {
-            m_previousStatus = m_status;
+            m_previoustqStatus = m_status;
             m_discId = missingDisc;
             m_previousDiscId = 0;
             m_trackArtists.clear();
@@ -428,7 +428,7 @@ void KCompactDisc::timerExpired()
                 else
                 {
                     m_trackArtists.append(i18n("Unknown Artist"));
-                    m_trackTitles.append(i18n("Track %1").arg(TQString::number(i).rightJustify(2, '0')));
+                    m_trackTitles.append(i18n("Track %1").tqarg(TQString::number(i).rightJustify(2, '0')));
                 }
                 // FIXME: KDE4
                 // track.length = cd->trk[i - 1].length;
@@ -450,12 +450,12 @@ void KCompactDisc::timerExpired()
         }
         if (isPlaying())
         {
-            m_previousStatus = m_status;
+            m_previoustqStatus = m_status;
             // Update the current playing position.
             emit trackPlaying(m_track, trackPosition());
         }
         else
-        if (m_previousStatus != m_status)
+        if (m_previoustqStatus != m_status)
         {
             // If we are not playing, then we are either paused, or stopped.
             switch (m_status)
@@ -467,7 +467,7 @@ void KCompactDisc::timerExpired()
                 emit trayOpening();
                 break;
             default:
-                if (m_previousStatus == WM_CDM_PLAYING || m_previousStatus == WM_CDM_PAUSED
+                if (m_previoustqStatus == WM_CDM_PLAYING || m_previoustqStatus == WM_CDM_PAUSED
                       && m_status == WM_CDM_STOPPED)
                 {
                     emit discStopped();
@@ -475,7 +475,7 @@ void KCompactDisc::timerExpired()
                 break;
             }
 
-            m_previousStatus = m_status;
+            m_previoustqStatus = m_status;
         }
     }
 
diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h
index 8015ab27..10d5eabb 100644
--- a/kscd/kcompactdisc.h
+++ b/kscd/kcompactdisc.h
@@ -34,7 +34,7 @@
  * @see #discChanged(): A disc was inserted or removed.
  * @see #trayOpening(): A disc is being removed.
  *
- *  The progress of playout is modelled by these signals:
+ *  The progress of ptqlayout is modelled by these signals:
  *
  * @see #trackPlaying(): A track started playing, or is still playing.
  * @see #trackPaused(): A track was paused.
@@ -64,12 +64,12 @@ public:
     void eject();
 
     /**
-     * Start playout at given position of track.
+     * Start ptqlayout at given position of track.
      */
     void play(unsigned startTrack = 0, unsigned startTrackPosition = 0, unsigned endTrack = 0);
 
     /**
-     * Pause/resume playout.
+     * Pause/resume ptqlayout.
      */
     void pause();
 
@@ -96,7 +96,7 @@ public:
     void setVolume(unsigned volume);
 
     /**
-     * Stop playout.
+     * Stop ptqlayout.
      */
     void stop();
 
@@ -281,7 +281,7 @@ private:
     TQTimer timer;
     TQString m_device;
     int m_status;
-    int m_previousStatus;
+    int m_previoustqStatus;
     unsigned m_discId;
     unsigned m_previousDiscId;
     TQString m_artist;
@@ -292,8 +292,8 @@ private:
     TQStringList m_trackTitles;
     unsigned m_track;
     unsigned m_previousTrack;
-    void checkDeviceStatus();
-    TQString discStatus(int status);
+    void checkDevicetqStatus();
+    TQString disctqStatus(int status);
     class KCompactDiscPrivate *d;
     InformationMode m_infoMode;
 
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 2dbf3c8c..74842d50 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -24,8 +24,8 @@
 
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <textstream.h>
-#include <layout.h>
+#include <tqtextstream.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqapplication.h>
@@ -76,7 +76,7 @@
 
 #include "cddbdlg.h"
 #include "configWidget.h"
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <kcompactdisc.h>
 #include <fixx11h.h>
 
@@ -212,7 +212,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
 
   setFocusPolicy(TQ_NoFocus);
 
-  songListCB->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed);
+  songListCB->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed);
   adjustSize();
   setFixedHeight(this->height());
 } // KSCD
@@ -550,7 +550,7 @@ void KSCD::trackChanged(unsigned track, unsigned trackLength)
             justTheName = justTheName.right(justTheName.length() - 4);
 
             TQToolTip::remove(songListCB);
-            TQToolTip::add(songListCB, i18n("Current track: %1").arg(justTheName));
+            TQToolTip::add(songListCB, i18n("Current track: %1").tqarg(justTheName));
         }
         timeSlider->blockSignals(true);
         timeSlider->setRange(0, trackLength ? trackLength - 1 : 0);
@@ -688,7 +688,7 @@ void KSCD::randomSelected()
 {
     setShuffle(Prefs::randomPlay()?0:1);
 
-    /* FIXME this helps us to display "Random" in Status line
+    /* FIXME this helps us to display "Random" in tqStatus line
        should it maybe to be replaced with symbol "RAND" or something others */
     statuslabel->setText(Prefs::randomPlay()?i18n("Random"):i18n("Play"));
 } // randomSelected
@@ -800,7 +800,7 @@ void KSCD::setDevicePaths()
     {
         // This device did not seem usable.
         TQString str = i18n("CD-ROM read or access error (or no audio disc in drive).\n"\
-                            "Please make sure you have access permissions to:\n%1").arg(
+                            "Please make sure you have access permissions to:\n%1").tqarg(
                              KCompactDisc::urlToDevice(Prefs::cdDevice()));
         KMessageBox::error(this, str, i18n("Error"));
     }
@@ -1211,8 +1211,8 @@ void KSCD::lookupCDDBDone(CDDB::Result result)
       CDInfoList::iterator it;
       TQStringList list;
       for ( it = cddb_info.begin(); it != cddb_info.end(); ++it  ) {
-        list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title)
-            .arg((*it).genre));
+        list.append( TQString("%1, %2, %3").tqarg((*it).artist).tqarg((*it).title)
+            .tqarg((*it).genre));
       }
 
       bool ok(false);
@@ -1313,7 +1313,7 @@ int KSCD::currentPosition()
     return m_cd->trackPosition();
 }
 
-int KSCD::getStatus()
+int KSCD::gettqStatus()
 {
     if (m_cd->isPlaying())
       return 2;
@@ -1419,62 +1419,62 @@ void KSCD::information(int i)
     {
         case 0:
             str = TQString("http://musicmoz.org/cgi-bin/ext.cgi?artist=%1")
-                   .arg(encodedArtist);
+                   .tqarg(encodedArtist);
             break;
 
          case 1:
             str = TQString("http://ubl.artistdirect.com/cgi-bin/gx.cgi/AppLogic+Search?select=MusicArtist&searchstr=%1&searchtype=NormalSearch")
-                .arg(encodedArtist);
+                .tqarg(encodedArtist);
             break;
 
         case 2:
             str = TQString("http://www.cduniverse.com/cgi-bin/cdubin.exe/rlinka/ean=%1")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 3:
             str = TQString("http://www.alltheweb.com/search?cat=web&q=%1")
-                    .arg(encodedArtist);
+                    .tqarg(encodedArtist);
             break;
 
         case 4:
             str = TQString("http://altavista.com/web/results?q=%1&kgs=0&kls=1&avkw=xytx")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 5:
             str = TQString("http://msxml.excite.com/_1_2UDOUB70SVHVHR__info.xcite/dog/results?otmpl=dog/webresults.htm&qkw=%1&qcat=web&qk=20&top=1&start=&ver=14060")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 6:
             str = TQString("http://www.google.com/search?q=%1")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 7:
             str = TQString("http://groups.google.com/groups?oi=djq&as_q=%1&num=20")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 8:
             str = TQString("http://www.hotbot.com/default.asp?prov=Inktomi&query=%1&ps=&loc=searchbox&tab=web")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 9:
             str = TQString("http://search.lycos.com/default.asp?lpv=1&loc=searchhp&tab=web&query=%1")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
              break;
 
          case 10:
              str = TQString("http://search.dmoz.org/cgi-bin/search?search=%1")
-                   .arg(encodedArtist);
+                   .tqarg(encodedArtist);
              break;
 
          case 11:
              str = TQString("http://search.yahoo.com/bin/search?p=%1")
-                   .arg(encodedArtist);
+                   .tqarg(encodedArtist);
              break;
 
          default:
@@ -1563,13 +1563,13 @@ TQStringList KSCD::trackList()
   return tracks;
 }
 
-void KSCD::populateSongList(TQString infoStatus)
+void KSCD::populateSongList(TQString infotqStatus)
 {
     // set the artist and title labels as well as the dock tooltip.
-    if (!infoStatus.isEmpty())
-        artistlabel->setText(infoStatus);
+    if (!infotqStatus.isEmpty())
+        artistlabel->setText(infotqStatus);
     else
-        artistlabel->setText(TQString("%1 - %2").arg(cddbInfo.artist, cddbInfo.title));
+        artistlabel->setText(TQString("%1 - %2").tqarg(cddbInfo.artist, cddbInfo.title));
 
     songListCB->clear();
     for (unsigned i = 0; i < cddbInfo.trackInfoList.count(); i++)
diff --git a/kscd/kscd.h b/kscd/kscd.h
index 9a4e1044..a6c192bd 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -102,7 +102,7 @@ k_dcop:
     int currentTrack();
     int currentTrackLength();
     int currentPosition();
-    int getStatus();
+    int gettqStatus();
     TQString currentTrackTitle();
     TQString currentAlbum();
     TQString currentArtist();
@@ -175,7 +175,7 @@ protected:
     void calculateDisplayedTime();
     void calculateDisplayedTime(int sec);
     void setSongListTo(int whichTrack);
-    void populateSongList(TQString infoStatus);
+    void populateSongList(TQString infotqStatus);
     void updatePlayPB(bool playing);
 
     void updateConfigDialog(configWidget* widget);
diff --git a/kscd/kscdmagic/README b/kscd/kscdmagic/README
index 64af4f6f..b2366190 100644
--- a/kscd/kscdmagic/README
+++ b/kscd/kscdmagic/README
@@ -15,14 +15,14 @@ Introduction
 This is a program for representing sounds visually from a CD or line
 input or piped from another program. It goes beyond the usual oscilliscope
 style program by combining an FFT and stereo positioning information to
-give a two dimensional display. Some of the shapes I have observed are:
+give a two dimensional display. Some of the tqshapes I have observed are:
   * Drums: clouds of color, fairly high
   * Clean guitar: several horizontal lines, low down
   * Rough guitar: a cloud, low down
   * Trumpet: Lots of horizontal lines everywhere
   * Flute: A single horizontal line, low down
   * Voice: A vertical line with some internal structure
-  * Synthesizer: All kinds of weird shapes!
+  * Synthesizer: All kinds of weird tqshapes!
 
 Synaesthesia can run in a window in X or full screen using SVGAlib.
 
@@ -139,7 +139,7 @@ Changes
       Support for SDL.
 2.0 - Bug fixes: Fixed problem in xlib.c that caused occasional segfaults,
         several endianness problems fixed.
-      New effects: Wave, heat, diamond shaped points.
+      New effects: Wave, heat, diamond tqshaped points.
       Piping sound now longer requires the twiddle factor.
       Yet another interface redesign.
       Partial support for LinuxPPC (pipe mode only)
diff --git a/kscd/kscdmagic/syna.h b/kscd/kscdmagic/syna.h
index d359a8c2..4d35e3e0 100644
--- a/kscd/kscdmagic/syna.h
+++ b/kscd/kscdmagic/syna.h
@@ -160,7 +160,7 @@ enum SoundSource { SourceLine, SourceCD, SourcePipe };
 
 void cdOpen(char *cdromName);
 void cdClose(void);
-void cdGetStatus(int &track, int &frames, SymbolID &state);
+void cdGettqStatus(int &track, int &frames, SymbolID &state);
 void cdPlay(int trackFrame, int endFrame=-1); 
 void cdStop(void);
 void cdPause(void);
diff --git a/kscd/ledlamp.cpp b/kscd/ledlamp.cpp
index b9edef18..96675921 100644
--- a/kscd/ledlamp.cpp
+++ b/kscd/ledlamp.cpp
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <tqpainter.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqpen.h>
 #include <tqcolor.h>
 #include "ledlamp.h"
diff --git a/kscd/ledlamp.h b/kscd/ledlamp.h
index f6ba4915..6bd2e44f 100644
--- a/kscd/ledlamp.h
+++ b/kscd/ledlamp.h
@@ -42,10 +42,10 @@ public:
   State state() const { return s; }
   
 
-  void setState(State state) { s= state; repaint(false); }
+  void setState(State state) { s= state; tqrepaint(false); }
 
 
-  void toggleState() { if (s == On) s= Off; else if (s == Off) s= On; repaint(false); }
+  void toggleState() { if (s == On) s= Off; else if (s == Off) s= On; tqrepaint(false); }
 public slots:
   void toggle() { toggleState(); };
   void on() { setState(On); };
diff --git a/kscd/libwm/cdtext.c b/kscd/libwm/cdtext.c
index bb4e19b8..fafd039f 100644
--- a/kscd/libwm/cdtext.c
+++ b/kscd/libwm/cdtext.c
@@ -21,8 +21,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#ifdef libunicode
-  #include <unicode.h>
+#ifdef libtqunicode
+  #include <tqunicode.h>
 #endif
 
 #include "include/wm_config.h"
@@ -155,12 +155,12 @@ void get_data_from_cdtext_pack(
   int arr = pack->header_field_id2_tracknumber;
   int i;
   int language_block;
-  int unicode;
+  int tqunicode;
 
   language_block = (pack->header_field_id4_block_no >> 4) & 0x07;
-  unicode = pack->header_field_id4_block_no & 0x80;
+  tqunicode = pack->header_field_id4_block_no & 0x80;
 
-  if(!unicode)
+  if(!tqunicode)
   {
     for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i++)
     {
@@ -180,7 +180,7 @@ void get_data_from_cdtext_pack(
       }
     }
   }
-#ifdef libunicode
+#ifdef libtqunicode
   else /* doublebytes ;-) */
   {
     for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i += 2)
@@ -203,7 +203,7 @@ void get_data_from_cdtext_pack(
   }
 #else
   else {
-     wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle unicode");
+     wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle tqunicode");
   }
 #endif
 }
@@ -315,9 +315,9 @@ get_glob_cdtext(struct wm_drive *d, int redo)
             {
               wm_cdtext_info.blocks[j] = lp_block;
               wm_cdtext_info.blocks[j]->block_code = code;
-              wm_cdtext_info.blocks[j]->block_unicode = pack->header_field_id4_block_no & 0x80;
+              wm_cdtext_info.blocks[j]->block_tqunicode = pack->header_field_id4_block_no & 0x80;
               wm_lib_message(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS,
-                "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_unicode?"doublebyte":"singlebyte");
+                "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_tqunicode?"doublebyte":"singlebyte");
 /*
   unsigned char block_encoding; not jet!
   cdtext_string* block_encoding_text;
diff --git a/kscd/libwm/include/wm_cdtext.h b/kscd/libwm/include/wm_cdtext.h
index e843ee95..ba481be0 100644
--- a/kscd/libwm/include/wm_cdtext.h
+++ b/kscd/libwm/include/wm_cdtext.h
@@ -44,7 +44,7 @@ typedef unsigned char cdtext_string[MAX_LENGHT_OF_CDTEXT_STRING];
 struct cdtext_info_block {
   /* management */
   unsigned char block_code;
-  unsigned char block_unicode; /* 0 - single chars, 1 - doublebytes */
+  unsigned char block_tqunicode; /* 0 - single chars, 1 - doublebytes */
   unsigned char block_encoding; /* orange book -? */
   cdtext_string* block_encoding_text;
 
diff --git a/kscd/libwm/plat_news.c b/kscd/libwm/plat_news.c
index 4b9f2ef7..304ebfda 100644
--- a/kscd/libwm/plat_news.c
+++ b/kscd/libwm/plat_news.c
@@ -181,7 +181,7 @@ int
 gen_get_drive_status( struct wm_drive *d, int oldmode, 
 		      int *mode, int *pos, int *track, int *index)
 {
-  struct CD_Status		sc;
+  struct CD_tqStatus		sc;
 
   /* If we can't get status, the CD is ejected, so default to that. */
   *mode = WM_CDM_EJECTED;
@@ -199,7 +199,7 @@ gen_get_drive_status( struct wm_drive *d, int oldmode,
     }
   
   /* Disc is ejected.  Close the device. */
-  if (CD_GetStatus(d->fd, &sc))
+  if (CD_GettqStatus(d->fd, &sc))
     {
       gen_close(d);
       return (0);
diff --git a/kscd/panel.ui b/kscd/panel.ui
index 2ef615ef..43fd739a 100644
--- a/kscd/panel.ui
+++ b/kscd/panel.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -40,7 +40,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -92,7 +92,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -128,7 +128,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -160,7 +160,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>270</width>
                                     <height>80</height>
@@ -203,7 +203,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout5</cstring>
+                                        <cstring>tqlayout5</cstring>
                                     </property>
                                     <grid>
                                         <property name="name">
@@ -221,7 +221,7 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="minimumSize">
+                                            <property name="tqminimumSize">
                                                 <size>
                                                     <width>100</width>
                                                     <height>35</height>
@@ -239,7 +239,7 @@
                                                 <cstring>statuslabel</cstring>
                                             </property>
                                             <property name="text">
-                                                <string>Status</string>
+                                                <string>tqStatus</string>
                                             </property>
                                         </widget>
                                         <widget class="TQLabel" row="1" column="2">
@@ -275,7 +275,7 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="minimumSize">
+                                            <property name="tqminimumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>0</height>
diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp
index 7cdfee6e..c11e086c 100644
--- a/libkcddb/cddb.cpp
+++ b/libkcddb/cddb.cpp
@@ -100,14 +100,14 @@ namespace KCDDB
     bool
   CDDB::parseGreeting( const TQString & line )
   {
-    uint serverStatus = statusCode( line );
+    uint servertqStatus = statusCode( line );
 
-    if ( 200 == serverStatus )
+    if ( 200 == servertqStatus )
     {
       kdDebug(60010) << "Server response: read-only" << endl;
       readOnly_ = true;
     }
-    else if ( 201 == serverStatus )
+    else if ( 201 == servertqStatus )
     {
       kdDebug(60010) << "Server response: read-write" << endl;
     }
@@ -123,9 +123,9 @@ namespace KCDDB
     bool
   CDDB::parseHandshake( const TQString & line )
   {
-    uint serverStatus = statusCode( line );
+    uint servertqStatus = statusCode( line );
 
-    if ( ( 200 != serverStatus ) && ( 402 != serverStatus ) )
+    if ( ( 200 != servertqStatus ) && ( 402 != servertqStatus ) )
     {
       kdDebug(60010) << "Handshake was too tight. Letting go." << endl;
       return false;
@@ -141,9 +141,9 @@ namespace KCDDB
   {
     TQStringList tokenList = TQStringList::split( ' ', line );
 
-    uint serverStatus = tokenList[ 0 ].toUInt();
+    uint servertqStatus = tokenList[ 0 ].toUInt();
 
-    return serverStatus;
+    return servertqStatus;
   }
 
 /*    CDDB::Transport
diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h
index 38daf164..a848ffb8 100644
--- a/libkcddb/cddb.h
+++ b/libkcddb/cddb.h
@@ -66,8 +66,8 @@ namespace KCDDB
       static TQString resultToString(Result);
       static TQString trackOffsetListToId( const TrackOffsetList & );
 
-      static TQString clientName() { return TQString::fromLatin1("libkcddb"); }
-      static TQString clientVersion() { return TQString::fromLatin1("0.31"); }
+      static TQString clientName() { return TQString::tqfromLatin1("libkcddb"); }
+      static TQString clientVersion() { return TQString::tqfromLatin1("0.31"); }
 
     protected:
       bool parseGreeting( const TQString & );
diff --git a/libkcddb/cddbplookup.cpp b/libkcddb/cddbplookup.cpp
index 839d2650..db62cbae 100644
--- a/libkcddb/cddbplookup.cpp
+++ b/libkcddb/cddbplookup.cpp
@@ -40,10 +40,10 @@ namespace KCDDB
   CDDBPLookup::sendHandshake()
   {
     TQString handshake = TQString( "cddb hello %1 %2 %3 %4" )
-        .arg( user_ )
-        .arg( localHostName_ )
-        .arg( clientName() )
-        .arg( clientVersion() );
+        .tqarg( user_ )
+        .tqarg( localHostName_ )
+        .tqarg( clientName() )
+        .tqarg( clientVersion() );
 
     writeLine( handshake );
   }
@@ -58,8 +58,8 @@ namespace KCDDB
   CDDBPLookup::sendQuery()
   {
     TQString query = TQString( "cddb query %1 %2" )
-        .arg( trackOffsetListToId() )
-        .arg( trackOffsetListToString() );
+        .tqarg( trackOffsetListToId() )
+        .tqarg( trackOffsetListToString() );
 
     writeLine( query );
   }
@@ -71,8 +71,8 @@ namespace KCDDB
     TQString discid    = match.second;
 
     TQString readRequest = TQString( "cddb read %1 %2" )
-        .arg( category_ )
-        .arg( discid );
+        .tqarg( category_ )
+        .tqarg( discid );
 
     writeLine( readRequest );
   }
diff --git a/libkcddb/cdinfo.cpp b/libkcddb/cdinfo.cpp
index 43346b46..b140f103 100644
--- a/libkcddb/cdinfo.cpp
+++ b/libkcddb/cdinfo.cpp
@@ -209,7 +209,7 @@ namespace KCDDB
     if (submit)
     {
       s += "#\n";
-      s += TQString("# Submitted via: %1 %2\n").arg(CDDB::clientName(),
+      s += TQString("# Submitted via: %1 %2\n").tqarg(CDDB::clientName(),
         CDDB::clientVersion());
     }
 
@@ -220,7 +220,7 @@ namespace KCDDB
 
     for (uint i = 0; i < trackInfoList.count(); ++i)
     {
-      s += createLine(TQString("TTITLE%1").arg(i), 
+      s += createLine(TQString("TTITLE%1").tqarg(i), 
                 escape( trackInfoList[ i ].title));
     }
 
@@ -228,7 +228,7 @@ namespace KCDDB
 
     for (uint i = 0; i < trackInfoList.count(); ++i)
     {
-      s += createLine(TQString("EXTT%1").arg(i), escape(trackInfoList[i].extt));
+      s += createLine(TQString("EXTT%1").tqarg(i), escape(trackInfoList[i].extt));
     }
 
     s +="PLAYORDER=\n";
@@ -251,11 +251,11 @@ namespace KCDDB
 
     while (tmpValue.length() > maxLength)
     {
-      lines += TQString("%1=%2\n").arg(name,tmpValue.left(maxLength));
+      lines += TQString("%1=%2\n").tqarg(name,tmpValue.left(maxLength));
       tmpValue = tmpValue.mid(maxLength);
     }
 
-    lines += TQString("%1=%2\n").arg(name,tmpValue);
+    lines += TQString("%1=%2\n").tqarg(name,tmpValue);
 
     return lines;
   }
diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui
index edc6e6fd..17a97eb0 100644
--- a/libkcddb/cdinfodialogbase.ui
+++ b/libkcddb/cdinfodialogbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -276,7 +276,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -292,7 +292,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>231</width>
                             <height>41</height>
diff --git a/libkcddb/cdinfodialogbase.ui.h b/libkcddb/cdinfodialogbase.ui.h
index 1c98e1df..24eaa6df 100644
--- a/libkcddb/cdinfodialogbase.ui.h
+++ b/libkcddb/cdinfodialogbase.ui.h
@@ -7,7 +7,7 @@
 ** place of a destructor.
 *****************************************************************************/
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp
index 18f75455..f18bb95b 100644
--- a/libkcddb/cdinfoencodingwidget.cpp
+++ b/libkcddb/cdinfoencodingwidget.cpp
@@ -20,7 +20,7 @@
 #include <tqcombobox.h>
 #include <tqlistbox.h>
 #include <tqlabel.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kcharsets.h>
@@ -62,7 +62,7 @@ namespace KCDDB
     songsBox->clear();
     songsBox->insertStringList(newTitles);
       
-    titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").arg(
+    titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").tqarg(
           codec->toUnicode(m_artist.latin1()), codec->toUnicode(m_title.latin1())));
   }
 }
diff --git a/libkcddb/cdinfoencodingwidgetbase.ui b/libkcddb/cdinfoencodingwidgetbase.ui
index 5605785c..e60d91b3 100644
--- a/libkcddb/cdinfoencodingwidgetbase.ui
+++ b/libkcddb/cdinfoencodingwidgetbase.ui
@@ -55,7 +55,7 @@
                     <property name="name">
                         <cstring>songsBox</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>300</width>
                             <height>250</height>
diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp
index 461a9334..c3a942d3 100644
--- a/libkcddb/httplookup.cpp
+++ b/libkcddb/httplookup.cpp
@@ -40,7 +40,7 @@ namespace KCDDB
   HTTPLookup::sendQuery()
   {
     TQString cmd = TQString( "cddb query %1 %2" )
-      .arg( trackOffsetListToId(), trackOffsetListToString() ) ;
+      .tqarg( trackOffsetListToId(), trackOffsetListToString() ) ;
 
     makeURL( cmd );
     Result result = fetchURL();
@@ -55,7 +55,7 @@ namespace KCDDB
     TQString discid    = match.second;
 
     TQString cmd = TQString( "cddb read %1 %2" )
-        .arg( category_, discid );
+        .tqarg( category_, discid );
 
     makeURL( cmd );
     Result result = fetchURL();
@@ -83,7 +83,7 @@ namespace KCDDB
     cgiURL_.setQuery( TQString() );
 
     TQString hello = TQString("%1 %2 %3 %4")
-        .arg(user_, localHostName_, clientName(), clientVersion());
+        .tqarg(user_, localHostName_, clientName(), clientVersion());
 
     cgiURL_.addQueryItem( "cmd", cmd );
     cgiURL_.addQueryItem( "hello", hello );
diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
index ad5fffb5..ecd8a587 100644
--- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
+++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
@@ -192,7 +192,7 @@
                                 <property name="text">
                                     <string>&amp;Port:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -243,7 +243,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>41</width>
                                 <height>260</height>
@@ -286,7 +286,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>240</height>
@@ -314,7 +314,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>21</height>
@@ -331,7 +331,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>21</height>
@@ -367,7 +367,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>140</height>
@@ -397,7 +397,7 @@
                                 <property name="text">
                                     <string>Port:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
@@ -517,7 +517,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>260</width>
                                         <height>20</height>
diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp
index 30c9749e..fa15a995 100644
--- a/libkcddb/kcmcddb/kcmcddb.cpp
+++ b/libkcddb/kcmcddb/kcmcddb.cpp
@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
@@ -58,10 +58,10 @@ CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &)
 
   addConfig(cfg, widget_);
 
-  TQVBoxLayout * layout = new TQVBoxLayout(this, 0);
+  TQVBoxLayout * tqlayout = new TQVBoxLayout(this, 0);
 
-  layout->addWidget(widget_);
-  layout->addStretch();
+  tqlayout->addWidget(widget_);
+  tqlayout->addStretch();
 
   setQuickHelp(i18n("CDDB is used to get information like artist, title and song-names in CD's"));
 
diff --git a/libkcddb/lookup.cpp b/libkcddb/lookup.cpp
index e353ece9..25c7599e 100644
--- a/libkcddb/lookup.cpp
+++ b/libkcddb/lookup.cpp
@@ -38,19 +38,19 @@ namespace KCDDB
     CDDB::Result
   Lookup::parseQuery(  const TQString & line )
   {
-    uint serverStatus = statusCode(  line );
+    uint servertqStatus = statusCode(  line );
 
-    if (  200 == serverStatus )
+    if (  200 == servertqStatus )
     {
       TQStringList tokenList = TQStringList::split(  ' ', line );
       matchList_.append(  tqMakePair(  tokenList[  1 ], tokenList[  2 ] ) );
       return Success;
     }
-    else if (  (  211 == serverStatus ) || (  210 == serverStatus ) )
+    else if (  (  211 == servertqStatus ) || (  210 == servertqStatus ) )
     {
       return MultipleRecordFound;
     }
-    else if (  202 == serverStatus )
+    else if (  202 == servertqStatus )
     {
       return NoRecordFound;
     }
@@ -68,9 +68,9 @@ namespace KCDDB
     CDDB::Result
   Lookup::parseRead(  const TQString & line )
   {
-    uint serverStatus = statusCode(  line );
+    uint servertqStatus = statusCode(  line );
 
-    if (   210 != serverStatus )
+    if (   210 != servertqStatus )
       return ServerError;
 
     return Success;
diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp
index 16a7ac79..18082587 100644
--- a/libkcddb/sites.cpp
+++ b/libkcddb/sites.cpp
@@ -44,7 +44,7 @@ namespace KCDDB
     url.setQuery( TQString() );
 
     TQString hello = TQString("%1 %2 %3 %4")
-        .arg(user_, localHostName_, clientName(), clientVersion());
+        .tqarg(user_, localHostName_, clientName(), clientVersion());
 
     url.addQueryItem( "cmd", "sites" );
     url.addQueryItem( "hello", hello );
diff --git a/libkcddb/smtpsubmit.cpp b/libkcddb/smtpsubmit.cpp
index 07f34b61..9733ee40 100644
--- a/libkcddb/smtpsubmit.cpp
+++ b/libkcddb/smtpsubmit.cpp
@@ -43,7 +43,7 @@ namespace KCDDB
   KIO::Job* SMTPSubmit::createJob(const CDInfo& cdInfo)
   {
     url_.setQuery(TQString("to=%1&subject=cddb %2 %3&from=%4")
-      .arg(to_, cdInfo.category, cdInfo.id, from_));
+      .tqarg(to_, cdInfo.category, cdInfo.id, from_));
     kdDebug(60010) << "Url is: " << url_.prettyURL() << endl;
 
     return KIO::storedPut(diskData_.utf8(), url_, -1, false, false, false);
diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp
index 63a0951b..3f099c23 100644
--- a/libkcddb/submit.cpp
+++ b/libkcddb/submit.cpp
@@ -57,9 +57,9 @@ namespace KCDDB
     CDDB::Result
   Submit::parseWrite(  const TQString & line )
   {
-    uint serverStatus = statusCode(  line );
+    uint servertqStatus = statusCode(  line );
 
-    if (   320 != serverStatus )
+    if (   320 != servertqStatus )
       return ServerError;
 
     return Success;
@@ -74,10 +74,10 @@ namespace KCDDB
     diskData_ += "# Track frame offsets:\n";
 
     for (uint i=0; i < numTracks; i++)
-      diskData_ += TQString("#\t%1\n").arg(offsetList[i]);
+      diskData_ += TQString("#\t%1\n").tqarg(offsetList[i]);
 
     int l = offsetList[numTracks+1]/75;
-    diskData_ += TQString("# Disc length: %1 seconds\n").arg(l);
+    diskData_ += TQString("# Disc length: %1 seconds\n").tqarg(l);
 
     diskData_ += cdInfo.toString(true);
 
diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.cpp b/mpeglib/example/yaf/yafcore/inputDecoder.cpp
index e24b7758..cc8aa0a5 100644
--- a/mpeglib/example/yaf/yafcore/inputDecoder.cpp
+++ b/mpeglib/example/yaf/yafcore/inputDecoder.cpp
@@ -173,13 +173,13 @@ void InputDecoder::doSomething(){
 
 
 
-int InputDecoder::getDecoderStatus() {
+int InputDecoder::getDecodertqStatus() {
   return status;
 }
 
 
 
-void InputDecoder::setDecoderStatus(int newState) {
+void InputDecoder::setDecodertqStatus(int newState) {
 
   // First start a new thread with start()!
   // Their is no recovery if the thread status is set to exit!
diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.h b/mpeglib/example/yaf/yafcore/inputDecoder.h
index 0a5623a0..6382228d 100644
--- a/mpeglib/example/yaf/yafcore/inputDecoder.h
+++ b/mpeglib/example/yaf/yafcore/inputDecoder.h
@@ -49,8 +49,8 @@ class KDE_EXPORT InputDecoder {
   virtual const char* processCommand(int command,const char* args);
   virtual void doSomething();
 
-  virtual void setDecoderStatus(int status);
-  int getDecoderStatus();
+  virtual void setDecodertqStatus(int status);
+  int getDecodertqStatus();
 
   const char* getReturnCode();
 
diff --git a/mpeglib/example/yaf/yafcore/yaf_control.cpp b/mpeglib/example/yaf/yafcore/yaf_control.cpp
index 6e789588..6192f36b 100644
--- a/mpeglib/example/yaf/yafcore/yaf_control.cpp
+++ b/mpeglib/example/yaf/yafcore/yaf_control.cpp
@@ -37,7 +37,7 @@ void yaf_control(InputInterface* input,
  
   while(1) {
 
-    status=decoder->getDecoderStatus();
+    status=decoder->getDecodertqStatus();
 
     if (status == _DECODER_STATUS_EXIT) {
       break;
diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp
index 4b3bf3b3..0d1bd034 100644
--- a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp
+++ b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp
@@ -29,7 +29,7 @@ InputDecoderXPlayer::InputDecoderXPlayer(YafOutputStream* yafOutput) :
   this->yafOutput=yafOutput;
   ct=new CommandTableXPlayer();
   
-  setDecoderStatus(_DECODER_STATUS_IDLE);
+  setDecodertqStatus(_DECODER_STATUS_IDLE);
   appendCommandTable(ct);
   majorMode=_PLAYER_MAJOR_MODE_OFF;
   setRuntimeInfo(false);
@@ -161,7 +161,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){
   }
  
   if (command == _PLAYER_PLAY) {
-    setDecoderStatus(_DECODER_STATUS_WORKING);
+    setDecodertqStatus(_DECODER_STATUS_WORKING);
     setMajorMode(_PLAYER_MAJOR_MODE_PLAYING);
     return"";
   }
diff --git a/mpeglib/lib/frame/framer.cpp b/mpeglib/lib/frame/framer.cpp
index d380b2ec..2882864d 100644
--- a/mpeglib/lib/frame/framer.cpp
+++ b/mpeglib/lib/frame/framer.cpp
@@ -223,7 +223,7 @@ int Framer::read_frame(RawDataBuffer* ,RawDataBuffer* ) {
 
 void Framer::unsync(RawDataBuffer* ,int ) {
   if (lConstruct == false) {
-    // invalidate header in buffer
+    // tqinvalidate header in buffer
     cout << "direct virtual call Framer::unsync"<<endl;
   }
 }
diff --git a/mpeglib/lib/mpegplay/macroBlock.cpp b/mpeglib/lib/mpegplay/macroBlock.cpp
index 2e35e551..5436dbd7 100644
--- a/mpeglib/lib/mpegplay/macroBlock.cpp
+++ b/mpeglib/lib/mpegplay/macroBlock.cpp
@@ -1067,7 +1067,7 @@ void MacroBlock::ReconSkippedBlock(unsigned char* source,
   if (width == 16) {
     if ((!right_half) && (!down_half)) {
 	if (right & 0x1) {
-	  /* No alignment, use bye copy */
+	  /* No tqalignment, use bye copy */
 	  for (rr = 0; rr < 16; rr++) {
 
 	    memcpy(dest,source,sizeof(char)*16);
diff --git a/mpeglib/lib/mpegplay/picture.cpp b/mpeglib/lib/mpegplay/picture.cpp
index 6d8c1efe..b63f4989 100644
--- a/mpeglib/lib/mpegplay/picture.cpp
+++ b/mpeglib/lib/mpegplay/picture.cpp
@@ -63,7 +63,7 @@ int Picture::processPicture(MpegVideoStream* mpegVideoStream) {
   stamp=mpegVideoStream->getCurrentTimeStamp();
 
   stamp->copyTo(startOfPicStamp);
-  // now invalidate the PTSFlag
+  // now tqinvalidate the PTSFlag
   stamp->setPTSFlag(false);
 
 
diff --git a/mpeglib/lib/mpegplay/recon.cpp b/mpeglib/lib/mpegplay/recon.cpp
index 6116157a..81350345 100644
--- a/mpeglib/lib/mpegplay/recon.cpp
+++ b/mpeglib/lib/mpegplay/recon.cpp
@@ -298,7 +298,7 @@ int Recon::ReconPMBlock(int bnum,
     } else {
       if (right_for & 0x1) {
 
-	/* No alignment, used byte copy */
+	/* No tqalignment, used byte copy */
 	copyFunctions->copy8_byte(rindex1,index,row_size);
 
 
@@ -498,7 +498,7 @@ int Recon::ReconBMBlock(int bnum,
       copyFunctions->copy8_src2linear_crop(rindex1,dct_start,index,row_size);
     } else {
       if (right_back & 0x1) {
-	/* No alignment, use byte copy */
+	/* No tqalignment, use byte copy */
 
 	copyFunctions->copy8_byte(rindex1,index,row_size);
 	
diff --git a/mpeglib/lib/splay/mpegAudioFrame.cpp b/mpeglib/lib/splay/mpegAudioFrame.cpp
index 807a23a6..d423a1fe 100644
--- a/mpeglib/lib/splay/mpegAudioFrame.cpp
+++ b/mpeglib/lib/splay/mpegAudioFrame.cpp
@@ -34,7 +34,7 @@ MpegAudioFrame::~MpegAudioFrame() {
 
 
 void MpegAudioFrame::unsync(RawDataBuffer* store,int ) {
-  // invalidate header in buffer
+  // tqinvalidate header in buffer
   unsigned char* start=store->ptr();
   start[0]=0x0;
   start[1]=0x0;
diff --git a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp
index 171f4e97..76038a5c 100644
--- a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp
+++ b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp
@@ -21,7 +21,7 @@
  * Erik Corry's multi-byte dither routines.
  *
  * The basic idea is that the Init generates all the necessary tables.
- * The tables incorporate the information about the layout of pixels
+ * The tables incorporate the information about the tqlayout of pixels
  * in the XImage, so that it should be able to cope with 15-bit, 16-bit
  * 24-bit (non-packed) and 32-bit (10-11 bits per color!) screens.
  * At present it cannot cope with 24-bit packed mode, since this involves
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index f3077e13..9f28ec0f 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -34,7 +34,7 @@
 #include <tqimage.h>
 #include <qiomanager.h>
 #include <tqsessionmanager.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <signal.h>
 #include <kmimetype.h>
 
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 0301c7e8..2924e1bc 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -7,7 +7,7 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <klistview.h>
@@ -19,7 +19,7 @@
 #include <kdialog.h>
 #include <klineedit.h>
 
-#include <textview.h>
+#include <tqtextview.h>
 #include <tqwhatsthis.h>
 
 #include "mimetypetree.h"
@@ -88,24 +88,24 @@ General::General(TQObject *parent)
 		b->toggle();
 	}
 
-	TQGridLayout *layout = new TQGridLayout(this, 0, KDialog::spacingHint());
-	layout->setSpacing(KDialog::spacingHint());
+	TQGridLayout *tqlayout = new TQGridLayout(this, 0, KDialog::spacingHint());
+	tqlayout->setSpacing(KDialog::spacingHint());
 
-	layout->addMultiCellWidget(mLoopList, 0, 0, 0, 1);
-	layout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1);
-	layout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1);
-	layout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1);
-	layout->addMultiCellWidget(mRemaining, 6, 6, 0, 1);
+	tqlayout->addMultiCellWidget(mLoopList, 0, 0, 0, 1);
+	tqlayout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1);
+	tqlayout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1);
+	tqlayout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1);
+	tqlayout->addMultiCellWidget(mRemaining, 6, 6, 0, 1);
 
-	layout->addWidget(titleLabel, 7, 0);
-	layout->addWidget(mTitleFormat, 7, 1);
+	tqlayout->addWidget(titleLabel, 7, 0);
+	tqlayout->addWidget(mTitleFormat, 7, 1);
 
-	layout->addWidget(dlsaver, 8, 0);
-	layout->addWidget(mDlSaver, 8, 1);
+	tqlayout->addWidget(dlsaver, 8, 0);
+	tqlayout->addWidget(mDlSaver, 8, 1);
 
-	layout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1);
+	tqlayout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1);
 
-	layout->setRowStretch(10, 1);
+	tqlayout->setRowStretch(10, 1);
 }
 
 
diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp
index 4e40fb56..6815a90a 100644
--- a/noatun/library/effects.cpp
+++ b/noatun/library/effects.cpp
@@ -7,7 +7,7 @@
 #include <player.h>
 #include <soundserver.h>
 #include <noatunarts.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <config.h>
 
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index 0a891ec6..cd9e7d93 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -34,9 +34,9 @@
 #include <tqheader.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqtoolbutton.h>
 #include <tqvgroupbox.h>
 #include <tqwhatsthis.h>
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp
index 5cfd23ed..4aeb852f 100644
--- a/noatun/library/engine.cpp
+++ b/noatun/library/engine.cpp
@@ -482,15 +482,15 @@ bool Engine::initArts()
 				X11CommConfig.sync();
 			}
 
-			cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper")));
+			cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper")));
 			cmdline += " ";
 
 			if (rt)
 				cmdline += TQFile::encodeName(KStandardDirs::findExe(
-				TQString::fromLatin1("artswrapper")));
+				TQString::tqfromLatin1("artswrapper")));
 			else
 				cmdline += TQFile::encodeName(KStandardDirs::findExe(
-				TQString::fromLatin1("artsd")));
+				TQString::tqfromLatin1("artsd")));
 
 			cmdline += " ";
 			cmdline += config.readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f").utf8();
diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp
index 2bfcd239..ae86d00f 100644
--- a/noatun/library/equalizer.cpp
+++ b/noatun/library/equalizer.cpp
@@ -11,7 +11,7 @@
 #include <tqdom.h>
 #include <kio/netaccess.h>
 #include <kstandarddirs.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <math.h>
 #include <kconfig.h>
 #include <klocale.h>
diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index 02a14672..7a55d6f7 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -11,7 +11,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
@@ -64,17 +64,17 @@ void PresetList::rename(TQListViewItem *item, int c)
 EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band)
 	: TQWidget(parent), mBand(band)
 {
-	TQVBoxLayout *layout = new TQVBoxLayout(this,
-		0, 0, "EqualizerLevel::layout");
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this,
+		0, 0, "EqualizerLevel::tqlayout");
 
 	mSlider = new TQSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider");
 	mSlider->setTickmarks(TQSlider::Left);
 	mSlider->setTickInterval(25);
-	layout->addWidget(mSlider);
+	tqlayout->addWidget(mSlider);
 	connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int)));
 	mLabel = new TQLabel("", this, "EqualizerLevel::mLabel");
-	mLabel->setAlignment(AlignHCenter | AlignVCenter);
-	layout->addWidget(mLabel);
+	mLabel->tqsetAlignment(AlignHCenter | AlignVCenter);
+	tqlayout->addWidget(mLabel);
 
 	setMinimumHeight(200);
 //	setMinimumWidth(kapp->fontMetrics().width("158kHz"));
diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui
index 7ec3329f..8a4b52eb 100644
--- a/noatun/library/equalizerwidget.ui
+++ b/noatun/library/equalizerwidget.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -37,7 +37,7 @@
                     <property name="text">
                         <string>Pre&amp;amp:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -54,7 +54,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>1</width>
                             <height>8</height>
@@ -71,7 +71,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>1</width>
                             <height>8</height>
@@ -80,7 +80,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget" row="1" column="1">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -122,7 +122,7 @@
                             <property name="text">
                                 <string>+/-</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -227,7 +227,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>8</width>
                             <height>16</height>
@@ -238,7 +238,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -262,7 +262,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>8</width>
                             <height>16</height>
@@ -301,7 +301,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>8</width>
                             <height>16</height>
diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp
index 40b3606c..fe2ed649 100644
--- a/noatun/library/ksaver.cpp
+++ b/noatun/library/ksaver.cpp
@@ -78,7 +78,7 @@ bool Noatun::KSaver::open(void)
 		}
 		else
 		{
-			d->error = i18n("Could not write to %1.").arg(d->url.prettyURL());
+			d->error = i18n("Could not write to %1.").tqarg(d->url.prettyURL());
 			return false;
 		}
 	}
diff --git a/noatun/library/ksaver.h b/noatun/library/ksaver.h
index cf1e6a87..91fc4af8 100644
--- a/noatun/library/ksaver.h
+++ b/noatun/library/ksaver.h
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <tqfile.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdatastream.h>
 
 namespace Noatun
diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h
index de5bf276..c267aedd 100644
--- a/noatun/library/noatun/scrollinglabel.h
+++ b/noatun/library/noatun/scrollinglabel.h
@@ -44,8 +44,8 @@ class ScrollingLabel : public TQWidget
 		 **/
 		virtual void setText(const TQString &text, int time = -1);
 
-		virtual TQSize sizeHint() const;
-		virtual TQSize minimumSizeHint() const;
+		virtual TQSize tqsizeHint() const;
+		virtual TQSize tqminimumSizeHint() const;
 
 		/**
 		 * @return the label's text.
diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp
index 4069b510..b1ea94d5 100644
--- a/noatun/library/noatuntags/tags.cpp
+++ b/noatun/library/noatuntags/tags.cpp
@@ -4,7 +4,7 @@
 #include <tqslider.h>
 #include <tqspinbox.h>
 #include <kconfig.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqtimer.h>
diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp
index 6541a6b6..f5bd09bd 100644
--- a/noatun/library/playlistsaver.cpp
+++ b/noatun/library/playlistsaver.cpp
@@ -2,7 +2,7 @@
 #include <tqdom.h>
 #include <kio/netaccess.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <noatun/app.h>
 #include "ksaver.h"
 #include <ksimpleconfig.h>
@@ -107,7 +107,7 @@ bool PlaylistSaver::metalist(const KURL &url)
 
 		TQMap<TQString,TQString> map;
 		map["playObject"]="Arts::StreamPlayObject";
-		map["title"] = i18n("Stream from %1").arg(url.host());
+		map["title"] = i18n("Stream from %1").tqarg(url.host());
 
 		KURL u(url);
 		if (!u.hasPath())
@@ -303,7 +303,7 @@ public:
 								else
 								{
 									propMap["playObject"]="SplayPlayObject";
-									propMap["title"] = i18n("Stream from %1").arg(url.host());
+									propMap["title"] = i18n("Stream from %1").tqarg(url.host());
 									if (!url.hasPath())
 										url.setPath("/");
 									propMap["url"] = url.url();
@@ -556,7 +556,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
 			{
 				prop["playObject"]="SplayPlayObject";
 				// Default title, might be overwritten by #EXTINF later
-				prop["title"] = i18n("Stream from %1").arg(protourl.host());
+				prop["title"] = i18n("Stream from %1").tqarg(protourl.host());
 
 				if (!protourl.hasPath())
 					protourl.setPath("/");
@@ -748,9 +748,9 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/)
 
 		map["playObject"]="SplayPlayObject";
 		if (title.isEmpty())
-			map["title"] = i18n("Stream from %1 (port: %2)").arg( url.host() ).arg( url.port() );
+			map["title"] = i18n("Stream from %1 (port: %2)").tqarg( url.host() ).tqarg( url.port() );
 		else
-			map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").arg( title ).arg( url.host() ).arg(url.port() );
+			map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").tqarg( title ).tqarg( url.host() ).tqarg(url.port() );
 
 		map["url"] = map["stream_"]= url.url();
 
diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp
index 3c5b6f5d..02c2f743 100644
--- a/noatun/library/plugin.cpp
+++ b/noatun/library/plugin.cpp
@@ -88,13 +88,13 @@ Visualization::Visualization(int timeout, int pid)
 		int parent=pid ? pid : getppid();
 
 		if (getenv("NOATUN_PID"))
-			parent = TQString::fromLatin1(getenv("NOATUN_PID")).toInt();
+			parent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt();
 
 		DCOPClient c;
 		c.attach();
 
 		TQCString appids[2];
-		appids[0]=TQString("noatun-%1").arg(parent).local8Bit();
+		appids[0]=TQString("noatun-%1").tqarg(parent).local8Bit();
 		appids[1]="noatun";
 		TQCString &appid=appids[0];
 
@@ -504,7 +504,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent)
 
 
 	TQCString appids[2];
-	appids[0]=TQString("noatun-%1").arg(pid).local8Bit();
+	appids[0]=TQString("noatun-%1").tqarg(pid).local8Bit();
 	appids[1]="noatun";
 	appid=appids[0];
 
diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp
index 4a6193f5..dd30111e 100644
--- a/noatun/library/pluginmodule.cpp
+++ b/noatun/library/pluginmodule.cpp
@@ -28,7 +28,7 @@
 #include <tqtabwidget.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "noatunlistview.h"
 #include "pluginmodule.h"
diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp
index 4a304da8..98c05453 100644
--- a/noatun/library/pref.cpp
+++ b/noatun/library/pref.cpp
@@ -4,7 +4,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
 //#include <tqlabel.h>
 #include "cmodule.h"
 
diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp
index c2c9dae8..4484c872 100644
--- a/noatun/library/scrollinglabel.cpp
+++ b/noatun/library/scrollinglabel.cpp
@@ -119,7 +119,7 @@ ScrollingLabel::_update()
 	d->scrollSize = TQMAX(0, w - width());
 
 	d->buf.resize(w, h);
-	d->buf.fill(colorGroup().background());
+	d->buf.fill(tqcolorGroup().background());
 
 	TQPainter p(&d->buf);
 	p.setFont(font());
@@ -128,7 +128,7 @@ ScrollingLabel::_update()
 	if (d->scroll && (d->scrollSize > 0))
 		d->scrollTimer.start(100, true);
 
-	repaint(false);
+	tqrepaint(false);
 }
 
 	void
@@ -149,7 +149,7 @@ ScrollingLabel::scroll()
 {
 	d->scrollTimer.stop();
 
-	repaint(false);
+	tqrepaint(false);
 
 	int scrollTime = 100;
 
@@ -166,13 +166,13 @@ ScrollingLabel::scroll()
 }
 
 	TQSize
-ScrollingLabel::sizeHint() const
+ScrollingLabel::tqsizeHint() const
 {
 	return fontMetrics().boundingRect(d->text).size();
 }
 
 	TQSize
-ScrollingLabel::minimumSizeHint() const
+ScrollingLabel::tqminimumSizeHint() const
 {
 	return TQSize(0, fontMetrics().height());
 }
diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp
index 438504eb..c04fcbd4 100644
--- a/noatun/library/titleproxy.cpp
+++ b/noatun/library/titleproxy.cpp
@@ -157,11 +157,11 @@ void Proxy::sendRequest() //SLOT
 		"%3"
 		"%4"
 		"\r\n" )
-		.arg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) )
-		.arg( m_url.host() )
-		.arg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString() )
-		.arg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString() )
-		.arg( NOATUN_VERSION );
+		.tqarg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) )
+		.tqarg( m_url.host() )
+		.tqarg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString() )
+		.tqarg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString() )
+		.tqarg( NOATUN_VERSION );
 
 	m_sockRemote.writeBlock( request.latin1(), request.length() );
 
@@ -304,7 +304,7 @@ bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead )
 				}
 			}
 
-			if ( m_streamUrl.startsWith( "www.", true ) )
+			if ( m_streamUrl.tqstartsWith( "www.", true ) )
 				m_streamUrl.prepend( "http://" );
 
 			m_sockProxy.writeBlock( m_headerStr.latin1(), m_headerStr.length() );
@@ -339,8 +339,8 @@ void Proxy::transmitData( const TQString &data )
 
 	emit metaData(
 		m_streamName, m_streamGenre, m_streamUrl, m_bitRate,
-		extractStr(data, TQString::fromLatin1("StreamTitle")),
-		extractStr(data, TQString::fromLatin1("StreamUrl")));
+		extractStr(data, TQString::tqfromLatin1("StreamTitle")),
+		extractStr(data, TQString::tqfromLatin1("StreamUrl")));
 }
 
 
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index 4c9eebe8..71a40663 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -57,7 +57,7 @@
 #include <klocale.h>
 
 #include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 
 #include <math.h>
diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp
index 86645d42..f2428bc4 100644
--- a/noatun/library/video.cpp
+++ b/noatun/library/video.cpp
@@ -110,7 +110,7 @@ void VideoFrame::stopped()
 	}
 }
 
-#include <layout.h>
+#include <tqlayout.h>
 
 
 GlobalVideo::GlobalVideo()
@@ -122,7 +122,7 @@ GlobalVideo::GlobalVideo()
 	menu = video->popupMenu(this);
 
 	// FIXME: How to obtain minimum size for top-level widgets?
-//	video->setMinimumSize(minimumSizeHint());
+//	video->setMinimumSize(tqminimumSizeHint());
 //	video->setMinimumSize(101,35);
 	video->setMinimumSize(128,96);
 
diff --git a/noatun/modules/artseffects/extrastereogui_impl.cc b/noatun/modules/artseffects/extrastereogui_impl.cc
index 27e0a8f9..92148ba0 100644
--- a/noatun/modules/artseffects/extrastereogui_impl.cc
+++ b/noatun/modules/artseffects/extrastereogui_impl.cc
@@ -1,4 +1,4 @@
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include "extrastereogui_impl.h"
 
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 95ad2bbb..5d18d488 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -54,7 +54,7 @@
 #include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobjectlist.h>
 #include <tqobjectdict.h>
 #include <tqpushbutton.h>
@@ -107,10 +107,10 @@ Excellent::Excellent()
 	labelFont.setBold(true);
 	TQFontMetrics labelFontMetrics = labelFont;
 	elapsed->setFont(labelFont);
-	elapsed->setAlignment(AlignCenter | AlignVCenter | ExpandTabs);
+	elapsed->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs);
 	elapsed->setText("--:--");
 	elapsed->setFixedHeight(labelFontMetrics.height());
-	elapsed->setMinimumWidth(elapsed->sizeHint().width());
+	elapsed->setMinimumWidth(elapsed->tqsizeHint().width());
 
 	// Doing this makes the slider the same heigh as the font. This is just plain wrong...
 	//slider->setFixedHeight(labelFontMetrics.height());
@@ -121,9 +121,9 @@ Excellent::Excellent()
 	labelFont = total->font();
 	labelFont.setBold(true);
 	total->setFont(labelFont);
-	total->setAlignment(AlignCenter | AlignVCenter | ExpandTabs);
+	total->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs);
 	total->setText("--:--");
-	total->setMinimumWidth(total->sizeHint().width());
+	total->setMinimumWidth(total->tqsizeHint().width());
 	total->setText("");
 
 	statusBar()->addWidget(total, 0, true);
@@ -335,7 +335,7 @@ void Excellent::showMenubar(void)
 	}
 	else
 	{
-		KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").arg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning");
+		KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").tqarg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning");
 		menuBar()->hide();
 	}
 }
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index b48f130f..3a1e2b4e 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -1,6 +1,6 @@
 #include <klocale.h>
 #include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <kaction.h>
 #include <noatun/stdaction.h>
 #include "htmlexport.h"
@@ -213,19 +213,19 @@ Prefs::Prefs(TQObject *parent)
 
 	txtColorLabel = new TQLabel( colorBox, "txtColorLabel" );
 	txtColorLabel->setText( i18n( "Text:"  ) );
-	txtColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	txtColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	bgColorLabel = new TQLabel( colorBox, "bgColorLabel" );
 	bgColorLabel->setText( i18n( "Background:"  ) );
-	bgColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	bgColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	headColorLabel = new TQLabel( colorBox, "headColorLabel" );
 	headColorLabel->setText( i18n( "Heading:"  ) );
-	headColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	headColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	hoverColorLabel = new TQLabel( colorBox, "hoverColorLabel" );
 	hoverColorLabel->setText( i18n( "Link hover:" ) );
-	hoverColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	hoverColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	bgcolorLabel->setRowStretch(0, 1);
 
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index c67634e5..663eaae0 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -3,13 +3,13 @@
 #define _HTMLEXPORT_H_
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqlabel.h>
 #include <tqhgroupbox.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index fb81199d..c83326ad 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -1,5 +1,5 @@
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <noatun/app.h>
@@ -54,35 +54,35 @@ TQMap<TQString, IRPrefs::Command> IRPrefs::s_commands;
 IRPrefs::IRPrefs(TQObject *parent)
 	: CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent)
 {
-	TQGridLayout *layout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint());
-	layout->setColStretch(1, 1);
+	TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint());
+	tqlayout->setColStretch(1, 1);
 
 	TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this);
-	layout->addMultiCellWidget(label, 0, 0, 0, 4);
+	tqlayout->addMultiCellWidget(label, 0, 0, 0, 4);
 
 	label->setBuddy(m_commands = new KListView(this));
-	layout->addMultiCellWidget(m_commands, 1, 1, 0, 4);
+	tqlayout->addMultiCellWidget(m_commands, 1, 1, 0, 4);
 
 	label = new TQLabel(i18n("&Action:"), this);
-	layout->addWidget(label, 2, 0);
+	tqlayout->addWidget(label, 2, 0);
 
 	label->setBuddy(m_action = new KComboBox(this));
 	m_action->setEnabled(false);
-	layout->addWidget(m_action, 2, 1);
+	tqlayout->addWidget(m_action, 2, 1);
 
 	m_repeat = new TQCheckBox(i18n("&Repeat"), this);
 	m_repeat->setEnabled(false);
-	layout->addWidget(m_repeat, 2, 2);
+	tqlayout->addWidget(m_repeat, 2, 2);
 
 	label = new TQLabel(i18n("&Interval:"), this);
-	layout->addWidget(label, 2, 3);
+	tqlayout->addWidget(label, 2, 3);
 
 	label->setBuddy(m_interval = new KIntSpinBox(this));
 	m_interval->setMinValue(1);
 	m_interval->setMaxValue(0xff);
 	m_interval->setValue(10);
 	m_interval->setEnabled(false);
-	layout->addWidget(m_interval, 2, 4);
+	tqlayout->addWidget(m_interval, 2, 4);
 
 	connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen()));
 	connect(m_commands,
@@ -109,9 +109,9 @@ void IRPrefs::save()
 	int i = 1;
 	for (TQMap<TQString, Command>::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it)
 	{
-		c->writePathEntry(TQString("Command_%1").arg(i), it.key());
-		c->writeEntry(TQString("Action_%1").arg(i), (int)((*it).action));
-		c->writeEntry(TQString("Interval_%1").arg(i), (*it).interval);
+		c->writePathEntry(TQString("Command_%1").tqarg(i), it.key());
+		c->writeEntry(TQString("Action_%1").tqarg(i), (int)((*it).action));
+		c->writeEntry(TQString("Interval_%1").tqarg(i), (*it).interval);
 		++i;
 	}
 }
@@ -288,9 +288,9 @@ void IRPrefs::readConfig()
 	for (int i = 1; i <= count; ++i)
 	{
 		Command cmd;
-		cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").arg(i)));
-		cmd.interval = c->readNumEntry(TQString("Interval_%1").arg(i));
-		s_commands.insert(c->readPathEntry(TQString("Command_%1").arg(i)), cmd);
+		cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").tqarg(i)));
+		cmd.interval = c->readNumEntry(TQString("Interval_%1").tqarg(i));
+		s_commands.insert(c->readPathEntry(TQString("Command_%1").tqarg(i)), cmd);
 	}
 	s_configRead = true;
 }
diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS
index ae293014..7cfc61e2 100644
--- a/noatun/modules/kaiman/SKIN-SPECS
+++ b/noatun/modules/kaiman/SKIN-SPECS
@@ -56,7 +56,7 @@ options in the event that options are added to the skin spec in the future.
 
 PROPER TRANSPARENCY:
 The main background image uses a threshold of 1 (out of 256 levels) for the
-window shape, the rest is used for partially overwiting the background when
+window tqshape, the rest is used for partially overwiting the background when
 the Transparency option is true.
 
 Portions of items, buttons, sliders, numbers, and text that never change and
@@ -80,7 +80,7 @@ Background: filename
 
  filename
   The background image file, the window will be the same size as this image.
-  Add transparency to this image for shaped skins, the cutoff threshold for
+  Add transparency to this image for tqshaped skins, the cutoff threshold for
   transparency is 1 on images with muli-level alpha (like in png).
 
 Transparency: flag
@@ -95,7 +95,7 @@ Mask: filename
 (this is DEPRECATED!, for transparent skins just add transparency to the
  Background image, Mask remains merely for backwards compatibility)
  filename
-  The mask image file, only needed for skins which are shaped windows (not
+  The mask image file, only needed for skins which are tqshaped windows (not
   rectangular). Contains a transparency mask for the main window.
 
 ==========================
@@ -185,7 +185,7 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename]
  Items                     (with fixed number sections)
 ==========================
 
-Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/
+Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/
             Minus/Total_Item: filename x y
 
  filename
@@ -401,7 +401,7 @@ Option line:           | # images | Normal | Pressed | Prelit |
   Items (all item images contained vertically)
 --------------------------
 
-Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/Minus/Total_Item: filename x y
+Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/Minus/Total_Item: filename x y
 
 Item:                  | # images | Image 1 | Image 2 | Image 3 | Image 4 | Image 5 |
                        |  total   |         |         |         |         |         |
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index bc3222d5..1077613b 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <klistbox.h>
 #include <tqdir.h>
diff --git a/noatun/modules/kaiman/skins/circle/README b/noatun/modules/kaiman/skins/circle/README
index d80082af..a39fff38 100644
--- a/noatun/modules/kaiman/skins/circle/README
+++ b/noatun/modules/kaiman/skins/circle/README
@@ -3,8 +3,8 @@ Author: Johne Ellis <gqview@geocities.ocm>
 Released: November 25, 1998
 Version: 1.0
 URL: http://www.geocities.com/SiliconValley/Haven/5235
-Comments: Skin with a doughnut shape to test shaped windows.
-          (skins with a shape mask)
+Comments: Skin with a doughnut tqshape to test tqshaped windows.
+          (skins with a tqshape mask)
 
 Note: For transparency to work, GQmpeg 0.4.2 is required.
       Previous versions will work, but will be _ugly_.
diff --git a/noatun/modules/kaiman/skins/circle/skindata b/noatun/modules/kaiman/skins/circle/skindata
index 25268d22..8dba21db 100644
--- a/noatun/modules/kaiman/skins/circle/skindata
+++ b/noatun/modules/kaiman/skins/circle/skindata
@@ -6,15 +6,15 @@
 #Released: November 25, 1998
 #Author: John Ellis <gqview@geocities.com>
 #URL: http://www.geocities.com/SiliconValley/Haven/5235/
-#Comments: Skin with a doughnut shape to test shaped windows.
-#          (skins with a shape mask)
+#Comments: Skin with a doughnut tqshape to test tqshaped windows.
+#          (skins with a tqshape mask)
 
 #run 'gqmpeg -skinhelp' for help with coordinates.
 #simply comment out items you do not want to display
 #only Background is required.
 Background: back.png
 
-#Mask is an image with transparency used to define a shaped window
+#Mask is an image with transparency used to define a tqshaped window
 Mask: back_mask.png
 
 #Title: filename length x y
diff --git a/noatun/modules/kaiman/skins/circle/skindata_alt b/noatun/modules/kaiman/skins/circle/skindata_alt
index fb3e97f5..42661e81 100644
--- a/noatun/modules/kaiman/skins/circle/skindata_alt
+++ b/noatun/modules/kaiman/skins/circle/skindata_alt
@@ -6,15 +6,15 @@
 #Released: November 25, 1998
 #Author: John Ellis <gqview@geocities.com>
 #URL: http://www.geocities.com/SiliconValley/Haven/5235/
-#Comments: Skin with a doughnut shape to test shaped windows.
-#          (skins with a shape mask)
+#Comments: Skin with a doughnut tqshape to test tqshaped windows.
+#          (skins with a tqshape mask)
 
 #run 'gqmpeg -skinhelp' for help with coordinates.
 #simply comment out items you do not want to display
 #only Background is required.
 Background: back_sm.png
 
-#Mask is an image with transparency used to define a shaped window
+#Mask is an image with transparency used to define a tqshaped window
 Mask: back_sm_mask.png
 
 #Title: filename length x y
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index dbfcea6c..bbf55cb3 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -22,7 +22,7 @@
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqpainter.h>
 #include <tqdropsite.h>
 #include <kdebug.h>
@@ -160,7 +160,7 @@ void KaimanStyleElement::setPixmap( int num )
         if ( num<0 ) num = 0;
 
         _currentPixmap = num;
-        repaint( FALSE );
+        tqrepaint( FALSE );
     }
 }
 
@@ -321,7 +321,7 @@ void KaimanStyleButton::updateButtonState() {
     }
 
     setPixmap( *I_pmIndex[i_i_currentState] );
-    repaint();
+    tqrepaint();
 }
 
 
@@ -349,7 +349,7 @@ void KaimanStyleSlider::setValue( int value )
     if (value>_max) value=_max;
     if (value<_min) value=_min;
     _value = value;
-    repaint();
+    tqrepaint();
 }
 
 
@@ -359,7 +359,7 @@ void KaimanStyleSlider::setValue( int value, int min, int max )
         _min = min;
         _max = max;
         setValue( value );
-        repaint();
+        tqrepaint();
     }
 }
 
@@ -413,7 +413,7 @@ void KaimanStyleSlider::mouseReleaseEvent(TQMouseEvent *qme)
     {
         _down = false;
         releaseMouse();
-        repaint();
+        tqrepaint();
 
         setValue( pos2value(qme->x(), qme->y()) );
         emit newValue( value() );
@@ -465,7 +465,7 @@ void KaimanStyleSlider::enterEvent ( TQEvent * e )
     if ( !_lit && optionPrelight )
     {
         _lit = true;
-        repaint();
+        tqrepaint();
     }
 
     KaimanStyleMasked::enterEvent( e );
@@ -476,7 +476,7 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e )
     if ( _lit )
     {
         _lit = false;
-        repaint();
+        tqrepaint();
     }
 
     KaimanStyleMasked::leaveEvent( e );
@@ -522,7 +522,7 @@ void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme)
 
 void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme)
 {
-    // On the background we move the shaped toplevel around
+    // On the background we move the tqshaped toplevel around
     if (!i_b_move) {
         i_point_dragStart = qme->pos();
         i_point_lastPos = qme->globalPos();
@@ -599,7 +599,7 @@ void KaimanStyleNumber::setValue( int value )
     if ( _value!=value )
     {
         _value = value;
-        repaint();
+        tqrepaint();
     }
 }
 
@@ -667,7 +667,7 @@ void KaimanStyleText::setValue( TQString value )
         _pos = 0;
         _direction = 1;
         _value = value;
-        repaint();
+        tqrepaint();
     }
 }
 
@@ -698,7 +698,7 @@ void KaimanStyleText::timeout()
         // check new position
         if ( _pos+_direction>=0 && (int)_value.length()-(_pos+_direction)>=digits ) {
             _pos += _direction;
-            repaint();
+            tqrepaint();
         }
 
         _timer->start( _delay, TRUE );
@@ -1456,7 +1456,7 @@ bool KaimanStyle::loadPixmaps()
 
     if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) {
 
-        // OK, background and mask are defined. So now I can calculate the shape
+        // OK, background and mask are defined. So now I can calculate the tqshape
         int l_i_width_Mask  = l_pixmap_Mask->width();
         int l_i_height_Mask = l_pixmap_Mask->height();
 
diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h
index 19d44b98..5d3bfcdb 100644
--- a/noatun/modules/kaiman/style.h
+++ b/noatun/modules/kaiman/style.h
@@ -346,7 +346,7 @@ private:
     TQString     i_s_styleBase;
 
 
-    // The mask of the complete style. Used for doing shaped windows
+    // The mask of the complete style. Used for doing tqshaped windows
     TQBitmap     i_bitmap_Mask;
 
     /// All style elements are stored here.
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 3d1791ec..a8b241f7 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -88,10 +88,10 @@ Kaiman::Kaiman()
 
 	if ( !changeStyle(skinName, "skindata") )
 	{
-		KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").arg(skinName) );
+		KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").tqarg(skinName) );
 		if ( !changeStyle( DEFAULT_SKIN, "skindata" ) )
 		{
-			KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) );
+			KMessageBox::error( this, i18n("Cannot load default skin %1.").tqarg(DEFAULT_SKIN) );
 			TQTimer::singleShot( 0, this, TQT_SLOT(close()) );
 			return;
 		}
@@ -159,7 +159,7 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc )
 
 	if ( _style->Mask() != 0 )
 	{
-		// Set the shaped window form
+		// Set the tqshaped window form
 		XShapeCombineMask( qt_xdisplay(), winId(), ShapeBounding, 0,0,
 		                   _style->Mask()->handle(), ShapeSet );
 	}
@@ -335,13 +335,13 @@ void Kaiman::toggleSkin()
 	TQString oldDesc, newDesc;
 	if ( _altSkin )
 	{
-		oldDesc = TQString::fromLatin1("skindata");
-		newDesc = TQString::fromLatin1("alt_skindata");
+		oldDesc = TQString::tqfromLatin1("skindata");
+		newDesc = TQString::tqfromLatin1("alt_skindata");
 	}
 	else
 	{
-		newDesc = TQString::fromLatin1("skindata");
-		oldDesc = TQString::fromLatin1("alt_skindata");
+		newDesc = TQString::tqfromLatin1("skindata");
+		oldDesc = TQString::tqfromLatin1("alt_skindata");
 	}
 
 	if ( !changeStyle(skinName, newDesc) )
@@ -372,7 +372,7 @@ void Kaiman::volumeDown()
 
 void Kaiman::execMixer()
 {
-	kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() );
+	kapp->startServiceByDesktopName ( TQString::tqfromLatin1("kmix"), TQString() );
 }
 
 
@@ -520,7 +520,7 @@ void Kaiman::newSong()
 			if ( title.isEmpty() )
 				title = napp->player()->current().file();
 
-			title = i18n("TITLE (LENGTH)", "%1 (%2)").arg(title,
+			title = i18n("TITLE (LENGTH)", "%1 (%2)").tqarg(title,
 				napp->player()->current().lengthString());
 		}
 		titleItem->setValue( title );
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index 60637d7a..e1f2286a 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -3,12 +3,12 @@
 #include <noatun/app.h>
 #include <noatun/playlist.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
 #include <klocale.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include "keyz.h"
 
@@ -174,9 +174,9 @@ KeyzPrefs::KeyzPrefs( TQObject *parent ) :
     CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings",
              parent )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
     m_chooser = new KKeyChooser( Keyz::accel(), this );
-    layout->addWidget( m_chooser );
+    tqlayout->addWidget( m_chooser );
 }
 
 void KeyzPrefs::save()
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index 795dedfb..edd53e2b 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -165,9 +165,9 @@ void KJButton::showPressed(bool b)
 {
 	mShowPressed = b;
 	if ( mShowPressed )
-		repaint(true); // repaint with selected image
+		tqrepaint(true); // tqrepaint with selected image
 	else
-		repaint(false); // repaint with default image (player-background)
+		tqrepaint(false); // tqrepaint with default image (player-background)
 }
 
 void KJButton::slotPlaylistShown(void)
@@ -193,8 +193,8 @@ void KJButton::slotEqEnabled(bool on)
 
 void KJButton::mouseRelease(const TQPoint &, bool in)
 {
-	// repaint with default image (player-background)
-	repaint(false);
+	// tqrepaint with default image (player-background)
+	tqrepaint(false);
 
 	if (!in) // only do something if users is still inside the button
 		return;
diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp
index d7d2b9fa..b84a0185 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.cpp
+++ b/noatun/modules/kjofol-skin/kjequalizer.cpp
@@ -110,7 +110,7 @@ void KJEqualizer::slotUpdateBuffer()
 	} // for()
 	// whole thingy has been drawn, now set the mask
 	mView->setMask( regionMask );
-	repaint();
+	tqrepaint();
 }
 
 void KJEqualizer::mouseMove(const TQPoint &p, bool in)
diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h
index 18997c6f..42c64a45 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.h
+++ b/noatun/modules/kjofol-skin/kjequalizer.h
@@ -32,7 +32,7 @@ private:
 	int mBandWidth;
 	int mBandHalfHeight;
 	TQPixmap mBars; // holds all slider images
-	TQPixmap *mBack; // holds background of EQ for easy repaint
+	TQPixmap *mBack; // holds background of EQ for easy tqrepaint
 	TQPixmap *mView; // holds prepared img of all sliders
 	VInterpolation *mInterpEq;
 };
diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
index 934285fa..762d86b9 100644
--- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui
+++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
@@ -276,7 +276,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
@@ -320,7 +320,7 @@
                     <property name="name">
                         <cstring>titleScrollSpeed</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>80</width>
                             <height>0</height>
@@ -428,7 +428,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>140</width>
                     <height>21</height>
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index ad843376..a97acb98 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -142,7 +142,7 @@ KJLoader::KJLoader()
 	else
 	{
 		KNotifyClient::event(winId(), "warning",
-			i18n("There was trouble loading skin %1. Please select another skin file.").arg(skin));
+			i18n("There was trouble loading skin %1. Please select another skin file.").tqarg(skin));
 		napp->preferences();
 	}
 
@@ -392,7 +392,7 @@ void KJLoader::loadSkin(const TQString &file)
 	show();
 	conserveMemory();
 
-	repaint();
+	tqrepaint();
 
 	// update displays if we are already playing
 	// This happens while changing skins
@@ -812,7 +812,7 @@ void KJLoader::showSplash()
 	splashScreen->setBackgroundMode ( NoBackground );
 	splashScreen->setMask( KJWidget::getMask(image(item("splashscreen")[1])) );
 
-	TQSize sh = splashScreen->sizeHint();
+	TQSize sh = splashScreen->tqsizeHint();
 
 	TQRect desk = KGlobalSettings::splashScreenDesktopGeometry();
 	splashScreen->move (desk.x() + (desk.width() - sh.width())/2,
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index f3ec5f37..4231d0ff 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -17,13 +17,13 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqslider.h>
 #include <tqpixmap.h>
 #include <tqtabwidget.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 #include <tqfileinfo.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp
index d368e95d..e82a1f8e 100644
--- a/noatun/modules/kjofol-skin/kjseeker.cpp
+++ b/noatun/modules/kjofol-skin/kjseeker.cpp
@@ -156,7 +156,7 @@ void KJSeeker::mouseRelease(const TQPoint &pos, bool in)
 		return;
 
 	g = grayRgb(color);
-	repaint();
+	tqrepaint();
 
 //	kdDebug(66666) << "length : " << napp->player()->getLength() << endl;
 //	kdDebug(66666) << "skip to: " << ((long long)g*(long long)napp->player()->getLength())/255 << endl;
diff --git a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
index c393bc03..229d307e 100644
--- a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
+++ b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
@@ -70,7 +70,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>31</height>
@@ -87,7 +87,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>51</width>
                             <height>21</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>41</height>
@@ -121,7 +121,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>31</width>
                             <height>21</height>
@@ -135,7 +135,7 @@
                     <property name="scaledContents">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">
diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp
index eaba2e76..589f994f 100644
--- a/noatun/modules/kjofol-skin/kjsliders.cpp
+++ b/noatun/modules/kjofol-skin/kjsliders.cpp
@@ -86,14 +86,14 @@ void KJVolumeBar::paint(TQPainter *p, const TQRect &)
 		TQt::CopyROP);
 
 	if (mText)
-		mText->repaint();
+		mText->tqrepaint();
 }
 
 bool KJVolumeBar::mousePress(const TQPoint &pos)
 {
 	mVolume = (pos.x()*100) / rect().width();
 //	kdDebug(66666) << "volume: " << mVolume << endl;
-	repaint();
+	tqrepaint();
 	napp->player()->setVolume(mVolume);
 	return true;
 }
@@ -112,7 +112,7 @@ void KJVolumeBar::mouseMove(const TQPoint &pos, bool in)
 void KJVolumeBar::timeUpdate(int)
 {
 	mVolume = napp->player()->volume();
-	repaint();
+	tqrepaint();
 }
 
 
@@ -148,7 +148,7 @@ void KJVolumeBMP::paint(TQPainter *p, const TQRect &)
 	TQRect from(mVolume*mCount/100*mWidth, 0, mWidth, mImages.height());
 	bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP);
 	if (mText)
-		mText->repaint();
+		mText->tqrepaint();
 }
 
 bool KJVolumeBMP::mousePress(const TQPoint &pos)
@@ -162,7 +162,7 @@ bool KJVolumeBMP::mousePress(const TQPoint &pos)
 //	kdDebug(66666) << "gray  : " << grayRgb(color) << endl;
 //	kdDebug(66666) << "volume: " << mVolume << endl;
 
-	repaint();
+	tqrepaint();
 
 	napp->player()->setVolume(mVolume);
 
@@ -187,7 +187,7 @@ void KJVolumeBMP::timeUpdate(int)
 
 	mOldVolume = mVolume;
 
-	repaint();
+	tqrepaint();
 }
 
 
@@ -236,7 +236,7 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p)
 	readConfig();
 
 	if (mText)
-		mText->repaint();
+		mText->tqrepaint();
 }
 
 TQString KJPitchBMP::tip()
@@ -253,7 +253,7 @@ void KJPitchBMP::paint(TQPainter *p, const TQRect &)
 	bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP);
 
 	if (mText)
-		mText->repaint();
+		mText->tqrepaint();
 }
 
 bool KJPitchBMP::mousePress(const TQPoint &pos)
@@ -266,7 +266,7 @@ bool KJPitchBMP::mousePress(const TQPoint &pos)
 	mCurrentPitch = mMinPitch + ( (grayRgb(color)*(mMaxPitch-mMinPitch)) / 255 );
 //	kdDebug(66666) << "[KJPitchBMP] mousePress()  mCurrentPitch: " << mCurrentPitch << endl;
 
-	repaint();
+	tqrepaint();
 
 	newFile(); // wrong naming, in fact it just sets pitch
 
@@ -300,7 +300,7 @@ void KJPitchBMP::timeUpdate(int)
 
 	mOldPitch = mCurrentPitch;
 
-	repaint();
+	tqrepaint();
 }
 
 void KJPitchBMP::newFile()
diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
index 7bacbb13..e0d3028e 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
@@ -108,7 +108,7 @@ void KJFilename::timerEvent(TQTimerEvent *)
 	// apply the newly created mask
 	mView.setMask(newMask);
 
-	repaint();
+	tqrepaint();
 }
 
 bool KJFilename::mousePress(const TQPoint &)
@@ -142,7 +142,7 @@ void KJFilename::readConfig()
 		mDistance = 1;
 	mTimerUpdates = KJLoader::kjofol->prefs()->titleMovingUpdates();
 	textFont().recalcSysFont();
-	mLastTitle=""; // invalidate title so it gets repainted on next timeUpdate()
+	mLastTitle=""; // tqinvalidate title so it gets repainted on next timeUpdate()
 }
 
 void KJFilename::prepareString(const TQCString &str)
@@ -255,7 +255,7 @@ void KJTime::readConfig()
 //	kdDebug(66666) << "KJTime::readConfig()" << endl;
 	countDown = napp->displayRemaining();
 	timeFont().recalcSysFont();
-	mLastTime=""; // invalidate time so it gets repainted on next timeUpdate()
+	mLastTime=""; // tqinvalidate time so it gets repainted on next timeUpdate()
 }
 
 TQString KJTime::lengthString ( void )
@@ -325,7 +325,7 @@ void KJTime::prepareString(const TQCString &str)
 	mLastTime = str;
 	mTime = timeFont().draw(str, rect().width());
 
-	repaint();
+	tqrepaint();
 //	kdDebug(66666) << "END KJTime::prepareString(const TQCString &str)" << endl;
 }
 
@@ -398,7 +398,7 @@ bool KJVolumeText::mousePress(const TQPoint &)
 void KJVolumeText::readConfig()
 {
 	volumeFont().recalcSysFont();
-	mLastVolume=""; // invalidate value so it gets repainted on next timeUpdate()
+	mLastVolume=""; // tqinvalidate value so it gets repainted on next timeUpdate()
 }
 
 void KJVolumeText::timeUpdate(int)
@@ -421,7 +421,7 @@ void KJVolumeText::prepareString(const TQCString &str)
 	mLastVolume = str;
 	mVolume = volumeFont().draw(str, rect().width());
 
-	repaint();
+	tqrepaint();
 }
 
 TQString KJVolumeText::tip()
@@ -501,7 +501,7 @@ void KJPitchText::mouseRelease(const TQPoint &, bool in)
 void KJPitchText::readConfig()
 {
 	pitchFont().recalcSysFont();
-	mLastPitch=""; // invalidate value so it gets repainted on next timeUpdate()
+	mLastPitch=""; // tqinvalidate value so it gets repainted on next timeUpdate()
 }
 
 void KJPitchText::timeUpdate(int)
@@ -529,7 +529,7 @@ void KJPitchText::prepareString(const TQCString &str)
 	mLastPitch = str;
 	mSpeed = pitchFont().draw(str, rect().width());
 
-	repaint();
+	tqrepaint();
 }
 
 TQString KJPitchText::tip()
@@ -600,7 +600,7 @@ bool KJFileInfo::mousePress(const TQPoint &)
 void KJFileInfo::readConfig()
 {
 	textFont().recalcSysFont();
-	mLastTime=""; // invalidate value so it gets repainted on next timeUpdate()
+	mLastTime=""; // tqinvalidate value so it gets repainted on next timeUpdate()
 }
 
 void KJFileInfo::timeUpdate(int)
@@ -634,7 +634,7 @@ void KJFileInfo::prepareString(const TQCString &str)
 		return;
 	mLastTime = str;
 	mTime = textFont().draw(str, rect().width());
-	repaint();
+	tqrepaint();
 }
 
 TQString KJFileInfo::tip()
diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp
index 7ae04d44..a1a4c840 100644
--- a/noatun/modules/kjofol-skin/kjvis.cpp
+++ b/noatun/modules/kjofol-skin/kjvis.cpp
@@ -79,7 +79,7 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent)
 	mBack = new KPixmap ( TQSize(xs,ys) );
 	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 	setRect ( x, y, xs, ys );
-	repaint();
+	tqrepaint();
 }
 
 void KJNullScope::paint(TQPainter *p, const TQRect &)
@@ -98,7 +98,7 @@ void KJNullScope::mouseRelease(const TQPoint &, bool in)
 	if (!in) // only do something if users is still inside the button
 		return;
 
-	parent()->repaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(FFT);
 }
 
@@ -108,7 +108,7 @@ void KJNullScope::readConfig()
 	Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType();
 	if ( v != Null )
 	{
-		parent()->repaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 	}
 }
@@ -163,7 +163,7 @@ void KJFFT::scopeEvent(float *d, int size)
 	if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
 	{
 		if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
-			parent()->repaint(rect(), false);
+			parent()->tqrepaint(rect(), false);
 		return;
 	}
 
@@ -203,7 +203,7 @@ void KJFFT::scopeEvent(float *d, int size)
 	mGradient->setMask(mGradientMask);
 	bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP );
 
-	repaint();
+	tqrepaint();
 }
 
 void KJFFT::paint(TQPainter *p, const TQRect &)
@@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in)
 		return;
 
 	stop();
-	parent()->repaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(Mono);
 }
 
@@ -236,7 +236,7 @@ void KJFFT::readConfig()
 	if ( v != FFT )
 	{
 		stop();
-		parent()->repaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
@@ -297,7 +297,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 	if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
 	{
 		if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
-			parent()->repaint(rect(), false);
+			parent()->tqrepaint(rect(), false);
 		return;
 	}
 
@@ -356,7 +356,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 	mGradient->setMask(mGradientMask);
 	bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP );
 
-	repaint();
+	tqrepaint();
 }
 
 void KJStereoFFT::paint(TQPainter *p, const TQRect &)
@@ -376,7 +376,7 @@ void KJStereoFFT::mouseRelease(const TQPoint &, bool in)
 	if (!in) // only do something if users is still inside the button
 		return;
 	stop();
-	parent()->repaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(Null);
 }
 
@@ -387,7 +387,7 @@ void KJStereoFFT::readConfig()
 	if ( v != StereoFFT )
 	{
 		stop();
-		parent()->repaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
@@ -448,7 +448,7 @@ void KJScope::scopeEvent(float *d, int size)
 		if ( napp->player()->isStopped() )
 		{
 			bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
-			repaint();
+			tqrepaint();
 		}
 		return;
 	}
@@ -497,7 +497,7 @@ void KJScope::scopeEvent(float *d, int size)
 		x++;
 	}
 
-	repaint();
+	tqrepaint();
 }
 
 void KJScope::paint(TQPainter *p, const TQRect &)
@@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in)
 		return;
 
 	stop();
-	parent()->repaint(rect(), false);
+	parent()->tqrepaint(rect(), false);
 	swapScope(/*Null*/ StereoFFT);
 }
 
@@ -528,7 +528,7 @@ void KJScope::readConfig()
 	if ( v != Mono )
 	{
 		stop();
-		parent()->repaint(rect(), false);
+		parent()->tqrepaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
diff --git a/noatun/modules/kjofol-skin/kjwidget.cpp b/noatun/modules/kjofol-skin/kjwidget.cpp
index 737032cf..f9cb345a 100644
--- a/noatun/modules/kjofol-skin/kjwidget.cpp
+++ b/noatun/modules/kjofol-skin/kjwidget.cpp
@@ -34,13 +34,13 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent)
 	return bm;
 }
 
-void KJWidget::repaint(bool me, const TQRect &r, bool clear)
+void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear)
 {
 	TQPainter p(parent());
 	if (me)
 		paint(&p, r.isValid() ? r : rect());
 	else
-		parent()->repaint(r.isValid() ? r : rect(), clear);
+		parent()->tqrepaint(r.isValid() ? r : rect(), clear);
 }
 
 const TQString &KJWidget::backgroundPressed(const TQString &bmp) const
diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h
index f64d2226..a678e8a7 100644
--- a/noatun/modules/kjofol-skin/kjwidget.h
+++ b/noatun/modules/kjofol-skin/kjwidget.h
@@ -25,8 +25,8 @@ public:
 	virtual void readConfig() {}
 
 	// called when the mouse is moved while clicked in this widget
-	// repaint myself
-	virtual void repaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false);
+	// tqrepaint myself
+	virtual void tqrepaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false);
 
 	virtual TQString tip() { return 0; }
 
diff --git a/noatun/modules/kjofol-skin/parser.cpp b/noatun/modules/kjofol-skin/parser.cpp
index 91fe8013..b17e943a 100644
--- a/noatun/modules/kjofol-skin/parser.cpp
+++ b/noatun/modules/kjofol-skin/parser.cpp
@@ -10,7 +10,7 @@
 #include "kjprefs.h"
 
 // system includes
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqimage.h>
 #include <tqfile.h>
 #include <kdebug.h>
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index 566e291d..b51841a4 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -37,7 +37,7 @@
 #include <noatun/engine.h>
 #include <kaction.h>
 
-static int getPlayStatus( Player *player )
+static int getPlaytqStatus( Player *player )
 {
 	if ( player->isPlaying() )
 		return 1;
@@ -46,7 +46,7 @@ static int getPlayStatus( Player *player )
 	return 0;
 }
 
-static void setPlayStatus( Player *player, int status )
+static void setPlaytqStatus( Player *player, int status )
 {
 	switch( status )
 	{
@@ -114,7 +114,7 @@ void Marquis::saveSessionConfig(KConfig *c)
 		c->writePathEntry("Current Song", TQString());
 
 	c->writeEntry("Current Position", player->getTime());
-	c->writeEntry("PlayStatus", getPlayStatus( player ));
+	c->writeEntry("PlayStatus", getPlaytqStatus( player ));
 
 	// borrowed from Plugin config dialog
 	TQStringList specList;
diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index 732f3c01..89c123a4 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -1,5 +1,5 @@
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klineedit.h>
 #include <tqlabel.h>
 #include <tqptrlist.h>
@@ -37,9 +37,9 @@ Editor::Editor()
     TQHBox *heading = new TQHBox(mMainWidget, "Editor::heading");
     heading->setSpacing(4);
     mFileIcon = new TQLabel(heading);
-    mFileIcon->setAlignment(AlignVCenter | AlignLeft);
+    mFileIcon->tqsetAlignment(AlignVCenter | AlignLeft);
     mFile = new TQLabel(heading);
-    mFile->setAlignment(AlignVCenter | AlignLeft);
+    mFile->tqsetAlignment(AlignVCenter | AlignLeft);
     heading->setStretchFactor(mFile, 2);
     mGrid->addMultiCellWidget(heading, 0, 0, 0, 2);
 
@@ -53,7 +53,7 @@ Editor::Editor()
     connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(save()));
 
     enableButtonSeparator(true);
-    setFixedHeight(sizeHint().height());
+    setFixedHeight(tqsizeHint().height());
 }
 
 void Editor::open(const PlaylistItem & file)
diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp
index 8fde5123..1ec54cbf 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -9,7 +9,7 @@
 
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqregexp.h>
 
 #include <klocale.h>
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index dac87cf2..1fa07fdd 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -27,7 +27,7 @@ Monoscope::Monoscope() : TQWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin()
 	setCaption(i18n("Monoscope"));
 	show();
 	resizeEvent(0);
-	repaint(0,0, TQWidget::width(), height(), false);
+	tqrepaint(0,0, TQWidget::width(), height(), false);
 	resizeEvent(0);
 	setBackgroundColor(mLowColor);
 }
@@ -83,7 +83,7 @@ void Monoscope::scopeEvent(float *d, int size)
 	buffer.fill(mLowColor);
 	TQPainter p(&buffer);
 	p.setPen(mHighColor);
-	repaint(rect());
+	tqrepaint(rect());
 
 	if (line)
 		p.moveTo(0, y);
diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp
index c11083ca..07ff7e15 100644
--- a/noatun/modules/noatunui/userinterface.cpp
+++ b/noatun/modules/noatunui/userinterface.cpp
@@ -14,7 +14,7 @@
 
 #include <tqpushbutton.h>
 #include <tqdragobject.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqobjectlist.h>
 #include <tqobjectdict.h>
@@ -140,7 +140,7 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface()
 	show();
 
 	// What it is now, stay, stay.. roll over, good boy!
-	setFixedSize(minimumSize());
+	setFixedSize(tqminimumSize());
 }
 
 MilkChocolate::~MilkChocolate()
@@ -199,7 +199,7 @@ void MilkChocolate::changeCaption(const TQString& text)
 void MilkChocolate::popup()
 {
 	NoatunStdAction::ContextMenu::showContextMenu(
-			mapToGlobal(mPopup->geometry().bottomLeft())
+			mapToGlobal(mPopup->tqgeometry().bottomLeft())
 		);
 }
 
diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui
index ca13195a..8712ed1a 100644
--- a/noatun/modules/simple/propertiesdialog.ui
+++ b/noatun/modules/simple/propertiesdialog.ui
@@ -51,7 +51,7 @@
                         <property name="name">
                             <cstring>nameField</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>180</width>
                                 <height>0</height>
@@ -82,7 +82,7 @@
                         <property name="name">
                             <cstring>iconLabel</cstring>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignVCenter|AlignLeft</set>
                         </property>
                     </widget>
@@ -109,7 +109,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -142,13 +142,13 @@
                         <property name="name">
                             <cstring>TextLabel2_2</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>25</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>25</width>
                                 <height>32767</height>
@@ -241,13 +241,13 @@
                         <property name="name">
                             <cstring>TextLabel2</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>80</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>80</width>
                                 <height>32767</height>
@@ -305,7 +305,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h
index ef6f14f9..3b7f6834 100644
--- a/noatun/modules/simple/propertiesdialog.ui.h
+++ b/noatun/modules/simple/propertiesdialog.ui.h
@@ -46,7 +46,7 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po )
     // PlaylistItem properties (name and mimetype)
     if (!pi.isNull())
     {
-	setCaption( i18n("Properties for %1").arg(pi.url().fileName()) );
+	setCaption( i18n("Properties for %1").tqarg(pi.url().fileName()) );
 
 	KSharedPtr<KMimeType> mime = KMimeType::mimeType( pi.mimetype() );
 	iconLabel->setPixmap( mime->pixmap( KIcon::Desktop, KIcon::SizeMedium ) );
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index 2661f27c..591335f9 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -74,7 +74,7 @@ SimpleUI::SimpleUI()
 
     napp->player()->handleButtons();
 
-    resize( minimumSize() );
+    resize( tqminimumSize() );
 
     // Show UI and calculate video widget frame
     show();
@@ -173,7 +173,7 @@ void SimpleUI::setupCentralWidget()
     npWidget->setSpacing( 0 );
 
     positionLabel = new TQLabel( statusBar() );
-    positionLabel->setAlignment( AlignVCenter | AlignCenter );
+    positionLabel->tqsetAlignment( AlignVCenter | AlignCenter );
     positionLabel->setFixedSize( fontMetrics().size( 0, " 00:00/00:00 " ) );
     statusBar()->addWidget( positionLabel, 0, true );
 
@@ -238,15 +238,15 @@ void SimpleUI::setupCentralWidget()
 
     volumeLabel = new TQLabel( volumeFrame );
     volumeLabel->setText( "100%" );
-    volumeLabel->setAlignment( AlignCenter );
-    volumeLabel->setFixedSize( volumeLabel->sizeHint() );
+    volumeLabel->tqsetAlignment( AlignCenter );
+    volumeLabel->setFixedSize( volumeLabel->tqsizeHint() );
 
     TQHBox *volumeSubFrame = new TQHBox( volumeFrame );
     volumeSlider = new L33tSlider( 0, 100, 10, 0,Qt::Vertical, volumeSubFrame );
     volumeSlider->setValue( 100 - napp->player()->volume() );
-    volumeSlider->setFixedSize( volumeSlider->sizeHint() );
+    volumeSlider->setFixedSize( volumeSlider->tqsizeHint() );
 
-    volumeFrame->resize( volumeFrame->sizeHint() );
+    volumeFrame->resize( volumeFrame->tqsizeHint() );
 
     connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) );
     connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) );
@@ -254,7 +254,7 @@ void SimpleUI::setupCentralWidget()
 
     setCentralWidget( npWidget );
 
-    video->setMinimumSize( minimumSizeHint().width(), 1 );
+    video->setMinimumSize( tqminimumSizeHint().width(), 1 );
 
     // Create properties dialog
     propertiesDialog = new PropertiesDialog( this );
diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp
index 54b5c7ae..d167e02e 100644
--- a/noatun/modules/splitplaylist/find.cpp
+++ b/noatun/modules/splitplaylist/find.cpp
@@ -1,5 +1,5 @@
 #include "find.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <kcombobox.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
@@ -11,8 +11,8 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C
 	mainWidget->setMinimumWidth(320);
 	setMainWidget(mainWidget);
 
-	TQGridLayout *layout=new TQGridLayout(mainWidget);
-	layout->setSpacing(KDialog::spacingHint());
+	TQGridLayout *tqlayout=new TQGridLayout(mainWidget);
+	tqlayout->setSpacing(KDialog::spacingHint());
 
 	mText=new KHistoryCombo(mainWidget);
 	mText->setMaxCount(10);
@@ -22,9 +22,9 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C
 	mRegexp=new TQCheckBox(i18n("&Regular expression"), mainWidget);
 	mBackwards=new TQCheckBox(i18n("Find &backwards"), mainWidget);
 
-	layout->addMultiCellWidget(mText, 0, 0, 0, 1);
-	layout->addWidget(mRegexp, 1, 0);
-	layout->addWidget(mBackwards, 1, 1);
+	tqlayout->addMultiCellWidget(mText, 0, 0, 0, 1);
+	tqlayout->addWidget(mRegexp, 1, 0);
+	tqlayout->addWidget(mBackwards, 1, 1);
 
 	connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked()));
 
diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp
index a08faa94..787791ac 100644
--- a/noatun/modules/splitplaylist/playlist.cpp
+++ b/noatun/modules/splitplaylist/playlist.cpp
@@ -217,14 +217,14 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC)
 		if (now)
 			now->setPixmap(0, TQPixmap());
 
-		TQRect rect(view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data())));
+		TQRect rect(view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data())));
 		rect.setWidth(view->listView()->viewport()->width());
 		currentItem=i;
-		view->listView()->viewport()->repaint(rect,true);
+		view->listView()->viewport()->tqrepaint(rect,true);
 
 		view->listView()->ensureItemVisible(static_cast<SafeListViewItem*>(current().data()));
-		TQRect currentRect= view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data()));
-		view->listView()->viewport()->repaint(currentRect);
+		TQRect currentRect= view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data()));
+		view->listView()->viewport()->tqrepaint(currentRect);
 
 		now=static_cast<SafeListViewItem*>(current().data());
 		if(now)
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index 504344fe..693b57ce 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -12,10 +12,10 @@
 
 #include <tqdragobject.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqpainter.h>
 
 #include <kaction.h>
@@ -467,7 +467,7 @@ bool View::saveToURL(const KURL &url)
 	}
 	else
 	{
-		KMessageBox::error( this, i18n("Could not write to %1.").arg(url.prettyURL()) );
+		KMessageBox::error( this, i18n("Could not write to %1.").tqarg(url.prettyURL()) );
 		return false;
 	}
 }
diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp
index 58b83f3b..c0e04fd3 100644
--- a/noatun/modules/systray/cmodule.cpp
+++ b/noatun/modules/systray/cmodule.cpp
@@ -35,7 +35,7 @@
 #include <tqcombobox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 
diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp
index a0b545ab..95bbb698 100644
--- a/noatun/modules/systray/kitsystemtray.cpp
+++ b/noatun/modules/systray/kitsystemtray.cpp
@@ -47,7 +47,7 @@
 KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name)
 	: KSystemTray(parent, name)
 {
-	setAlignment(AlignHCenter | AlignVCenter);
+	tqsetAlignment(AlignHCenter | AlignVCenter);
 	menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent);
 	menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0);
 	setAcceptDrops(true);
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 4d008783..c298df37 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -91,7 +91,7 @@ protected:
 
 
 NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
-	mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L)
+	mTray(0), traytqStatus(0), trayBase(0), mPassivePopup(0L)
 {
 	//self = this;
 	hide();
@@ -118,10 +118,10 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(),
 	mTray->show();
 
 	trayBase = renderIcon(BASEICON, TQString());
-	trayStatus = renderIcon(BASEICON, "player_stop");
+	traytqStatus = renderIcon(BASEICON, "player_stop");
 
 	mTray->changeTitle(*trayBase, i18n("Noatun"));
-	showingTrayStatus = false;
+	showingTraytqStatus = false;
 
 	mBlinkTimer = new TQTimer(this);
 	connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer()));
@@ -138,7 +138,7 @@ NoatunSystray::~NoatunSystray()
 	//kdDebug(66666) << k_funcinfo << "Called." << endl;
 	removeCover();
 	delete trayBase;
-	delete trayStatus;
+	delete traytqStatus;
 	napp->showInterfaces();
 }
 
@@ -213,21 +213,21 @@ void NoatunSystray::slotPlayPause()
 	if(!item.isProperty("title"))
 	{
 		// No metadata
-		s = TQString("<nobr>%1</nobr>").arg(item.title());
+		s = TQString("<nobr>%1</nobr>").tqarg(item.title());
 	}
 	else
 	{
-		s = TQString("<h2><nobr>%1</nobr></h2>").arg(item.property("title"));
+		s = TQString("<h2><nobr>%1</nobr></h2>").tqarg(item.property("title"));
 
 		if(item.isProperty("author"))
-			s += TQString("<nobr>%1</nobr><br>").arg(item.property("author"));
+			s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("author"));
 
 		if(item.isProperty("album"))
 		{
 			if(item.isProperty("date"))
-				s += TQString("<nobr>%1 (%2)</nobr><br>").arg(item.property("album")).arg(item.property("date"));
+				s += TQString("<nobr>%1 (%2)</nobr><br>").tqarg(item.property("album")).tqarg(item.property("date"));
 			else
-				s += TQString("<nobr>%1</nobr><br>").arg(item.property("album"));
+				s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("album"));
 		}
 	}
 
@@ -242,11 +242,11 @@ void NoatunSystray::slotPlayPause()
 		setTipText(TQString("<qt><br><table cellspacing=0 cellpadding=0><tr>" \
 			"<td align=center valign=center><h4><nobr>%1</nobr></h4>%2</td>" \
 			"<td valign=center><img src='%3'></td>" \
-			"</qt></tr></table>").arg(status).arg(s).arg(tmpCoverPath));
+			"</qt></tr></table>").tqarg(status).tqarg(s).tqarg(tmpCoverPath));
 	}
 	else
 	{
-		setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").arg(status).arg(s));
+		setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").tqarg(status).tqarg(s));
 	}
 }
 
@@ -256,16 +256,16 @@ void NoatunSystray::slotStopped()
 	if(!napp->player()->current())
 		return;
 	changeTray("player_stop");
-	setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").arg(i18n("Noatun - Stopped")));
+	setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").tqarg(i18n("Noatun - Stopped")));
 }
 
 
 
 void NoatunSystray::changeTray(const TQString &pm)
 {
-	delete trayStatus;
-	trayStatus = renderIcon(BASEICON, pm);
-	if(showingTrayStatus)
+	delete traytqStatus;
+	traytqStatus = renderIcon(BASEICON, pm);
+	if(showingTraytqStatus)
 		slotBlinkTimer();
 }
 
@@ -275,18 +275,18 @@ void NoatunSystray::slotBlinkTimer()
 	switch(YHConfig::self()->stateIconDisplay())
 	{
 		case (YHConfig::FlashingIcon):
-			showingTrayStatus ^= true;
+			showingTraytqStatus ^= true;
 			break;
 		case (YHConfig::StaticIcon):
-			showingTrayStatus = true;
+			showingTraytqStatus = true;
 			break;
 		case (YHConfig::NoIcon):
-			showingTrayStatus = false;
+			showingTraytqStatus = false;
 			break;
 	}
 
-	if(showingTrayStatus)
-		mTray->setPixmap(*trayStatus);
+	if(showingTraytqStatus)
+		mTray->setPixmap(*traytqStatus);
 	else
 		mTray->setPixmap(*trayBase);
 }
diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h
index efab29be..11743a22 100644
--- a/noatun/modules/systray/systray.h
+++ b/noatun/modules/systray/systray.h
@@ -69,11 +69,11 @@ private:
 private:
 	KitSystemTray *mTray;
 	TQTimer *mBlinkTimer;
-	TQPixmap *trayStatus;
+	TQPixmap *traytqStatus;
 	TQPixmap *trayBase;
 	PassivePopup *mPassivePopup;
 
-	bool showingTrayStatus;
+	bool showingTraytqStatus;
 	TQString tipText;
 	TQString tmpCoverPath;
 };
diff --git a/noatun/modules/systray/yhconfigwidget.ui b/noatun/modules/systray/yhconfigwidget.ui
index 02ea0a1c..f63d7319 100644
--- a/noatun/modules/systray/yhconfigwidget.ui
+++ b/noatun/modules/systray/yhconfigwidget.ui
@@ -169,7 +169,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>81</height>
@@ -231,7 +231,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout1</cstring>
+                                    <cstring>tqlayout1</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -299,7 +299,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>
diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp
index 7d772c5b..b90d4b03 100644
--- a/noatun/modules/voiceprint/prefs.cpp
+++ b/noatun/modules/voiceprint/prefs.cpp
@@ -4,7 +4,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kcolorbutton.h>
 #include <kconfig.h>
 
diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp
index 0cfcb264..234aafd0 100644
--- a/noatun/modules/voiceprint/voiceprint.cpp
+++ b/noatun/modules/voiceprint/voiceprint.cpp
@@ -113,12 +113,12 @@ void VoicePrint::scopeEvent(float *data, int bands)
 	// redraw changes with the minimum amount of work
 	if(newOffset != 0)
 	{
-		repaint(mOffset,0,mSegmentWidth*2,height(),false);
+		tqrepaint(mOffset,0,mSegmentWidth*2,height(),false);
 	}
 	else
 	{
-		repaint(mOffset,0,mSegmentWidth,height(),false);
-		repaint(newOffset,0,mSegmentWidth,height(),false);
+		tqrepaint(mOffset,0,mSegmentWidth,height(),false);
+		tqrepaint(newOffset,0,mSegmentWidth,height(),false);
 	}
 	mOffset = newOffset;
 }
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index 5f670953..fb923994 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -30,7 +30,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO)
 
     completePixmap = new TQPixmap();
 
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
     completePixmap->resize(size.width(), size.height());
 
     xGrabbedPos = -1;
@@ -55,7 +55,7 @@ void WaInfo::timeEvent()
         }
 
         if (isVisible())
-            repaint(false);
+            tqrepaint(false);
     }
 }
 
@@ -65,7 +65,7 @@ void WaInfo::scrollerSetup()
     xScrollPos = 0;
     xScrollDirection = 0;
     timer->stop();
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
     if (completePixmap->width() > size.width()) {
 		xScrollDirection = 1;
 		
@@ -79,7 +79,7 @@ void WaInfo::scrollerSetup()
 
 void WaInfo::paintEvent(TQPaintEvent *)
 {
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
 
     if (completePixmap->width() <= size.width()) {
 	bitBlt(this, 0, 0, completePixmap);
@@ -127,7 +127,7 @@ void WaInfo::pixmapChange()
     int x = 0;
     int n=infoString ? strlen(infoString) : 0;
 
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
 
     completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
 
diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp
index 71f2baa2..bb16d118 100644
--- a/noatun/modules/winskin/waLabel.cpp
+++ b/noatun/modules/winskin/waLabel.cpp
@@ -24,7 +24,7 @@ WaLabel::WaLabel(int mapping) : WaWidget(mapping)
 
     completePixmap = new TQPixmap();
 
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
 
     completePixmap->resize(size.width(), size.height());
 }
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index fdf2e768..e4770b7f 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -72,8 +72,8 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
 
     createHighLevelElements();
     createButtons();
-    setMinimumSize(sizeHint());
-    setMaximumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
+    setMaximumSize(tqsizeHint());
 
     KWin::setType(this->winId(), NET::Override);
     setBackgroundMode(NoBackground);
@@ -142,7 +142,7 @@ void WaSkin::loadSkin(TQString newSkinDir)
 {
     waSkinManager->loadSkin(newSkinDir);
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
 
     if (title_shaded) {
         // waSkinModel::load() resets our skin model :(
@@ -154,7 +154,7 @@ void WaSkin::loadSkin(TQString newSkinDir)
     }
 }
 
-TQSize WaSkin::sizeHint() const
+TQSize WaSkin::tqsizeHint() const
 {
     TQRect temp_rect;
 
@@ -305,7 +305,7 @@ void WaSkin::createHighLevelElements()
 
     waInfo = new WaInfo();
 
-    waStatus = new WaStatus();
+    watqStatus = new WatqStatus();
 
     waStereo = new WaIndicator(_WA_MAPPING_MONOSTER_STEREO, _WA_SKIN_MONOSTER_STEREO_TRUE, _WA_SKIN_MONOSTER_STEREO_FALSE);
     waMono = new WaIndicator(_WA_MAPPING_MONOSTER_MONO, _WA_SKIN_MONOSTER_MONO_TRUE, _WA_SKIN_MONOSTER_MONO_FALSE);
@@ -337,7 +337,7 @@ void WaSkin::setChannels(int val)
 void WaSkin::shade() {
     waSkinModel->setSkinModel(WA_MODEL_WINDOWSHADE);
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
     setMask(*windowRegion->mainWindowShadeMask());
 
     title_shaded = true;
@@ -346,7 +346,7 @@ void WaSkin::shade() {
 void WaSkin::unshade() {
     waSkinModel->setSkinModel(WA_MODEL_NORMAL);
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
     setMask(*windowRegion->mainWindowMask());
 
     title_shaded = false;
@@ -558,9 +558,9 @@ void WaSkin::balanceSetValue(int val)
         waInfo->setText(i18n("Balance: Center"));
     }
     else if (val < 0) {
-        waInfo->setText(i18n("Balance: %1% Left").arg(-val));
+        waInfo->setText(i18n("Balance: %1% Left").tqarg(-val));
     } else {
-        waInfo->setText(i18n("Balance: %1% Right").arg(val));
+        waInfo->setText(i18n("Balance: %1% Right").tqarg(val));
    }
 }
 
@@ -672,14 +672,14 @@ void WaSkin::volumeSliderReleased()
 void WaSkin::volumeSetValue(int val)
 {
     if (mVolumePressed)
-        waInfo->setText(i18n("Volume: %1%").arg(val));
+        waInfo->setText(i18n("Volume: %1%").tqarg(val));
 
     napp->player()->setVolume(val);
 }
 
 void WaSkin::slotPlaying()
 {
-    waStatus->setStatus(STATUS_PLAYING);
+    watqStatus->settqStatus(STATUS_PLAYING);
 
     if (!napp->playlist()->current()) {
       return;
@@ -710,7 +710,7 @@ void WaSkin::slotPlaying()
 
 void WaSkin::slotStopped()
 {
-    waStatus->setStatus(STATUS_STOPPED);
+    watqStatus->settqStatus(STATUS_STOPPED);
 
     waDigit->setTime("");
 
@@ -733,7 +733,7 @@ void WaSkin::slotStopped()
 
 void WaSkin::slotPaused()
 {
-    waStatus->setStatus(STATUS_PAUSED);
+    watqStatus->settqStatus(STATUS_PAUSED);
 }
 
 void WaSkin::keyPressEvent(TQKeyEvent *e) {
diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h
index 842a17d7..5c363428 100644
--- a/noatun/modules/winskin/waSkin.h
+++ b/noatun/modules/winskin/waSkin.h
@@ -33,7 +33,7 @@ class WaMain;
 class WaIndicator;
 class WaTitleBar;
 class WaClutterbar;
-class WaStatus;
+class WatqStatus;
 
 class WaJumpSlider;
 class WaVolumeSlider;
@@ -60,7 +60,7 @@ class WaSkin : public TQWidget, public UserInterface {
     void loadSkin(TQString skinDir);
     void setChannels(int val);
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     static TQString defaultSkin();
     static WaSkin *instance() { return _waskin_instance; }
@@ -159,7 +159,7 @@ class WaSkin : public TQWidget, public UserInterface {
     WaLabel *waFreq;
 
     WaInfo *waInfo;
-    WaStatus *waStatus;
+    WatqStatus *watqStatus;
     WaIndicator *waStereo;
     WaIndicator *waMono;
 
diff --git a/noatun/modules/winskin/waSlider.cpp b/noatun/modules/winskin/waSlider.cpp
index 8c97c272..3323e7ee 100644
--- a/noatun/modules/winskin/waSlider.cpp
+++ b/noatun/modules/winskin/waSlider.cpp
@@ -70,7 +70,7 @@ void WaSlider::mouseMoveEvent(TQMouseEvent * e)
     if (newX < 0) 
 	newX = 0;
 
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
 
     int maxX = size.width() - slider_width;
     
@@ -143,7 +143,7 @@ void WaSlider::mouseReleaseEvent(TQMouseEvent *e)
 
 int WaSlider::pixel2Value(int xpos)
 {
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
     int min = abs(minValue);
     int max = abs(maxValue);
 
@@ -158,7 +158,7 @@ int WaSlider::pixel2Value(int xpos)
 
 int WaSlider::value2Pixel(int value)
 {
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
     float min = (float) minValue;
     float max = (float) maxValue;
     float fmin = min;
diff --git a/noatun/modules/winskin/waStatus.cpp b/noatun/modules/winskin/waStatus.cpp
index 861e8677..20f95d92 100644
--- a/noatun/modules/winskin/waStatus.cpp
+++ b/noatun/modules/winskin/waStatus.cpp
@@ -14,16 +14,16 @@
 #include "waStatus.h"
 #include "waSkinModel.h"
 
-WaStatus::WaStatus() : WaWidget(_WA_MAPPING_PLAYPAUS)
+WatqStatus::WatqStatus() : WaWidget(_WA_MAPPING_PLAYPAUS)
 {
     _status = STATUS_STOPPED;
 }
 
-WaStatus::~WaStatus()
+WatqStatus::~WatqStatus()
 {
 }
 
-void WaStatus::paintEvent(TQPaintEvent *)
+void WatqStatus::paintEvent(TQPaintEvent *)
 {
     if (_status == STATUS_PLAYING) {
 	paintPixmap(_WA_SKIN_PLAYPAUS_WORK_INDICATOR);
diff --git a/noatun/modules/winskin/waStatus.h b/noatun/modules/winskin/waStatus.h
index 3508ddca..e028f318 100644
--- a/noatun/modules/winskin/waStatus.h
+++ b/noatun/modules/winskin/waStatus.h
@@ -22,15 +22,15 @@
 
 enum status_enum {STATUS_PLAYING, STATUS_STOPPED, STATUS_PAUSED};
 
-class WaStatus : public WaWidget {
+class WatqStatus : public WaWidget {
     Q_OBJECT
   TQ_OBJECT
 
   public:
-     WaStatus();
-    ~WaStatus();
+     WatqStatus();
+    ~WatqStatus();
 
-    void setStatus(status_enum status) { _status = status; update(); }
+    void settqStatus(status_enum status) { _status = status; update(); }
     status_enum status() const { return _status; }
 
   private:
diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp
index 4a44f252..0b792c7c 100644
--- a/noatun/modules/winskin/waWidget.cpp
+++ b/noatun/modules/winskin/waWidget.cpp
@@ -41,7 +41,7 @@ void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) {
         WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y);
 }
 
-TQSize WaWidget::sizeHint() {
+TQSize WaWidget::tqsizeHint() {
     return WaSkinModel::instance()->getMapGeometry(mapping).size();
 }
 
diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h
index b8b5cb3f..d1fb1d9c 100644
--- a/noatun/modules/winskin/waWidget.h
+++ b/noatun/modules/winskin/waWidget.h
@@ -11,7 +11,7 @@ public:
     WaWidget(int mapping);
     virtual ~WaWidget();
 
-    TQSize sizeHint();
+    TQSize tqsizeHint();
 
     void paintPixmap(int wa_mapping);
     void paintPixmap(int wa_mapping, int number);
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 0ed05dd4..0cfd7f90 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -2,7 +2,7 @@
 
 #include <klocale.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
 #include <kglobal.h>
@@ -29,7 +29,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
 	        "style",
 	        TQT_TQOBJECT(parent))
 {
-    // Make a token horizontal layout box
+    // Make a token horizontal tqlayout box
     vbox = new TQVBoxLayout(this);
     vbox->setSpacing( 6 );
     vbox->setMargin( 0 );
@@ -163,7 +163,7 @@ void WinSkinConfig::remove()
 
     // Ask the user first
     if( KMessageBox::warningContinueCancel( this,
-        i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").arg( skin_list->currentText() ), TQString(), KStdGuiItem::del() )
+        i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").tqarg( skin_list->currentText() ), TQString(), KStdGuiItem::del() )
         == KMessageBox::Continue ) {
 
         mWaSkinManager->removeSkin( skin_list->currentText() );