223 files changed, 446 insertions, 585 deletions

diff --git a/arts/Makefile.am b/arts/Makefile.am
index f98d9c01..43f056d7 100644
--- a/arts/Makefile.am
+++ b/arts/Makefile.am
@@ -6,4 +6,4 @@ SUBDIRS = runtime midi gui modules examples $(ARTS_BUILD_KDE)
 DIST_SUBDIRS = runtime midi gui modules examples builder tools
 
 messages:
-	$(XGETTEXT) modules/*/*.cpp modules/*/*.cc gui/*/*.cpp gui/*/*.cc -o $(podir)/artsmodules.pot
+	$(XGETTEXT) modules/*/*.cpp gui/*/*.cpp -o $(podir)/artsmodules.pot
diff --git a/arts/builder/TODO b/arts/builder/TODO
index 8b962aa5..139f22b2 100644
--- a/arts/builder/TODO
+++ b/arts/builder/TODO
@@ -41,7 +41,7 @@ Wishlist for the artsbuilder app:
   this should be very useful in editing objects with lots of properties
   (widgets)
 
-- make _changed Q_SIGNALS visible so you can connect the value_changed of a
+- make _changed signals visible so you can connect the value_changed of a
   poti to the frequency of a filter
 
 - make it possible to edit parent property of widgets (i.e. to insert one
diff --git a/arts/builder/createtool.cpp b/arts/builder/createtool.cpp
index 2913fdd3..95026884 100644
--- a/arts/builder/createtool.cpp
+++ b/arts/builder/createtool.cpp
@@ -67,7 +67,7 @@ void CreateTool::mousePressEvent(TQMouseEvent *e)
 
 	if(x < 0 || y < 0) return;
 
-	if( e->button() == Qt::LeftButton )
+	if( e->button() == TQt::LeftButton )
 		performCreate(x, y);
 
 	// well, perhaps make this an option
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index fcdce6b8..fec40c03 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -71,10 +71,10 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 	cpuusagelabel->setText(i18n("CPU usage: unknown"));
 
     cpuusagetimer = new TQTimer( this );
-	connect( cpuusagetimer, TQT_SIGNAL(timeout()),
-		this, TQT_SLOT(updateCpuUsage()) );
-	connect( cpuusagetimer, TQT_SIGNAL(timeout()),
-		this, TQT_SLOT(guiServerTick()) );
+	connect( cpuusagetimer, TQ_SIGNAL(timeout()),
+		this, TQ_SLOT(updateCpuUsage()) );
+	connect( cpuusagetimer, TQ_SIGNAL(timeout()),
+		this, TQ_SLOT(guiServerTick()) );
 	cpuusagetimer->start( 2000, false );
 
 	min_size(cpuusagelabel);
@@ -115,15 +115,15 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
 
 	bbox->addStretch(1);
 
 	TQButton *savebutton = bbox->addButton(KStdGuiItem::saveAs());
-	connect( savebutton, TQT_SIGNAL( clicked() ), TQT_SLOT(saveSession() ) );
+	connect( savebutton, TQ_SIGNAL( clicked() ), TQ_SLOT(saveSession() ) );
 
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
-	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
 
 	bbox->layout();
 	//min_size(bbox);
diff --git a/arts/builder/execdlg.h b/arts/builder/execdlg.h
index a4c235be..6a85656d 100644
--- a/arts/builder/execdlg.h
+++ b/arts/builder/execdlg.h
@@ -30,7 +30,7 @@
 #include <tqlayout.h>
 
 class ExecDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	TQTimer *cpuusagetimer;
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 99b8072e..936a0697 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -94,8 +94,8 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 
 	listbox->setMinimumSize(340,400);
 	mainlayout->addWidget(listbox);
-        connect( listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *)), this,
-                 TQT_SLOT(accept()));
+        connect( listbox, TQ_SIGNAL( doubleClicked ( TQListBoxItem *)), this,
+                 TQ_SLOT(accept()));
 // hruler
 
 	mainlayout->addSpacing(5);
@@ -112,14 +112,14 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
-	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
 
 	TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
-	connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+	connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
 
 	bbox->layout();
 	//min_size(bbox);
diff --git a/arts/builder/interfacedlg.h b/arts/builder/interfacedlg.h
index c2ee3341..efb8a9de 100644
--- a/arts/builder/interfacedlg.h
+++ b/arts/builder/interfacedlg.h
@@ -31,7 +31,7 @@
 #include <vector>
 
 class InterfaceDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	TQListBox *listbox;
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 1d7bbce9..bba94fca 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -146,7 +146,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
 	arts_debug("PORT: modulewidget");
 	modulewidget = new ModuleWidget(structure, mainDock, "mwidget");
 	mainDock->setWidget(modulewidget);
-	connect(modulewidget, TQT_SIGNAL(modified(bool)), TQT_SLOT(setModified(bool)));
+	connect(modulewidget, TQ_SIGNAL(modified(bool)), TQ_SLOT(setModified(bool)));
 	arts_debug("PORT: modulewidget ok");
 
 	// allow others to dock to the 4 sides
@@ -167,20 +167,20 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
 							 80);                    // relation target/this (in percent)
 
 	// selection
-	connect(modulewidget,  TQT_SIGNAL(portSelected(ModulePort *)),
-			propertyPanel, TQT_SLOT  (setSelectedPort(ModulePort *)));
-	connect(propertyPanel, TQT_SIGNAL(portSelected(ModulePort *)),
-			modulewidget,  TQT_SLOT  (selectPort(ModulePort *)));
-	connect(modulewidget,  TQT_SIGNAL(componentSelected(StructureComponent *)),
-			propertyPanel, TQT_SLOT  (setSelectedComponent(StructureComponent *)));
+	connect(modulewidget,  TQ_SIGNAL(portSelected(ModulePort *)),
+			propertyPanel, TQ_SLOT  (setSelectedPort(ModulePort *)));
+	connect(propertyPanel, TQ_SIGNAL(portSelected(ModulePort *)),
+			modulewidget,  TQ_SLOT  (selectPort(ModulePort *)));
+	connect(modulewidget,  TQ_SIGNAL(componentSelected(StructureComponent *)),
+			propertyPanel, TQ_SLOT  (setSelectedComponent(StructureComponent *)));
 
 	// connection
-	connect(propertyPanel, TQT_SIGNAL(startConnection(ModulePort *)),
-			modulewidget,  TQT_SLOT  (startConnection(ModulePort *)));
+	connect(propertyPanel, TQ_SIGNAL(startConnection(ModulePort *)),
+			modulewidget,  TQ_SLOT  (startConnection(ModulePort *)));
 
 	// port properties changed
-	connect(propertyPanel, TQT_SIGNAL(portPropertiesChanged(ModulePort *)),
-			modulewidget,  TQT_SLOT  (portPropertiesChanged(ModulePort *)));
+	connect(propertyPanel, TQ_SIGNAL(portPropertiesChanged(ModulePort *)),
+			modulewidget,  TQ_SLOT  (portPropertiesChanged(ModulePort *)));
 
 	arts_debug("PORT: setcanvas");
 	structure->setCanvas(modulewidget);
@@ -251,25 +251,25 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
  */
 
 #if 000
-	connect(menubar, TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(activateMenu(int)));
-	connect(m_view, TQT_SIGNAL(activated(int)), modulewidget, TQT_SLOT(setZoom(int)));
-	connect(m_ports, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addPort(int)));
-	connect(m_file_new, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(fileNew(int)));
+	connect(menubar, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(activateMenu(int)));
+	connect(m_view, TQ_SIGNAL(activated(int)), modulewidget, TQ_SLOT(setZoom(int)));
+	connect(m_ports, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addPort(int)));
+	connect(m_file_new, TQ_SIGNAL(activated(int)), this, TQ_SLOT(fileNew(int)));
 
-	//connect(m_modules, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
+	//connect(m_modules, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
 	/*
-	connect(m_modules_synth, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
-	connect(m_modules_gui, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
-	connect(m_modules_instruments, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
-	connect(m_modules_other, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
+	connect(m_modules_synth, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
+	connect(m_modules_gui, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
+	connect(m_modules_instruments, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
+	connect(m_modules_other, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
 	*/
-	connect(kapp, TQT_SIGNAL(lastWindowClosed()), this , TQT_SLOT(quit()));
+	connect(kapp, TQ_SIGNAL(lastWindowClosed()), this , TQ_SLOT(quit()));
 
 	// update the modules menu once for the start
 #endif
 
 	arts_debug("PORT: activatemenu");
-	connect(menumaker, TQT_SIGNAL(activated(const char *)), TQT_TQOBJECT(this), TQT_SLOT(addModule(const char *)));
+	connect(menumaker, TQ_SIGNAL(activated(const char *)), this, TQ_SLOT(addModule(const char *)));
 	fillModuleMenu();
 	arts_debug("PORT: activatemenu ok");
 	setupActions();
@@ -279,7 +279,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
 	// connect to aboutToShow to correctly show state of dockwidget there:
 	TQPopupMenu *viewmenu = (TQPopupMenu*)factory()->container("view", this);
 	if (viewmenu)
-		connect(viewmenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(viewMenuAboutToShow()));
+		connect(viewmenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(viewMenuAboutToShow()));
 	else
 		arts_debug("view menu not found!");
 
@@ -292,55 +292,55 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
 void ArtsBuilderWindow::setupActions()
 {
 	// File menu
-	KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
+	KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
 
-	(void)new TDEAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()),
+	(void)new TDEAction(i18n("Open Session..."), 0, this, TQ_SLOT(openSession()),
 					  actionCollection(), "file_open_session");
-	KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
-	(void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()),
+	KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+	(void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, this, TQ_SLOT(openExample()),
 					  actionCollection(), "file_open_example");
-	KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
-	KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
-	(void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()),
+	KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+	KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
+	(void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, this, TQ_SLOT(retrieve()),
 					  actionCollection(), "file_retrieve_from_server");
-	(void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(execute()),
+	(void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, this, TQ_SLOT(execute()),
 					  actionCollection(), "file_execute_structure");
-	(void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(rename()),
+	(void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, this, TQ_SLOT(rename()),
 					  actionCollection(), "file_rename_structure");
-	(void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(publish()),
+	(void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, this, TQ_SLOT(publish()),
 					  actionCollection(), "file_publish_structure");
-	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+	KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
 
 	// Edit menu
-	(void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()),
+	(void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, modulewidget, TQ_SLOT(delModule()),
 					  actionCollection(), "edit_delete");
-	KStdAction::selectAll(TQT_TQOBJECT(modulewidget), TQT_SLOT(selectAll()), actionCollection());
+	KStdAction::selectAll(modulewidget, TQ_SLOT(selectAll()), actionCollection());
 
 	// View menu
 	viewPropertiesAction= new TDEToggleAction(i18n("&Property Panel"), 0,
-											TQT_TQOBJECT(propertyDock), TQT_SLOT(changeHideShowState()),
+											propertyDock, TQ_SLOT(changeHideShowState()),
 											actionCollection(), "view_properties");
-	(void)new TDEAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()),
+	(void)new TDEAction(i18n("200%"), 0, this, TQ_SLOT(viewAt200()),
 					  actionCollection(), "view_200");
-	(void)new TDEAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()),
+	(void)new TDEAction(i18n("150%"), 0, this, TQ_SLOT(viewAt150()),
 					  actionCollection(), "view_150");
-	(void)new TDEAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()),
+	(void)new TDEAction(i18n("100%"), 0, this, TQ_SLOT(viewAt100()),
 					  actionCollection(), "view_100");
-	(void)new TDEAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()),
+	(void)new TDEAction(i18n("50%"), 0, this, TQ_SLOT(viewAt50()),
 					  actionCollection(), "view_50");
 
 	// Ports menu
-	(void)new TDEAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()),
+	(void)new TDEAction(i18n("Create IN Audio Signal"), 0, this, TQ_SLOT(createInAudioSignal()),
 					  actionCollection(), "ports_create_in_audio_signal");
-	(void)new TDEAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()),
+	(void)new TDEAction(i18n("Create OUT Audio Signal"), 0, this, TQ_SLOT(createOutAudioSignal()),
 					  actionCollection(), "ports_create_out_audio_signal");
-	(void)new TDEAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()),
+	(void)new TDEAction(i18n("Create IN String Property"), 0, this, TQ_SLOT(createInStringProperty()),
 					  actionCollection(), "ports_create_in_string_property");
-	(void)new TDEAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()),
+	(void)new TDEAction(i18n("Create IN Audio Property"), 0, this, TQ_SLOT(createInAudioProperty()),
 					  actionCollection(), "ports_create_in_audio_property");
-	(void)new TDEAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()),
+	(void)new TDEAction(i18n("Implement Interface..."), 0, this, TQ_SLOT(addInterface()),
 					  actionCollection(), "ports_implement_interface");
-	(void)new TDEAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()),
+	(void)new TDEAction(i18n("Change Positions/Names..."), 0, this, TQ_SLOT(changePortPositions()),
 					  actionCollection(), "ports_change_positions");
 }
 
@@ -532,7 +532,7 @@ void ArtsBuilderWindow::openSession()
 		execDlg->start();
 		execDlg->show();
 
-		connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute()));
+		connect(execDlg, TQ_SIGNAL(ready()), this, TQ_SLOT(endexecute()));
 
 		hide();
 		// m_filename = filename; FIXME: DOESN'T THIS BELONG HERE?
@@ -674,7 +674,7 @@ void ArtsBuilderWindow::execute()
 		execDlg->start();
 		execDlg->show();
 
-		connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute()));
+		connect(execDlg, TQ_SIGNAL(ready()), this, TQ_SLOT(endexecute()));
 
 		hide();
 	}
diff --git a/arts/builder/main.h b/arts/builder/main.h
index 74408022..135e3bc4 100644
--- a/arts/builder/main.h
+++ b/arts/builder/main.h
@@ -39,7 +39,7 @@ class TDEToggleAction;
 
 class ArtsBuilderWindow: public KDockMainWindow
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 protected:
diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp
index 8045091b..33784652 100644
--- a/arts/builder/menumaker.cpp
+++ b/arts/builder/menumaker.cpp
@@ -10,7 +10,7 @@ MenuEntry::MenuEntry(MenuMaker *menumaker, TDEActionMenu *parent, const char *te
 {
 	action = new TDEAction(TQString::fromLocal8Bit(text));
 	parent->insert(action);
-	connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated()));
+	connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(activated()));
 }
 
 void MenuEntry::activated()
@@ -93,7 +93,7 @@ void MenuMaker::addCategory(const TQString& name, const char *prefix)
 		TDEActionMenu *newMenu = new TDEActionMenu(catname(name));
 		pc->menu()->insert(newMenu);
 		/* 000 */
-		/*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int)));
+		/*connect(newMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(menuactivated(int)));
 		pc->menu()->insertItem(catname(name).c_str(), newMenu, CAT_MAGIC_ID);*/
 		arts_debug("inserting a menu called '%s' in the parent menu '%s'",
 			catname(name).local8Bit().data(),pc->name().local8Bit().data());
diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h
index fa3c0c20..655a0764 100644
--- a/arts/builder/menumaker.h
+++ b/arts/builder/menumaker.h
@@ -10,7 +10,7 @@ class MenuMaker;
 
 class MenuEntry : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 protected:
@@ -46,7 +46,7 @@ public:
 
 class MenuMaker :public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 	std::list<MenuCategory *> categories;
diff --git a/arts/builder/module.cpp b/arts/builder/module.cpp
index e11da759..7d5aa58d 100644
--- a/arts/builder/module.cpp
+++ b/arts/builder/module.cpp
@@ -435,5 +435,3 @@ TQString Module::name()
 {
 	return _name;
 }
-
-// vim: sw=4 ts=4 noet
diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp
index 38a362e7..e1b08ebf 100644
--- a/arts/builder/mwidget.cpp
+++ b/arts/builder/mwidget.cpp
@@ -133,7 +133,7 @@ void ModuleWidget::mousePressEvent( TQMouseEvent *e )
 		return;
 	}
 
-	if( e->button() == Qt::LeftButton )
+	if( e->button() == TQt::LeftButton )
 	{
 		StructureComponent *component;
 		ModulePort *port;
@@ -627,7 +627,7 @@ ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *n
 	setTableFlags(Tbl_autoScrollBars);
 	setZoom(100);
 
-	setFocusPolicy( TQ_NoFocus );
+	setFocusPolicy( TQWidget::NoFocus );
 
 	arts_debug("PORT: mw; bgmode");
 	setBackgroundMode(NoBackground);
@@ -637,8 +637,8 @@ ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *n
 
 	arts_debug("PORT: mw; new ar ok - qtimer");
     TQTimer *timer = new TQTimer( this );
-	connect( timer, TQT_SIGNAL(timeout()),
-		this, TQT_SLOT(autoRedrawRouter()) );
+	connect( timer, TQ_SIGNAL(timeout()),
+		this, TQ_SLOT(autoRedrawRouter()) );
 
 	arts_debug("PORT: mw; tstart");
 	timer->start( 100, FALSE );                 // 100 ms reoccurring check
diff --git a/arts/builder/mwidget.h b/arts/builder/mwidget.h
index 38d6999d..11fe76c0 100644
--- a/arts/builder/mwidget.h
+++ b/arts/builder/mwidget.h
@@ -33,7 +33,7 @@ class MWidgetTool;
 
 class ModuleWidget :public QtTableView, public StructureCanvas
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	friend class MWidgetTool;
 	friend class CreateTool;
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 2bf9dbe4..246f972c 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -111,27 +111,27 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TDEIconLoader iconloader;
 	TQButton *raise = bbox->addButton(i18n("&Raise"));
 	raise->setPixmap(iconloader.loadIcon("go-up", TDEIcon::Small));
-	connect( raise, TQT_SIGNAL( clicked() ), TQT_SLOT( raise() ));
+	connect( raise, TQ_SIGNAL( clicked() ), TQ_SLOT( raise() ));
 
 	TQButton *lower = bbox->addButton(i18n("&Lower"));
 	lower->setPixmap(iconloader.loadIcon("go-down", TDEIcon::Small));
-	connect( lower, TQT_SIGNAL( clicked() ), TQT_SLOT( lower() ));
+	connect( lower, TQ_SIGNAL( clicked() ), TQ_SLOT( lower() ));
 
 	TQButton *rename = bbox->addButton(i18n("R&ename..."));
-	connect( rename, TQT_SIGNAL( clicked() ), TQT_SLOT( rename() ));
+	connect( rename, TQ_SIGNAL( clicked() ), TQ_SLOT( rename() ));
 
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
-	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
 
 /*
 	TQButton *cancelbutton = bbox->addButton(i18n("Cancel"));
-	connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+	connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
 */
 	bbox->layout();
 	//min_size(bbox);
diff --git a/arts/builder/portposdlg.h b/arts/builder/portposdlg.h
index b8714538..ba5ba8f9 100644
--- a/arts/builder/portposdlg.h
+++ b/arts/builder/portposdlg.h
@@ -31,7 +31,7 @@
 #include <vector>
 
 class PortPosDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	Structure *structure;
diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp
index 25809100..209fe7e4 100644
--- a/arts/builder/propertypanel.cpp
+++ b/arts/builder/propertypanel.cpp
@@ -43,20 +43,20 @@ PropertyPanel::PropertyPanel( TQWidget* parent, const char* name, WFlags fl )
 {
 	setTitleFont();
 	setTitleColors();
-	connect( kapp, TQT_SIGNAL( tdedisplayFontChanged() ),
-			 this, TQT_SLOT( setTitleFont() ));
-	connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ),
-			 this, TQT_SLOT( setTitleColors() ));
-	connect( portValueGroup, TQT_SIGNAL( clicked(int) ),
-			 this, TQT_SLOT( pvModeChanged(int) ));
-	connect( constantValueEdit, TQT_SIGNAL( returnPressed() ),
-			 this, TQT_SLOT( writePortProperties() ));
-	connect( constantValueComboBox, TQT_SIGNAL( activated(int) ),
-			 this, TQT_SLOT( writePortProperties() ));
-	connect( portCombo, TQT_SIGNAL( activated(int) ),
-			 this, TQT_SLOT( comboPortSelected(int) ));
-	connect( connectButton, TQT_SIGNAL( clicked() ),
-			 this, TQT_SLOT( connectButtonClicked() ));
+	connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ),
+			 this, TQ_SLOT( setTitleFont() ));
+	connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ),
+			 this, TQ_SLOT( setTitleColors() ));
+	connect( portValueGroup, TQ_SIGNAL( clicked(int) ),
+			 this, TQ_SLOT( pvModeChanged(int) ));
+	connect( constantValueEdit, TQ_SIGNAL( returnPressed() ),
+			 this, TQ_SLOT( writePortProperties() ));
+	connect( constantValueComboBox, TQ_SIGNAL( activated(int) ),
+			 this, TQ_SLOT( writePortProperties() ));
+	connect( portCombo, TQ_SIGNAL( activated(int) ),
+			 this, TQ_SLOT( comboPortSelected(int) ));
+	connect( connectButton, TQ_SIGNAL( clicked() ),
+			 this, TQ_SLOT( connectButtonClicked() ));
 
 	constantValueComboBox->hide();
 	setEnabled( false );
@@ -341,7 +341,7 @@ bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e )
 {
 	if( port && !constantValueEdit->hasFocus() && (e->type() == TQEvent::KeyPress) ) {
 //		kdDebug() << TQString("  ..is KeyPress") << endl;
-		TQString entered = TQT_TQKEYEVENT(e)->text();
+		TQString entered = static_cast<TQKeyEvent*>(e)->text();
 		bool goodString = entered.length() > 0;
 
 //		kdDebug() << TQString("pressed '%1'").arg(entered) << endl;
diff --git a/arts/builder/propertypanel.h b/arts/builder/propertypanel.h
index 9b74b275..af156fda 100644
--- a/arts/builder/propertypanel.h
+++ b/arts/builder/propertypanel.h
@@ -32,7 +32,7 @@ class ModulePort;
 
 class PropertyPanel: public PropertyPanelBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	
 public:
diff --git a/arts/builder/propertypanelbase.ui b/arts/builder/propertypanelbase.ui
index 0ff20382..875f6813 100644
--- a/arts/builder/propertypanelbase.ui
+++ b/arts/builder/propertypanelbase.ui
@@ -355,8 +355,8 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected">setTitleFont()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp
index c8f8d9d3..36236fe3 100644
--- a/arts/builder/qttableview.cpp
+++ b/arts/builder/qttableview.cpp
@@ -1391,7 +1391,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 	TQRect r = viewR;
 	r.setLeft( xPos );
 	r.setBottom( yPos<maxY?yPos:maxY );
-	if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) )
+	if ( inherits( "TQMultiLineEdit" ) )
 	    paint.fillRect( r.intersect( updateR ), g.base() );
 	else
 	    paint.eraseRect( r.intersect( updateR ) );
@@ -1399,7 +1399,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
     if ( yPos <= maxY ) {
 	TQRect r = viewR;
 	r.setTop( yPos );
-	if ( inherits( TQMULTILINEEDIT_OBJECT_NAME_STRING ) )
+	if ( inherits( "TQMultiLineEdit" ) )
 	    paint.fillRect( r.intersect( updateR ), g.base() );
 	else
 	    paint.eraseRect( r.intersect( updateR ) );
@@ -1439,20 +1439,20 @@ TQScrollBar *QtTableView::verticalScrollBar() const
 {
     QtTableView *that = (QtTableView*)this; // semantic const
     if ( !vScrollBar ) {
-	TQScrollBar *sb = new TQScrollBar( Qt::Vertical, that );
+	TQScrollBar *sb = new TQScrollBar( TQt::Vertical, that );
 #ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
         sb->resize( sb->sizeHint() ); // height is irrelevant
 	TQ_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
-	sb->setFocusPolicy( TQ_NoFocus );
-	connect( sb, TQT_SIGNAL(valueChanged(int)),
-		 TQT_SLOT(verSbValue(int)));
-	connect( sb, TQT_SIGNAL(sliderMoved(int)),
-		 TQT_SLOT(verSbSliding(int)));
-	connect( sb, TQT_SIGNAL(sliderReleased()),
-		 TQT_SLOT(verSbSlidingDone()));
+	sb->setFocusPolicy( TQWidget::NoFocus );
+	connect( sb, TQ_SIGNAL(valueChanged(int)),
+		 TQ_SLOT(verSbValue(int)));
+	connect( sb, TQ_SIGNAL(sliderMoved(int)),
+		 TQ_SLOT(verSbSliding(int)));
+	connect( sb, TQ_SIGNAL(sliderReleased()),
+		 TQ_SLOT(verSbSlidingDone()));
 	sb->hide();
 	that->vScrollBar = sb;
 	return sb;
@@ -1470,20 +1470,20 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
 {
     QtTableView *that = (QtTableView*)this; // semantic const
     if ( !hScrollBar ) {
-	TQScrollBar *sb = new TQScrollBar( Qt::Horizontal, that );
+	TQScrollBar *sb = new TQScrollBar( TQt::Horizontal, that );
 #ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
 	sb->resize( sb->sizeHint() ); // width is irrelevant
-	sb->setFocusPolicy( TQ_NoFocus );
+	sb->setFocusPolicy( TQWidget::NoFocus );
 	TQ_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
-	connect( sb, TQT_SIGNAL(valueChanged(int)),
-		 TQT_SLOT(horSbValue(int)));
-	connect( sb, TQT_SIGNAL(sliderMoved(int)),
-		 TQT_SLOT(horSbSliding(int)));
-	connect( sb, TQT_SIGNAL(sliderReleased()),
-		 TQT_SLOT(horSbSlidingDone()));
+	connect( sb, TQ_SIGNAL(valueChanged(int)),
+		 TQ_SLOT(horSbValue(int)));
+	connect( sb, TQ_SIGNAL(sliderMoved(int)),
+		 TQ_SLOT(horSbSliding(int)));
+	connect( sb, TQ_SIGNAL(sliderReleased()),
+		 TQ_SLOT(horSbSlidingDone()));
 	sb->hide();
 	that->hScrollBar = sb;
 	return sb;
diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h
index 8a8cbe3d..9a944432 100644
--- a/arts/builder/qttableview.h
+++ b/arts/builder/qttableview.h
@@ -25,7 +25,7 @@ class TQCornerSquare;
 
 class QtTableView : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     virtual void setBackgroundColor( const TQColor & );
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index c95d40ad..9f6e4107 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -104,14 +104,14 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
-	connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+	connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
 
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
-	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
 
 	bbox->layout();
 
diff --git a/arts/builder/retrievedlg.h b/arts/builder/retrievedlg.h
index 485298f0..065efe93 100644
--- a/arts/builder/retrievedlg.h
+++ b/arts/builder/retrievedlg.h
@@ -34,7 +34,7 @@
 #include <string>
 
 class RetrieveDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 	TQListBox *listbox;
 public:
diff --git a/arts/examples/README b/arts/examples/README
index 425da5c0..2132bfc3 100644
--- a/arts/examples/README
+++ b/arts/examples/README
@@ -172,7 +172,7 @@ example_xfade.arts
 
 This example mixes 440 and 880 Hz sine waves using a cross fader.
 Adjust the value of the cross fader's percentage input from -1 to 1 to
-control the mixing of the two Q_SIGNALS.
+control the mixing of the two signals.
 
 example_pscale.arts
 
diff --git a/arts/gui/common/CMakeLists.txt b/arts/gui/common/CMakeLists.txt
index 6fa63e44..030e3c65 100644
--- a/arts/gui/common/CMakeLists.txt
+++ b/arts/gui/common/CMakeLists.txt
@@ -27,14 +27,14 @@ link_directories(
 ##### artsgui (library) #########################
 
 tde_add_library( artsgui_idl SHARED
-  SOURCES artsgui.cc
+  SOURCES artsgui.cpp
   VERSION 0.0.0
   LINK mcop ${DL_LIBRARIES} ${ARTS_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 tde_add_library( artsgui SHARED
-  SOURCES genericguifactory_impl.cc
+  SOURCES genericguifactory_impl.cpp
   VERSION 0.0.0
   LINK artsgui_idl-shared
   DESTINATION ${LIB_INSTALL_DIR}
@@ -42,7 +42,7 @@ tde_add_library( artsgui SHARED
 
 add_custom_command(
   OUTPUT
-    artsgui.cc artsgui.h
+    artsgui.cpp artsgui.h
     artsgui.mcoptype artsgui.mcopclass
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artsgui.idl
diff --git a/arts/gui/common/Makefile.am b/arts/gui/common/Makefile.am
index 9d82449f..3368a235 100644
--- a/arts/gui/common/Makefile.am
+++ b/arts/gui/common/Makefile.am
@@ -2,23 +2,23 @@ lib_LTLIBRARIES = libartsgui_idl.la libartsgui.la
 
 INCLUDES= -I$(arts_includes) -I$(top_builddir)/arts/runtime $(all_includes)
 
-libartsgui_idl_la_SOURCES = artsgui.cc
+libartsgui_idl_la_SOURCES = artsgui.cpp
 libartsgui_idl_la_LIBADD = -lmcop $(LIBDL)
 libartsgui_idl_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
   -no-undefined
 
-libartsgui_la_SOURCES = genericguifactory_impl.cc
+libartsgui_la_SOURCES = genericguifactory_impl.cpp
 libartsgui_la_LIBADD = libartsgui_idl.la
 libartsgui_la_LDFLAGS = $(all_libraries) -no-undefined
 libartsgui_la_COMPILE_FIRST = artsgui.h
 
-artsgui.cc artsgui.h: $(srcdir)/artsgui.idl $(MCOPIDL)
+artsgui.cpp artsgui.h: $(srcdir)/artsgui.idl $(MCOPIDL)
 	$(MCOPIDL) -t -I$(includedir)/arts $(srcdir)/artsgui.idl
 
 artsgui.mcoptype: artsgui.h
 artsgui.mcopclass: artsgui.h
 
-DISTCLEANFILES = artsgui.cc artsgui.h \
+DISTCLEANFILES = artsgui.cpp artsgui.h \
   artsgui.mcoptype artsgui.mcopclass
 
 ####### install idl files
diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl
index a9a3950a..76b6a8c5 100644
--- a/arts/gui/common/artsgui.idl
+++ b/arts/gui/common/artsgui.idl
@@ -23,7 +23,7 @@
     */
 
 /*
- * DISCLAIMER: The interfaces in artsgui.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in artsgui.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
@@ -392,5 +392,3 @@ module Arts {
 	interface GenericGuiFactory : GuiFactory {
 	};
 };
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/common/genericguifactory_impl.cc b/arts/gui/common/genericguifactory_impl.cpp
index 163d7e21..163d7e21 100644
--- a/arts/gui/common/genericguifactory_impl.cc
+++ b/arts/gui/common/genericguifactory_impl.cpp
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp
index e1933b17..57a03730 100644
--- a/arts/gui/kde/dbtest.cpp
+++ b/arts/gui/kde/dbtest.cpp
@@ -12,7 +12,7 @@
 
 dBTestWidget::dBTestWidget( TQWidget* p, const char* n ) : TQWidget( p,n ), dB2VolCalc( -24,6 ) {
 kdDebug() << k_funcinfo << endl;
-	( void* ) KStdAction::quit( this, TQT_SLOT( close() ), new TDEActionCollection( this ) );
+	( void* ) KStdAction::quit( this, TQ_SLOT( close() ), new TDEActionCollection( this ) );
 
 	for ( float i=0; i<=1; i+=0.25 )
 		kdDebug() << i << " : " << amptodb( i ) << "dB" <<endl;
diff --git a/arts/gui/kde/dbtest.h b/arts/gui/kde/dbtest.h
index b78facd9..041cdff2 100644
--- a/arts/gui/kde/dbtest.h
+++ b/arts/gui/kde/dbtest.h
@@ -7,7 +7,7 @@
 #include "dbvolcalc.h"
 
 class dBTestWidget : public TQWidget, public dB2VolCalc {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	dBTestWidget( TQWidget*, const char* =0 );
diff --git a/arts/gui/kde/dbvolcalc.h b/arts/gui/kde/dbvolcalc.h
index a8ab0cf5..7fbe3323 100644
--- a/arts/gui/kde/dbvolcalc.h
+++ b/arts/gui/kde/dbvolcalc.h
@@ -79,4 +79,3 @@ public:
 };
 
 #endif
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp
index 34c5791b..dfe4678f 100644
--- a/arts/gui/kde/kbutton_impl.cpp
+++ b/arts/gui/kde/kbutton_impl.cpp
@@ -33,10 +33,10 @@ KButtonMapper::KButtonMapper( KButton_impl *_impl, TQPushButton *but )
 	, impl( _impl )
 	, button( but )
 {
-	connect( but, TQT_SIGNAL( pressed() ), this, TQT_SLOT( pressed() ) );
-	connect( but, TQT_SIGNAL( released() ), this, TQT_SLOT( released() ) );
-	connect( but, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggled( bool ) ) );
-	connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
+	connect( but, TQ_SIGNAL( pressed() ), this, TQ_SLOT( pressed() ) );
+	connect( but, TQ_SIGNAL( released() ), this, TQ_SLOT( released() ) );
+	connect( but, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggled( bool ) ) );
+	connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
 }
 
 void KButtonMapper::pressed()
@@ -131,5 +131,3 @@ void KButton_impl::changeState(bool newState)
 }
 
 REGISTER_IMPLEMENTATION(KButton_impl);
-
-// vim:sw=4:ts=4
diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h
index 7eeef594..22c4cf81 100644
--- a/arts/gui/kde/kbutton_impl.h
+++ b/arts/gui/kde/kbutton_impl.h
@@ -31,7 +31,7 @@
 namespace Arts {
 class KButton_impl;
 class KButtonMapper : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KButton_impl *impl;
 	TQPushButton * button;
@@ -73,5 +73,3 @@ public:
 
 }
 #endif //ARTS_GUI_KBUTTON_IMPL_H
-
-// vim:sw=4:ts=4
diff --git a/arts/gui/kde/kcombobox_impl.cpp b/arts/gui/kde/kcombobox_impl.cpp
index 58c401ce..fced3445 100644
--- a/arts/gui/kde/kcombobox_impl.cpp
+++ b/arts/gui/kde/kcombobox_impl.cpp
@@ -34,7 +34,7 @@ ComboBoxIntMapper::ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co)
 	: TQObject( co, "map TQt signal to aRts" )
 	,impl(impl)
 {
-	connect(co, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(activated(const TQString &)));
+	connect(co, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(activated(const TQString &)));
 }
 
 void ComboBoxIntMapper::activated(const TQString & newValue)
@@ -101,5 +101,3 @@ void KComboBox_impl::value(const string & newValue)
 }
 
 REGISTER_IMPLEMENTATION(KComboBox_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h
index 1c7fc51c..e1b533ad 100644
--- a/arts/gui/kde/kcombobox_impl.h
+++ b/arts/gui/kde/kcombobox_impl.h
@@ -35,7 +35,7 @@ namespace Arts {
 
 class KComboBox_impl;
 class ComboBoxIntMapper :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KComboBox_impl *impl;
 public:
@@ -71,5 +71,3 @@ public:
 
 }
 #endif /* ARTS_GUI_KCOMBOBOX_IMPL_H */
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kfader.cpp b/arts/gui/kde/kfader.cpp
index e5179f9f..499d509c 100644
--- a/arts/gui/kde/kfader.cpp
+++ b/arts/gui/kde/kfader.cpp
@@ -6,13 +6,13 @@ void KFader::init()
 }
 
 KFader::KFader( TQWidget * parent, const char * name )
-	: TQSlider( Qt::Vertical, parent, name )
+	: TQSlider( TQt::Vertical, parent, name )
 {
 	init();
 }
 
 KFader::KFader( int minValue, int maxValue, int pageStep, int value, TQWidget * parent, const char * name )
-	: TQSlider( minValue, maxValue, pageStep, value, Qt::Vertical, parent, name )
+	: TQSlider( minValue, maxValue, pageStep, value, TQt::Vertical, parent, name )
 {
 	init();
 }
diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h
index 91a1424f..84e4d371 100644
--- a/arts/gui/kde/kfader.h
+++ b/arts/gui/kde/kfader.h
@@ -27,7 +27,7 @@
 
 class KFader : public TQSlider
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	protected:
 		void init();
@@ -43,5 +43,3 @@ class KFader : public TQSlider
 };
 
 #endif /* KFADER_H */
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kfader_impl.cpp b/arts/gui/kde/kfader_impl.cpp
index 27a50191..b667056d 100644
--- a/arts/gui/kde/kfader_impl.cpp
+++ b/arts/gui/kde/kfader_impl.cpp
@@ -34,7 +34,7 @@ using namespace std;
 
 FaderIntMapper::FaderIntMapper(KFader_impl *impl, KFader *kp) :impl(impl)
 {
-	connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
+	connect(kp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int)));
 }
 
 void FaderIntMapper::valueChanged(int pos)
@@ -202,5 +202,3 @@ float KFader_impl::logarithmic()
 }
 
 REGISTER_IMPLEMENTATION(KFader_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h
index 87dfa19f..5dd03f2a 100644
--- a/arts/gui/kde/kfader_impl.h
+++ b/arts/gui/kde/kfader_impl.h
@@ -36,7 +36,7 @@ namespace Arts {
 class KFader_impl;
 
 class FaderIntMapper :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KFader_impl *impl;
 public:
@@ -89,5 +89,3 @@ public:
 
 }
 #endif /* ARTS_GUI_KFADER_IMPL_H */
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kframe_impl.cpp b/arts/gui/kde/kframe_impl.cpp
index d95da549..0b23551e 100644
--- a/arts/gui/kde/kframe_impl.cpp
+++ b/arts/gui/kde/kframe_impl.cpp
@@ -94,5 +94,3 @@ void KFrame_impl::frameshadow( Shadow fs )
 }
 
 REGISTER_IMPLEMENTATION(KFrame_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h
index 656b9aa1..60d0be6b 100644
--- a/arts/gui/kde/kframe_impl.h
+++ b/arts/gui/kde/kframe_impl.h
@@ -50,6 +50,4 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
 		void frameshadow( Shadow fs );
 }; //class
 } //namespace
-
-// vim: sw=4 ts=4
 #endif
diff --git a/arts/gui/kde/kgraph.cpp b/arts/gui/kde/kgraph.cpp
index 1218e9a0..70f173ec 100644
--- a/arts/gui/kde/kgraph.cpp
+++ b/arts/gui/kde/kgraph.cpp
@@ -111,7 +111,7 @@ void KGraph::paintEvent( TQPaintEvent *e )
 
 void KGraph::mousePressEvent(TQMouseEvent *e)
 {
-	if(e->button() == Qt::LeftButton || e->button() == Qt::RightButton)
+	if(e->button() == TQt::LeftButton || e->button() == TQt::RightButton)
 	{
 		std::list<KGraphLine_impl *>::iterator li;
 		for(li = lines.begin(); li != lines.end(); li++)
@@ -140,7 +140,7 @@ void KGraph::mousePressEvent(TQMouseEvent *e)
 	if(selectedIndex >= 0)
 	{
 		// erase point
-		if(e->button() == Qt::RightButton)
+		if(e->button() == TQt::RightButton)
 		{
 			if(selectedIndex != 0 && selectedIndex != (( int )( selectedLine->_points.size() )-1))
 			{
@@ -159,7 +159,7 @@ void KGraph::mousePressEvent(TQMouseEvent *e)
 			selectedIndex = -1;
 		}
 	}
-	else if(e->button() == Qt::LeftButton)
+	else if(e->button() == TQt::LeftButton)
 	{
 		// try to insert a point
 		std::list<KGraphLine_impl *>::iterator li;
@@ -262,5 +262,3 @@ void KGraph::mouseReleaseEvent(TQMouseEvent *)
 	selectedIndex = -1;
 	selectedLine = 0;
 }
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h
index 2bb64398..6da8247e 100644
--- a/arts/gui/kde/kgraph.h
+++ b/arts/gui/kde/kgraph.h
@@ -33,7 +33,7 @@ namespace Arts {
 class KGraphLine_impl;
 class KGraph : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 protected:
diff --git a/arts/gui/kde/kgraph_impl.cpp b/arts/gui/kde/kgraph_impl.cpp
index 85ad72ad..c6b2a78f 100644
--- a/arts/gui/kde/kgraph_impl.cpp
+++ b/arts/gui/kde/kgraph_impl.cpp
@@ -88,5 +88,3 @@ void KGraph_impl::maxy(float newMax)
 }
 
 namespace Arts { REGISTER_IMPLEMENTATION(KGraph_impl); }
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kgraph_impl.h b/arts/gui/kde/kgraph_impl.h
index 408ad961..61ca3f2b 100644
--- a/arts/gui/kde/kgraph_impl.h
+++ b/arts/gui/kde/kgraph_impl.h
@@ -61,5 +61,3 @@ public:
 
 }
 #endif /* ARTS_GUI_KGRAPH_IMPL_H */
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/khbox_impl.cpp b/arts/gui/kde/khbox_impl.cpp
index 431ce286..d2a51776 100644
--- a/arts/gui/kde/khbox_impl.cpp
+++ b/arts/gui/kde/khbox_impl.cpp
@@ -47,5 +47,3 @@ void KHBox_impl::spacing( long s )
 }
 
 REGISTER_IMPLEMENTATION(KHBox_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/khbox_impl.h b/arts/gui/kde/khbox_impl.h
index d46e47f3..df35bf36 100644
--- a/arts/gui/kde/khbox_impl.h
+++ b/arts/gui/kde/khbox_impl.h
@@ -44,5 +44,3 @@ public:
 };
 
 }
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klabel_impl.cpp b/arts/gui/kde/klabel_impl.cpp
index dd0a9557..045feb59 100644
--- a/arts/gui/kde/klabel_impl.cpp
+++ b/arts/gui/kde/klabel_impl.cpp
@@ -100,5 +100,3 @@ void RotateLabel::bottom( Arts::TextBottom bottom ) {
 	title( _title );
 	repaint();
 }
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h
index 9d48a195..b27a4365 100644
--- a/arts/gui/kde/klabel_impl.h
+++ b/arts/gui/kde/klabel_impl.h
@@ -64,7 +64,7 @@ public:
 } // namespace
 
 class RotateLabel : public TQFrame {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	RotateLabel( TQWidget*, const char* =0 );
@@ -87,5 +87,3 @@ private:
 };
 
 #endif
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp
index c14a5478..84a4e202 100644
--- a/arts/gui/kde/klayoutbox_impl.cpp
+++ b/arts/gui/kde/klayoutbox_impl.cpp
@@ -85,7 +85,7 @@ void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) {
 	TQPainter p( this );
 	TQStyle::SFlags flags = TQStyle::Style_Default;
 	if ( width() < height() ) flags |= TQStyle::Style_Horizontal;
-	style().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags );
+	style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags );
 }
 
 TQSize KLayoutBox_Separator::minimumSizeHint() const {
@@ -117,6 +117,3 @@ TQSize KLayoutBox_Line::minimumSizeHint() const {
 }
 
 #include <klayoutbox_impl.moc>
-
-// vim: sw=4 ts=4
-
diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h
index 7ff6b3f7..976e89a2 100644
--- a/arts/gui/kde/klayoutbox_impl.h
+++ b/arts/gui/kde/klayoutbox_impl.h
@@ -79,7 +79,7 @@ public:
 } // namespace
 
 class KDE_EXPORT KLayoutBox_Separator : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLayoutBox_Separator( TQWidget*, const char* =0 );
@@ -89,7 +89,7 @@ public:
 };
 
 class KLayoutBox_Line : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	int _width, _space;
@@ -100,6 +100,3 @@ public:
 };
 
 #endif
-
-// vim: sw=4 ts=4
-
diff --git a/arts/gui/kde/klevelmeter_firebars.cpp b/arts/gui/kde/klevelmeter_firebars.cpp
index 9a78804c..658cabfa 100644
--- a/arts/gui/kde/klevelmeter_firebars.cpp
+++ b/arts/gui/kde/klevelmeter_firebars.cpp
@@ -122,4 +122,3 @@ void KLevelMeter_FireBars::mouseMoveEvent( TQMouseEvent* /*qme*/ ) {
 }
 
 #include <klevelmeter_firebars.moc>
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klevelmeter_firebars.h b/arts/gui/kde/klevelmeter_firebars.h
index 965944d9..04ecc3dc 100644
--- a/arts/gui/kde/klevelmeter_firebars.h
+++ b/arts/gui/kde/klevelmeter_firebars.h
@@ -27,7 +27,7 @@ class TQPixmap;
 class KLevelMeter_FireBars;
 
 class KLevelMeter_FireBars_private : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLevelMeter_FireBars_private( KLevelMeter_FireBars*, const char* );
@@ -40,7 +40,7 @@ private:
 };
 
 class KLevelMeter_FireBars : public KLevelMeter_Template {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLevelMeter_FireBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
@@ -57,4 +57,3 @@ private:
 };
 
 #endif
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klevelmeter_impl.cpp b/arts/gui/kde/klevelmeter_impl.cpp
index 418108ad..26ddd3b6 100644
--- a/arts/gui/kde/klevelmeter_impl.cpp
+++ b/arts/gui/kde/klevelmeter_impl.cpp
@@ -126,6 +126,3 @@ void KLevelMeter_impl::direction( Arts::Direction n ) {
 }
 
 REGISTER_IMPLEMENTATION( KLevelMeter_impl );
-
-// vim: sw=4 ts=4
-
diff --git a/arts/gui/kde/klevelmeter_impl.h b/arts/gui/kde/klevelmeter_impl.h
index 6bf175fb..a3fe9d02 100644
--- a/arts/gui/kde/klevelmeter_impl.h
+++ b/arts/gui/kde/klevelmeter_impl.h
@@ -66,5 +66,3 @@ public:
 } // namespace Arts
 
 #endif
-// vim: sw=4 ts=4
-
diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp
index fc2a1293..1f3cd450 100644
--- a/arts/gui/kde/klevelmeter_linebars.cpp
+++ b/arts/gui/kde/klevelmeter_linebars.cpp
@@ -94,7 +94,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) {
 		p.drawLine( 0, top, w, top );
 	}
 
-	bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&pm), 0, 0, pm.width(), pm.height(), CopyROP, true );
+	bitBlt( this, 0, 0, &pm, 0, 0, pm.width(), pm.height(), CopyROP, true );
 }
 
 /**
@@ -106,4 +106,3 @@ void KLevelMeter_LineBars::mouseMoveEvent( TQMouseEvent* /*qme*/ ) {
 }
 
 #include <klevelmeter_linebars.moc>
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klevelmeter_linebars.h b/arts/gui/kde/klevelmeter_linebars.h
index 9f901c6a..3a7def62 100644
--- a/arts/gui/kde/klevelmeter_linebars.h
+++ b/arts/gui/kde/klevelmeter_linebars.h
@@ -24,7 +24,7 @@
 #include "klevelmeter_template.h"
 
 class KLevelMeter_LineBars : public KLevelMeter_Template {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLevelMeter_LineBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
@@ -44,4 +44,3 @@ private:
 };
 
 #endif
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klevelmeter_normalbars.cpp b/arts/gui/kde/klevelmeter_normalbars.cpp
index 29593551..28bb85e2 100644
--- a/arts/gui/kde/klevelmeter_normalbars.cpp
+++ b/arts/gui/kde/klevelmeter_normalbars.cpp
@@ -78,4 +78,3 @@ uint barscount = _count;
 }
 
 #include <klevelmeter_normalbars.moc>
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klevelmeter_normalbars.h b/arts/gui/kde/klevelmeter_normalbars.h
index 1e92e1c0..e0f1eebf 100644
--- a/arts/gui/kde/klevelmeter_normalbars.h
+++ b/arts/gui/kde/klevelmeter_normalbars.h
@@ -29,7 +29,7 @@ class Bar;
 class TQBoxLayout;
 
 class KLevelMeter_NormalBars : public KLevelMeter_Template {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
@@ -48,7 +48,7 @@ private:
 };
 
 class Bar : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	float _min, _max;
@@ -74,4 +74,3 @@ public:
 };
 
 #endif
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klevelmeter_private.h b/arts/gui/kde/klevelmeter_private.h
index 50f19d5d..b7662cd7 100644
--- a/arts/gui/kde/klevelmeter_private.h
+++ b/arts/gui/kde/klevelmeter_private.h
@@ -30,7 +30,7 @@ class TQBoxLayout;
 class KArtsWidget;
 
 class KLevelMeter_Private : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	Arts::KLevelMeter_impl* _impl;
@@ -53,4 +53,3 @@ public:
 };
 
 #endif
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klevelmeter_small.cpp b/arts/gui/kde/klevelmeter_small.cpp
index c74dfa44..9134ac4c 100644
--- a/arts/gui/kde/klevelmeter_small.cpp
+++ b/arts/gui/kde/klevelmeter_small.cpp
@@ -56,4 +56,3 @@ void KLevelMeter_Small::paintEvent( TQPaintEvent* /*qpe*/ ) {
 }
 
 #include <klevelmeter_small.moc>
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klevelmeter_small.h b/arts/gui/kde/klevelmeter_small.h
index c13747e4..2fa67e68 100644
--- a/arts/gui/kde/klevelmeter_small.h
+++ b/arts/gui/kde/klevelmeter_small.h
@@ -24,7 +24,7 @@
 #include "klevelmeter_template.h"
 
 class KLevelMeter_Small : public KLevelMeter_Template {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLevelMeter_Small( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
@@ -37,4 +37,3 @@ private:
 };
 
 #endif
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klevelmeter_template.h b/arts/gui/kde/klevelmeter_template.h
index ab51bc3f..655e4f75 100644
--- a/arts/gui/kde/klevelmeter_template.h
+++ b/arts/gui/kde/klevelmeter_template.h
@@ -30,7 +30,7 @@
 #include "klevelmeter_impl.h"
 
 class KLevelMeter_Template : public TQWidget, public dB2VolCalc {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	Arts::KLevelMeter_impl* _impl;
@@ -68,4 +68,3 @@ protected:
 };
 
 #endif
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klineedit_impl.cpp b/arts/gui/kde/klineedit_impl.cpp
index e3643645..3054270e 100644
--- a/arts/gui/kde/klineedit_impl.cpp
+++ b/arts/gui/kde/klineedit_impl.cpp
@@ -29,8 +29,8 @@ using namespace std;
 KLineEditStringMapper::KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ke)
 	:impl(impl)
 {
-	connect(ke, TQT_SIGNAL(textChanged(const TQString&)),
-			this, TQT_SLOT(textChanged(const TQString&)));
+	connect(ke, TQ_SIGNAL(textChanged(const TQString&)),
+			this, TQ_SLOT(textChanged(const TQString&)));
 }
 
 void KLineEditStringMapper::textChanged(const TQString& newText)
@@ -71,5 +71,3 @@ void KLineEdit_impl::caption(const string& /*newCaption*/)
 }
 
 REGISTER_IMPLEMENTATION(KLineEdit_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/klineedit_impl.h b/arts/gui/kde/klineedit_impl.h
index a43e15c7..7ce88794 100644
--- a/arts/gui/kde/klineedit_impl.h
+++ b/arts/gui/kde/klineedit_impl.h
@@ -48,7 +48,7 @@ public:
 };
 
 class KLineEditStringMapper :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KLineEdit_impl *impl;
 public:
@@ -60,5 +60,3 @@ public slots:
 }
 
 #endif
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index ae9c6728..03bd905d 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -223,7 +223,7 @@ void KPoti::init(int value)
   m_bLabel = true;
   tickInt = 0;
 
-  setFocusPolicy( TQ_TabFocus );
+  setFocusPolicy( TQWidget::TabFocus );
   initTicks();
 }
 
@@ -458,7 +458,7 @@ void KPoti::drawContents( TQPainter * p )
 	dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) );
 
 	if( hasFocus() )
-		style().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() );
+		style().drawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() );
 
     paintPoti( &dbp );
 	dbp.end();
@@ -474,13 +474,13 @@ void KPoti::mousePressEvent( TQMouseEvent *e )
 {
   resetState();
 
-  if ( e->button() == Qt::MidButton ) {
+  if ( e->button() == TQt::MidButton ) {
     double pos = atan2( double(e->pos().x()-d->center.x()),
                        double(- e->pos().y() + d->center.y()) );
     movePoti( pos );
     return;
   }
-  if ( e->button() != Qt::LeftButton )
+  if ( e->button() != TQt::LeftButton )
     return;
 
 
@@ -495,14 +495,14 @@ void KPoti::mousePressEvent( TQMouseEvent *e )
     subtractPage();
     if ( !timer )
       timer = new TQTimer( this );
-    connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) );
+    connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) );
     timer->start( thresholdTime, TRUE );
   } else  {
     state = TimingUp;
     addPage();
     if ( !timer )
       timer = new TQTimer( this );
-    connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) );
+    connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) );
     timer->start( thresholdTime, TRUE );
   }
 }
@@ -513,13 +513,13 @@ void KPoti::mousePressEvent( TQMouseEvent *e )
 void KPoti::mouseMoveEvent( TQMouseEvent *e )
 {
 
-    if ( (e->state() & Qt::MidButton) ) { 		// middle button wins
+    if ( (e->state() & TQt::MidButton) ) { 		// middle button wins
       double pos = atan2( double(e->pos().x()-d->center.x()),
                           double(- e->pos().y()+d->center.y()) );
       movePoti( pos );
       return;
     }
-    if ( !(e->state() & Qt::LeftButton) )
+    if ( !(e->state() & TQt::LeftButton) )
 	return;					// left mouse button is up
     if ( state != Dragging )
 	return;
@@ -535,7 +535,7 @@ void KPoti::mouseMoveEvent( TQMouseEvent *e )
 
 void KPoti::mouseReleaseEvent( TQMouseEvent *e )
 {
-    if ( !(e->button() & Qt::LeftButton) )
+    if ( !(e->button() & TQt::LeftButton) )
 	return;
     resetState();
 }
@@ -695,9 +695,9 @@ void KPoti::repeatTimeout()
     Q_ASSERT( timer );
     timer->disconnect();
     if ( state == TimingDown )
-	connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(subtractStep()) );
+	connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(subtractStep()) );
     else if ( state == TimingUp )
-	connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(addStep()) );
+	connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(addStep()) );
     timer->start( repeatTime, FALSE );
 }
 
@@ -777,5 +777,3 @@ void KPoti::setTickInterval( int i )
   chooses between pageStep() and lineStep().
   \sa setTickInterval()
 */
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h
index 25696399..ad7be8f1 100644
--- a/arts/gui/kde/kpoti.h
+++ b/arts/gui/kde/kpoti.h
@@ -30,7 +30,7 @@ struct TQPotiData;
 
 class KPoti : public TQFrame, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/arts/gui/kde/kpoti_impl.cpp b/arts/gui/kde/kpoti_impl.cpp
index ffac2a20..fbf442f0 100644
--- a/arts/gui/kde/kpoti_impl.cpp
+++ b/arts/gui/kde/kpoti_impl.cpp
@@ -35,7 +35,7 @@ PotiIntMapper::PotiIntMapper(KPoti_impl *impl, KPoti *kp)
 	: TQObject( kp )
 	, impl( impl )
 {
-	connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
+	connect(kp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int)));
 }
 
 void PotiIntMapper::valueChanged(int pos)
@@ -199,5 +199,3 @@ float KPoti_impl::logarithmic()
 }
 
 REGISTER_IMPLEMENTATION(KPoti_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kpoti_impl.h b/arts/gui/kde/kpoti_impl.h
index 4da2cb12..e7d1d75b 100644
--- a/arts/gui/kde/kpoti_impl.h
+++ b/arts/gui/kde/kpoti_impl.h
@@ -35,7 +35,7 @@ namespace Arts {
 class KPoti_impl;
 
 class PotiIntMapper :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KPoti_impl *impl;
 public:
@@ -87,5 +87,3 @@ public:
 
 }
 #endif /* ARTS_GUI_KPOTI_IMPL_H */
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kspinbox_impl.cpp b/arts/gui/kde/kspinbox_impl.cpp
index db40ae10..877c080f 100644
--- a/arts/gui/kde/kspinbox_impl.cpp
+++ b/arts/gui/kde/kspinbox_impl.cpp
@@ -32,7 +32,7 @@ using namespace std;
 SpinBoxIntMapper::SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp)
 	:impl(impl)
 {
-	connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
+	connect(sp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int)));
 }
 
 void SpinBoxIntMapper::valueChanged(int pos)
@@ -104,5 +104,3 @@ void KSpinBox_impl::valueChanged(int newvalue)
 }
 
 REGISTER_IMPLEMENTATION(KSpinBox_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h
index cbec2a95..1369393a 100644
--- a/arts/gui/kde/kspinbox_impl.h
+++ b/arts/gui/kde/kspinbox_impl.h
@@ -34,7 +34,7 @@ namespace Arts {
 
 class KSpinBox_impl;
 class SpinBoxIntMapper :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KSpinBox_impl *impl;
 public:
@@ -73,5 +73,3 @@ public:
 
 }
 #endif /* ARTS_GUI_KSPINBOX_IMPL_H */
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp
index 5df8dd00..6bee2d0a 100644
--- a/arts/gui/kde/ktickmarks_impl.cpp
+++ b/arts/gui/kde/ktickmarks_impl.cpp
@@ -176,4 +176,3 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) {
 REGISTER_IMPLEMENTATION( KTickmarks_impl );
 
 #include "ktickmarks_impl.moc"
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/ktickmarks_impl.h b/arts/gui/kde/ktickmarks_impl.h
index dcea467b..498ad9f4 100644
--- a/arts/gui/kde/ktickmarks_impl.h
+++ b/arts/gui/kde/ktickmarks_impl.h
@@ -60,7 +60,7 @@ private:
 };
 
 class KTickmarks_Widget : public TQFrame, public dB2VolCalc {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	KTickmarks_impl* _impl;
@@ -74,4 +74,3 @@ public:
 };
 
 #endif
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kvbox_impl.cpp b/arts/gui/kde/kvbox_impl.cpp
index b1dc6dd4..45f292e6 100644
--- a/arts/gui/kde/kvbox_impl.cpp
+++ b/arts/gui/kde/kvbox_impl.cpp
@@ -47,5 +47,3 @@ void KVBox_impl::spacing( long s )
 }
 
 REGISTER_IMPLEMENTATION(KVBox_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kvbox_impl.h b/arts/gui/kde/kvbox_impl.h
index 03f59705..916979cf 100644
--- a/arts/gui/kde/kvbox_impl.h
+++ b/arts/gui/kde/kvbox_impl.h
@@ -44,5 +44,3 @@ public:
 };
 
 }
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp
index da6a5d39..4236e0cd 100644
--- a/arts/gui/kde/kvolumefader_impl.cpp
+++ b/arts/gui/kde/kvolumefader_impl.cpp
@@ -121,7 +121,7 @@ KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n )
   , _value( -1 )
   , _dir( Arts::BottomToTop )
   , _menu( new TDEPopupMenu( this ) )
-  , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( exactValue() ), TQT_TQOBJECT(this) ) )
+  , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), this, TQ_SLOT( exactValue() ), this ) )
 {
 	//kdDebug() << k_funcinfo << endl;
 	setMinimumSize( 10,10 );
@@ -184,8 +184,8 @@ void KVolumeFader_Widget::mousePressEvent( TQMouseEvent* ){
 
 void KVolumeFader_Widget::mouseReleaseEvent( TQMouseEvent* qme ){
 	bool setValue = false;
-	if ( TDEGlobalSettings::mouseSettings().handed == 0 && qme->button() == Qt::LeftButton ) setValue=true;
-	if ( TDEGlobalSettings::mouseSettings().handed == 1 && qme->button() == Qt::RightButton ) setValue=true;
+	if ( TDEGlobalSettings::mouseSettings().handed == 0 && qme->button() == TQt::LeftButton ) setValue=true;
+	if ( TDEGlobalSettings::mouseSettings().handed == 1 && qme->button() == TQt::RightButton ) setValue=true;
 	if ( setValue )
 	{
 		switch ( _dir ) {
@@ -240,4 +240,3 @@ void KVolumeFader_Widget::exactValue() {
 REGISTER_IMPLEMENTATION( KVolumeFader_impl );
 
 #include "kvolumefader_impl.moc"
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kvolumefader_impl.h b/arts/gui/kde/kvolumefader_impl.h
index cbf4b5b3..0604497f 100644
--- a/arts/gui/kde/kvolumefader_impl.h
+++ b/arts/gui/kde/kvolumefader_impl.h
@@ -68,7 +68,7 @@ class TDEPopupMenu;
 class TDEAction;
 
 class KVolumeFader_Widget : public TQFrame {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	KVolumeFader_impl* _impl;
@@ -95,4 +95,3 @@ private slots:
 };
 
 #endif
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp
index 2a1399f1..e44a818f 100644
--- a/arts/gui/kde/kwidget_impl.cpp
+++ b/arts/gui/kde/kwidget_impl.cpp
@@ -39,8 +39,8 @@ KWidget_impl::KWidget_impl( TQWidget * widget )
 	 * the panel got deleted, our widget will be gone, too)
 	 */
 	_guard = new KWidgetGuard(this);
-	TQObject::connect(_qwidget, TQT_SIGNAL(destroyed()),
-			_guard, TQT_SLOT(widgetDestroyed()));
+	TQObject::connect(_qwidget, TQ_SIGNAL(destroyed()),
+			_guard, TQ_SLOT(widgetDestroyed()));
 }
 
 KWidget_impl::~KWidget_impl()
@@ -177,5 +177,3 @@ void KWidget_impl::hide()
 
 REGISTER_IMPLEMENTATION(KWidget_impl);
 #include "kwidget_impl.moc"
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h
index 65f35d9f..b0c74fa0 100644
--- a/arts/gui/kde/kwidget_impl.h
+++ b/arts/gui/kde/kwidget_impl.h
@@ -69,7 +69,7 @@ public:
 };
 
 class KWidgetGuard : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	KWidget_impl *impl;
@@ -85,5 +85,3 @@ public slots:
 
 }
 #endif /* ARTS_GUI_KWIDGET_IMPL_H */
-
-// vim: sw=4 ts=4
diff --git a/arts/gui/kde/tdepopupbox_impl.cpp b/arts/gui/kde/tdepopupbox_impl.cpp
index 2e8803df..150cccb7 100644
--- a/arts/gui/kde/tdepopupbox_impl.cpp
+++ b/arts/gui/kde/tdepopupbox_impl.cpp
@@ -64,11 +64,11 @@ TDEPopupBox_widget::TDEPopupBox_widget( TQWidget *parent, const char* name ) : T
 	_titlebarlayout->setAutoAdd( true );
 
 	_showbutton = new ShowButton( _titlebar );
-	connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) );
+	connect( _showbutton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( hide( bool ) ) );
 	_drag = new HandleDrag( _titlebar );
-	connect( _drag, TQT_SIGNAL( clicked() ), _showbutton, TQT_SLOT( toggle() ) );
+	connect( _drag, TQ_SIGNAL( clicked() ), _showbutton, TQ_SLOT( toggle() ) );
 	_ownbutton = new OwnButton( _titlebar );
-	connect( _ownbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( own( bool ) ) );
+	connect( _ownbutton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( own( bool ) ) );
 
 	_artswidget = new OwnWidget( _showbutton, this );
 
@@ -129,6 +129,3 @@ void TDEPopupBox_widget::name( std::string n ) {
 REGISTER_IMPLEMENTATION( TDEPopupBox_impl );
 
 #include "tdepopupbox_private.moc"
-
-// vim: sw=4 ts=4
-
diff --git a/arts/gui/kde/tdepopupbox_impl.h b/arts/gui/kde/tdepopupbox_impl.h
index 8ca718f1..9dc37949 100644
--- a/arts/gui/kde/tdepopupbox_impl.h
+++ b/arts/gui/kde/tdepopupbox_impl.h
@@ -65,6 +65,3 @@ private:
 } // namespace Arts
 
 #endif
-
-// vim: sw=4 ts=4
-
diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h
index d4efee65..21fc3034 100644
--- a/arts/gui/kde/tdepopupbox_private.h
+++ b/arts/gui/kde/tdepopupbox_private.h
@@ -34,7 +34,7 @@ class TQBoxLayout;
 
 class TDEPopupBox_widget : public TQFrame
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	TDEPopupBox_widget( TQWidget* =0, const char* =0);
@@ -65,7 +65,7 @@ private:
 // See tdepopupbox_impl.h - The eventmapper isn't needed at present, but perhaps in the future...
 
 /*class TDEPopupBoxEventMapper : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	TDEPopupBoxEventMapper(  TDEPopupBox_widget *widget, Arts::TDEPopupBox_impl *impl )
@@ -80,7 +80,7 @@ private:
 #include <tqstyle.h>
 
 class HandleDrag : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {}
@@ -88,7 +88,7 @@ public:
 		TQPainter p( this );
 		TQStyle::SFlags flags = TQStyle::Style_Default;
 		if( width() < height() ) flags |= TQStyle::Style_Horizontal;
-		style().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags );
+		style().drawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags );
 	}
 signals:
 	void clicked();
@@ -110,7 +110,7 @@ static const char* const own_xpm[]    = { "5 5 2 1", "# c black", ". c None", "#
 #include <tqlayout.h>
 
 class ShowButton : public TQPushButton {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	TQBoxLayout::Direction _dir;
@@ -118,7 +118,7 @@ private:
 public:
 	ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight )
 	{
-		connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) );
+		connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( owntoggle( bool ) ) );
 		setToggleButton( true );
 		_pmleft = TQPixmap( const_cast<const char**>( left_xpm ) );
 		_pmright = TQPixmap( const_cast<const char**>( right_xpm ) );
@@ -167,14 +167,14 @@ public:
 };
 
 class OwnButton : public TQPushButton {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	TQPixmap _pmown, _pminside;
 public:
 	OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name )
 	{
-		connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) );
+		connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggle( bool ) ) );
 		setToggleButton( true );
 		_pmown = TQPixmap( const_cast<const char**>( own_xpm ) );
 		_pminside = TQPixmap( const_cast<const char**>( inside_xpm ) );
@@ -206,7 +206,7 @@ public:
 
 class OwnWidget : public KArtsWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 	ShowButton *_b;
 public:
@@ -217,6 +217,3 @@ public slots:
 };
 
 #endif
-
-// vim: sw=4 ts=4
-
diff --git a/arts/midi/CMakeLists.txt b/arts/midi/CMakeLists.txt
index 0b91a9fe..c8c0925d 100644
--- a/arts/midi/CMakeLists.txt
+++ b/arts/midi/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 ##### artsmidi (library) ########################
 
 tde_add_library( artsmidi_idl SHARED
-  SOURCES artsmidi.cc
+  SOURCES artsmidi.cpp
   VERSION 0.0.0
   LINK ${ARTS_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} mcop artsflow artsflow_idl
   DESTINATION ${LIB_INSTALL_DIR}
@@ -37,11 +37,11 @@ tde_add_library( artsmidi_idl SHARED
 
 tde_add_library( artsmidi SHARED
   SOURCES
-    midimanager_impl.cc midiclient_impl.cc
-    miditest_impl.cc midimanagerport_impl.cc rawmidiport_impl.cc
-    systemmiditimer_impl.cc audiomiditimer_impl.cc miditimercommon.cc
-    audiosync_impl.cc audiotimer.cc alsamidigateway_impl.cc
-    alsamidiport_impl.cc midisyncgroup_impl.cc timestampmath.cc
+    midimanager_impl.cpp midiclient_impl.cpp
+    miditest_impl.cpp midimanagerport_impl.cpp rawmidiport_impl.cpp
+    systemmiditimer_impl.cpp audiomiditimer_impl.cpp miditimercommon.cpp
+    audiosync_impl.cpp audiotimer.cpp alsamidigateway_impl.cpp
+    alsamidiport_impl.cpp midisyncgroup_impl.cpp timestampmath.cpp
   VERSION 0.0.0
   LINK
     artsmidi_idl-shared
@@ -50,7 +50,7 @@ tde_add_library( artsmidi SHARED
 
 add_custom_command(
   OUTPUT
-    artsmidi.cc artsmidi.h
+    artsmidi.cpp artsmidi.h
     artsmidi.mcopclass artsmidi.mcoptype
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artsmidi.idl
@@ -61,13 +61,13 @@ add_custom_command(
 ##### midisend (executable) #####################
 
 tde_add_executable( midisend
-  SOURCES midisend.cc midimsg.c
+  SOURCES midisend.cpp midimsg.c
   LINK artsmidi_idl-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 tde_add_check_executable( midisynctest
-  SOURCES midisynctest.cc
+  SOURCES midisynctest.cpp
   LINK artsmidi-shared soundserver_idl
 )
 
diff --git a/arts/midi/Makefile.am b/arts/midi/Makefile.am
index fc120523..0f0af616 100644
--- a/arts/midi/Makefile.am
+++ b/arts/midi/Makefile.am
@@ -8,26 +8,26 @@ lib_LTLIBRARIES = libartsmidi_idl.la libartsmidi.la
 bin_PROGRAMS = midisend
 noinst_PROGRAMS = midisynctest
 
-midisend_SOURCES = midisend.cc midimsg.c
+midisend_SOURCES = midisend.cpp midimsg.c
 midisend_LDFLAGS = $(all_libraries) $(LIB_TQT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_TQT) -lmcop -lartsflow_idl
 midisend_LDADD   = libartsmidi_idl.la -lartsflow_idl
 midisend_COMPILE_FIRST = artsmidi.h
 
-midisynctest_SOURCES = midisynctest.cc
+midisynctest_SOURCES = midisynctest.cpp
 midisynctest_LDFLAGS = $(all_libraries) $(LIB_TQT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_TQT) -lmcop -lartsflow_idl -lartsmidi_idl
 midisynctest_LDADD   = libartsmidi.la -lsoundserver_idl -lartsflow_idl -lartsmidi_idl
 midisynctest_COMPILE_FIRST = artsmidi.h
 
-libartsmidi_idl_la_SOURCES = artsmidi.cc
+libartsmidi_idl_la_SOURCES = artsmidi.cpp
 libartsmidi_idl_la_LIBADD = -lmcop -lartsflow -lartsflow_idl
 libartsmidi_idl_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
   -no-undefined -lartsflow_idl
 
-libartsmidi_la_SOURCES = midimanager_impl.cc midiclient_impl.cc \
-	miditest_impl.cc midimanagerport_impl.cc rawmidiport_impl.cc \
-	systemmiditimer_impl.cc audiomiditimer_impl.cc miditimercommon.cc \
-	audiosync_impl.cc audiotimer.cc alsamidigateway_impl.cc \
-	alsamidiport_impl.cc midisyncgroup_impl.cc timestampmath.cc
+libartsmidi_la_SOURCES = midimanager_impl.cpp midiclient_impl.cpp \
+	miditest_impl.cpp midimanagerport_impl.cpp rawmidiport_impl.cpp \
+	systemmiditimer_impl.cpp audiomiditimer_impl.cpp miditimercommon.cpp \
+	audiosync_impl.cpp audiotimer.cpp alsamidigateway_impl.cpp \
+	alsamidiport_impl.cpp midisyncgroup_impl.cpp timestampmath.cpp
 libartsmidi_la_COMPILE_FIRST = artsmidi.h
 
 libartsmidi_la_LIBADD = libartsmidi_idl.la -lartsflow_idl -lartsflow $(ARTS_LIBASOUND)
@@ -36,10 +36,10 @@ libartsmidi_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
 
 artsmidi.mcopclass: artsmidi.h
 artsmidi.mcoptype: artsmidi.h
-artsmidi.cc artsmidi.h: $(srcdir)/artsmidi.idl $(MCOPIDL)
+artsmidi.cpp artsmidi.h: $(srcdir)/artsmidi.idl $(MCOPIDL)
 	$(MCOPIDL) -t -I$(arts_includes) $(srcdir)/artsmidi.idl
 
-DISTCLEANFILES = artsmidi.cc artsmidi.h \
+DISTCLEANFILES = artsmidi.cpp artsmidi.h \
   artsmidi.mcoptype artsmidi.mcopclass
 
 ####### install idl files
diff --git a/arts/midi/README.midi b/arts/midi/README.midi
index 69342b32..a3463fde 100644
--- a/arts/midi/README.midi
+++ b/arts/midi/README.midi
@@ -250,7 +250,7 @@ synchronized to those of the midi channels.
   ---------------
 
 An example that illustrates most things discussed in this document is
-midisynctest.cc, which plays back two synchronized midi streams and samples.
+midisynctest.cpp, which plays back two synchronized midi streams and samples.
 Note that you might want to change the source code, as it hardcodes the
 location of the .wav file.
 
diff --git a/arts/midi/alsamidigateway_impl.cc b/arts/midi/alsamidigateway_impl.cpp
index 4b31042e..4b31042e 100644
--- a/arts/midi/alsamidigateway_impl.cc
+++ b/arts/midi/alsamidigateway_impl.cpp
diff --git a/arts/midi/alsamidiport_impl.cc b/arts/midi/alsamidiport_impl.cpp
index 97c8dffa..97c8dffa 100644
--- a/arts/midi/alsamidiport_impl.cc
+++ b/arts/midi/alsamidiport_impl.cpp
diff --git a/arts/midi/artsmidi.idl b/arts/midi/artsmidi.idl
index ce1c5891..9531d763 100644
--- a/arts/midi/artsmidi.idl
+++ b/arts/midi/artsmidi.idl
@@ -21,7 +21,7 @@
     */
 
 /*
- * DISCLAIMER: The interfaces in artsmidi.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in artsmidi.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/midi/audiomiditimer_impl.cc b/arts/midi/audiomiditimer_impl.cpp
index a185b1cb..a185b1cb 100644
--- a/arts/midi/audiomiditimer_impl.cc
+++ b/arts/midi/audiomiditimer_impl.cpp
diff --git a/arts/midi/audiosync_impl.cc b/arts/midi/audiosync_impl.cpp
index 20f089df..20f089df 100644
--- a/arts/midi/audiosync_impl.cc
+++ b/arts/midi/audiosync_impl.cpp
diff --git a/arts/midi/audiotimer.cc b/arts/midi/audiotimer.cpp
index a80e551c..a80e551c 100644
--- a/arts/midi/audiotimer.cc
+++ b/arts/midi/audiotimer.cpp
diff --git a/arts/midi/midiclient_impl.cc b/arts/midi/midiclient_impl.cpp
index 0aa2ec6f..0aa2ec6f 100644
--- a/arts/midi/midiclient_impl.cc
+++ b/arts/midi/midiclient_impl.cpp
diff --git a/arts/midi/midimanager_impl.cc b/arts/midi/midimanager_impl.cpp
index ea310503..ea310503 100644
--- a/arts/midi/midimanager_impl.cc
+++ b/arts/midi/midimanager_impl.cpp
diff --git a/arts/midi/midimanagerport_impl.cc b/arts/midi/midimanagerport_impl.cpp
index 3b4261a7..3b4261a7 100644
--- a/arts/midi/midimanagerport_impl.cc
+++ b/arts/midi/midimanagerport_impl.cpp
diff --git a/arts/midi/midisend.cc b/arts/midi/midisend.cpp
index 2b976d61..2b976d61 100644
--- a/arts/midi/midisend.cc
+++ b/arts/midi/midisend.cpp
diff --git a/arts/midi/midisyncgroup_impl.cc b/arts/midi/midisyncgroup_impl.cpp
index 5d5305dd..5d5305dd 100644
--- a/arts/midi/midisyncgroup_impl.cc
+++ b/arts/midi/midisyncgroup_impl.cpp
diff --git a/arts/midi/midisynctest.cc b/arts/midi/midisynctest.cpp
index e1278f1b..e1278f1b 100644
--- a/arts/midi/midisynctest.cc
+++ b/arts/midi/midisynctest.cpp
diff --git a/arts/midi/miditest_impl.cc b/arts/midi/miditest_impl.cpp
index b6ecce90..b6ecce90 100644
--- a/arts/midi/miditest_impl.cc
+++ b/arts/midi/miditest_impl.cpp
diff --git a/arts/midi/miditimercommon.cc b/arts/midi/miditimercommon.cpp
index 69597b32..69597b32 100644
--- a/arts/midi/miditimercommon.cc
+++ b/arts/midi/miditimercommon.cpp
diff --git a/arts/midi/rawmidiport_impl.cc b/arts/midi/rawmidiport_impl.cpp
index f8311bd6..f8311bd6 100644
--- a/arts/midi/rawmidiport_impl.cc
+++ b/arts/midi/rawmidiport_impl.cpp
diff --git a/arts/midi/systemmiditimer_impl.cc b/arts/midi/systemmiditimer_impl.cpp
index 4f7329b2..4f7329b2 100644
--- a/arts/midi/systemmiditimer_impl.cc
+++ b/arts/midi/systemmiditimer_impl.cpp
diff --git a/arts/midi/timestampmath.cc b/arts/midi/timestampmath.cpp
index e8d5500a..e8d5500a 100644
--- a/arts/midi/timestampmath.cc
+++ b/arts/midi/timestampmath.cpp
diff --git a/arts/modules/CMakeLists.txt b/arts/modules/CMakeLists.txt
index 9f37038c..fb6d07e2 100644
--- a/arts/modules/CMakeLists.txt
+++ b/arts/modules/CMakeLists.txt
@@ -39,7 +39,7 @@ link_directories(
 
 tde_add_library( artsmodules SHARED
   SOURCES
-    artsmodules.cc
+    artsmodules.cpp
   VERSION 0.0.0
   LINK
     tdecore-shared ${DL_LIBRARIES} mcop artsflow
@@ -51,7 +51,7 @@ tde_add_library( artsmodules SHARED
 
 add_custom_command(
   OUTPUT
-    artsmodules.cc artsmodules.h
+    artsmodules.cpp artsmodules.h
     artsmodules.mcoptype artsmodules.mcopclass
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/Makefile.am b/arts/modules/Makefile.am
index d604e8b9..9ac9de04 100644
--- a/arts/modules/Makefile.am
+++ b/arts/modules/Makefile.am
@@ -25,7 +25,7 @@ MCOPIDLINCLUDES = \
 
 lib_LTLIBRARIES = libartsmodules.la
 
-libartsmodules_la_SOURCES = artsmodules.cc
+libartsmodules_la_SOURCES = artsmodules.cpp
 
 libartsmodules_la_LIBADD = \
    $(top_builddir)/arts/runtime/libartsbuilder.la \
@@ -42,10 +42,10 @@ libartsmodules_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
 
 artsmodules.mcopclass: artsmodules.h
 artsmodules.mcoptype: artsmodules.h
-artsmodules.cc artsmodules.h: $(srcdir)/artsmodules.idl $(MCOPIDL)
+artsmodules.cpp artsmodules.h: $(srcdir)/artsmodules.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(MCOPIDLINCLUDES) $(srcdir)/artsmodules.idl
 
-DISTCLEANFILES = artsmodules.cc artsmodules.h \
+DISTCLEANFILES = artsmodules.cpp artsmodules.h \
   artsmodules.mcoptype artsmodules.mcopclass
 
 ####### install idl files
diff --git a/arts/modules/README.environments b/arts/modules/README.environments
index 0ac64df5..d8ca4dde 100644
--- a/arts/modules/README.environments
+++ b/arts/modules/README.environments
@@ -25,28 +25,28 @@ for composing a song, you might require
  - several audio tracks
  - a mixer
 
-While with artscontrol, the user can setup much of this himself manually, the
-problem is that this has to be done over and over again. That is, if he saves
-the song, the settings of his effects, instruments and the mixer will not be
-saved with it.
+While with artscontrol, the users can setup much of this themselves manually,
+the problem is that this has to be done over and over again. That is, if they
+save the song, the settings of their effects, instruments and the mixer will
+not be saved with it.
 
 The main idea of the new interfaces in Arts::Environment is that the sequencer
 can save the environment required to create a song along with the the song, so
-that the user will find himself surrounded by the same effects, instruments,...
-with the same settings again, once he loads the song again.
-
-So, conceptually, we can imagine the environment as a "room", where the user
-works in to create a song. He needs to install the things inside the room he
-needs. Initially, the room will be empty. Now, the user things: oh, I am going
-to need this nice 24 channel mixer. *plop* - it appears in the room. Now he
-thinks I need some sampler which can play my piano.  *plop* - it appears in
-the room.
-
-Now he starts working, and adds the "items" he needs. Finally, if he stops
-working on the song, he can pack all what is in the environment in a little
-box, and whenever he starts working on the song again, he can start where he
-left off. He can even take the environment to a friend, and continue working
-on the song there.
+that the users will find themselves surrounded by the same effects,
+instruments,... with the same settings again, once they load the song again.
+
+So, conceptually, we can imagine the environment as a "room", where a user
+works in to create a song. They needs to install the things inside the room
+they need. Initially, the room will be empty. Now, the user thinks: oh, I am
+going to need this nice 24 channel mixer. *plop* - it appears in the room.
+Now they think: I need some sampler which can play my piano.  *plop* - it
+appears in the room.
+
+Now they starts working, adding the "items" they need. Finally, if they stop
+working on the song, they can pack all what is in the environment in a little
+box, and whenever they starts working on the song again, they can start where
+they left off. They can even take the environment to a friend, and continue
+working on the song there.
 
 Note that there might be other tasks (such as creating a film, playing an
 mp3 with noatun,...) which will have similar requirements of saving the
@@ -281,7 +281,7 @@ Basically, you derive an interface from Arts::Environment::Item, like this:
 
 and your implementation from Arts::Environment::Item_impl, like this:
 
-    // this code is in the .cc file:
+    // this code is in the .cpp file:
     #include "artsmodules.h"
     #include "env_item_impl.h"
     
diff --git a/arts/modules/README.modules b/arts/modules/README.modules
index 7113b3a9..2379f618 100644
--- a/arts/modules/README.modules
+++ b/arts/modules/README.modules
@@ -7,9 +7,9 @@ To add a new module "foo" to aRts:
 1. Add a new interface to artsmodules.idl defining the
    module's input and output parameters.
 
-2. Implement the new module in a new source file foo_impl.cc
+2. Implement the new module in a new source file foo_impl.cpp
 
-3. Add foo_impl.cc to the list of libartsmodules_la_SOURCES in
+3. Add foo_impl.cpp to the list of libartsmodules_la_SOURCES in
    Makefile.am.
 
 4. Create a new file mcopclass/foo.mcopclass
diff --git a/arts/modules/artsmodules.idl b/arts/modules/artsmodules.idl
index c502871d..0148aa5b 100644
--- a/arts/modules/artsmodules.idl
+++ b/arts/modules/artsmodules.idl
@@ -25,7 +25,7 @@
     */
 
 /*
- * DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/common/CMakeLists.txt b/arts/modules/common/CMakeLists.txt
index 329fb104..ea065260 100644
--- a/arts/modules/common/CMakeLists.txt
+++ b/arts/modules/common/CMakeLists.txt
@@ -38,10 +38,10 @@ link_directories(
 
 tde_add_library( artsmodulescommon SHARED
   SOURCES
-    artsmodulescommon.cc effectrackslot_impl.cc
-    env_container_impl.cc env_context_impl.cc
-    env_effectrackitem_impl.cc env_instrumentitem_impl.cc
-    env_item_impl.cc env_mixeritem_impl.cc
+    artsmodulescommon.cpp effectrackslot_impl.cpp
+    env_container_impl.cpp env_context_impl.cpp
+    env_effectrackitem_impl.cpp env_instrumentitem_impl.cpp
+    env_item_impl.cpp env_mixeritem_impl.cpp
   VERSION 0.0.0
   LINK
     artsgui_idl-shared artsmidi_idl-shared artsmodulessynth-shared
@@ -51,7 +51,7 @@ tde_add_library( artsmodulescommon SHARED
 
 add_custom_command(
   OUTPUT
-    artsmodulescommon.cc artsmodulescommon.h
+    artsmodulescommon.cpp artsmodulescommon.h
     artsmodulescommon.mcopclass artsmodulescommon.mcoptype
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/common/Makefile.am b/arts/modules/common/Makefile.am
index 1841d23d..8c795014 100644
--- a/arts/modules/common/Makefile.am
+++ b/arts/modules/common/Makefile.am
@@ -14,11 +14,11 @@ INCLUDES = \
 
 lib_LTLIBRARIES = libartsmodulescommon.la
 
-libartsmodulescommon_la_SOURCES = artsmodulescommon.cc \
-	effectrackslot_impl.cc env_container_impl.cc \
-	env_context_impl.cc env_effectrackitem_impl.cc \
-	env_instrumentitem_impl.cc env_item_impl.cc \
-	env_mixeritem_impl.cc
+libartsmodulescommon_la_SOURCES = artsmodulescommon.cpp \
+	effectrackslot_impl.cpp env_container_impl.cpp \
+	env_context_impl.cpp env_effectrackitem_impl.cpp \
+	env_instrumentitem_impl.cpp env_item_impl.cpp \
+	env_mixeritem_impl.cpp
 libartsmodulescommon_la_COMPILE_FIRST = artsmodulescommon.h
 
 libartsmodulescommon_la_LIBADD = \
@@ -29,10 +29,10 @@ libartsmodulescommon_la_LIBADD = \
 
 libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
 
-artsmodulescommon.cc artsmodulescommon.h artsmodulescommon.mcoptype artsmodulescommon.mcopclass: $(srcdir)/artsmodulescommon.idl $(MCOPIDL)
+artsmodulescommon.cpp artsmodulescommon.h artsmodulescommon.mcoptype artsmodulescommon.mcopclass: $(srcdir)/artsmodulescommon.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(INCLUDES) $(srcdir)/artsmodulescommon.idl
 
-DISTCLEANFILES= artsmodulescommon.cc artsmodulescommon.h artsmodulescommon.mcop*
+DISTCLEANFILES= artsmodulescommon.cpp artsmodulescommon.h artsmodulescommon.mcop*
 
 artsincludedir = $(includedir)/arts
 artsinclude_HEADERS = artsmodulescommon.h artsmodulescommon.idl
diff --git a/arts/modules/common/artsmodulescommon.idl b/arts/modules/common/artsmodulescommon.idl
index 10ccd218..b22394eb 100644
--- a/arts/modules/common/artsmodulescommon.idl
+++ b/arts/modules/common/artsmodulescommon.idl
@@ -25,7 +25,7 @@
 */
 
 /*
-* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cc/.h files)
+* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cpp/.h files)
 *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
 *
 * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/common/effectrackslot_impl.cc b/arts/modules/common/effectrackslot_impl.cpp
index 8e7e48e8..6671031b 100644
--- a/arts/modules/common/effectrackslot_impl.cc
+++ b/arts/modules/common/effectrackslot_impl.cpp
@@ -112,5 +112,3 @@ class EffectRackSlot_impl : virtual public EffectRackSlot_skel
 };
 REGISTER_IMPLEMENTATION( EffectRackSlot_impl );
 }
-
-// vim: sw=4 ts=4
diff --git a/arts/modules/common/env_container_impl.cc b/arts/modules/common/env_container_impl.cpp
index 0a6f87d7..0a6f87d7 100644
--- a/arts/modules/common/env_container_impl.cc
+++ b/arts/modules/common/env_container_impl.cpp
diff --git a/arts/modules/common/env_context_impl.cc b/arts/modules/common/env_context_impl.cpp
index a9b19a50..a9b19a50 100644
--- a/arts/modules/common/env_context_impl.cc
+++ b/arts/modules/common/env_context_impl.cpp
diff --git a/arts/modules/common/env_effectrackitem_impl.cc b/arts/modules/common/env_effectrackitem_impl.cpp
index 50fb116e..c082ce24 100644
--- a/arts/modules/common/env_effectrackitem_impl.cc
+++ b/arts/modules/common/env_effectrackitem_impl.cpp
@@ -397,4 +397,3 @@ public:
 };
 REGISTER_IMPLEMENTATION(EffectRackGuiFactory_impl);
 }
-// vim:ts=4:sw=4
diff --git a/arts/modules/common/env_instrumentitem_impl.cc b/arts/modules/common/env_instrumentitem_impl.cpp
index 17959ca0..17959ca0 100644
--- a/arts/modules/common/env_instrumentitem_impl.cc
+++ b/arts/modules/common/env_instrumentitem_impl.cpp
diff --git a/arts/modules/common/env_item_impl.cc b/arts/modules/common/env_item_impl.cpp
index 6bc960d8..6bc960d8 100644
--- a/arts/modules/common/env_item_impl.cc
+++ b/arts/modules/common/env_item_impl.cpp
diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cpp
index 6fee8b44..93735dd5 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cpp
@@ -365,4 +365,3 @@ public:
 };
 REGISTER_IMPLEMENTATION(MixerGuiFactory_impl);
 }
-// vim:ts=4:sw=4
diff --git a/arts/modules/effects/CMakeLists.txt b/arts/modules/effects/CMakeLists.txt
index 58c847d9..a5136f08 100644
--- a/arts/modules/effects/CMakeLists.txt
+++ b/arts/modules/effects/CMakeLists.txt
@@ -38,15 +38,15 @@ link_directories(
 
 tde_add_library( artsmoduleseffects SHARED AUTOMOC
   SOURCES
-    artsmoduleseffects.cc
-    fivebandmonocomplexeq_impl.cc
-    monostereoconversion_impl.cc
-    synth_stereo_pitch_shift_impl.cc synth_stereo_pitch_shift_fft_impl.cc
-    synth_voice_removal_impl.cc voiceremovalguifactory_impl.cc
-    synth_stereo_compressor_impl.cc stereocompressorguifactory_impl.cc
-    synth_stereo_fir_equalizer_impl.cc
-    synth_freeverb_impl.cc freeverbguifactory_impl.cc
-    effect_wavecapture_impl.cc
+    artsmoduleseffects.cpp
+    fivebandmonocomplexeq_impl.cpp
+    monostereoconversion_impl.cpp
+    synth_stereo_pitch_shift_impl.cpp synth_stereo_pitch_shift_fft_impl.cpp
+    synth_voice_removal_impl.cpp voiceremovalguifactory_impl.cpp
+    synth_stereo_compressor_impl.cpp stereocompressorguifactory_impl.cpp
+    synth_stereo_fir_equalizer_impl.cpp
+    synth_freeverb_impl.cpp freeverbguifactory_impl.cpp
+    effect_wavecapture_impl.cpp
     kstereovolumecontrolgui_impl.cpp stereovolumecontrolguifactory_impl.cpp
   VERSION 0.0.0
   EMBED
@@ -60,7 +60,7 @@ tde_add_library( artsmoduleseffects SHARED AUTOMOC
 
 add_custom_command(
   OUTPUT
-    artsmoduleseffects.cc artsmoduleseffects.h
+    artsmoduleseffects.cpp artsmoduleseffects.h
     artsmoduleseffects.mcopclass artsmoduleseffects.mcoptype
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/effects/Makefile.am b/arts/modules/effects/Makefile.am
index d5d54aad..a2c3f31f 100644
--- a/arts/modules/effects/Makefile.am
+++ b/arts/modules/effects/Makefile.am
@@ -20,15 +20,15 @@ INCLUDES = \
 
 lib_LTLIBRARIES = libartsmoduleseffects.la
 
-libartsmoduleseffects_la_SOURCES = artsmoduleseffects.cc \
-	fivebandmonocomplexeq_impl.cc \
-	monostereoconversion_impl.cc \
-	synth_stereo_pitch_shift_impl.cc synth_stereo_pitch_shift_fft_impl.cc \
-	synth_voice_removal_impl.cc voiceremovalguifactory_impl.cc \
-	synth_stereo_compressor_impl.cc stereocompressorguifactory_impl.cc \
-	synth_stereo_fir_equalizer_impl.cc \
-	synth_freeverb_impl.cc freeverbguifactory_impl.cc \
-	effect_wavecapture_impl.cc \
+libartsmoduleseffects_la_SOURCES = artsmoduleseffects.cpp \
+	fivebandmonocomplexeq_impl.cpp \
+	monostereoconversion_impl.cpp \
+	synth_stereo_pitch_shift_impl.cpp synth_stereo_pitch_shift_fft_impl.cpp \
+	synth_voice_removal_impl.cpp voiceremovalguifactory_impl.cpp \
+	synth_stereo_compressor_impl.cpp stereocompressorguifactory_impl.cpp \
+	synth_stereo_fir_equalizer_impl.cpp \
+	synth_freeverb_impl.cpp freeverbguifactory_impl.cpp \
+	effect_wavecapture_impl.cpp \
 	kstereovolumecontrolgui_impl.cpp stereovolumecontrolguifactory_impl.cpp
 libartsmoduleseffects_la_COMPILE_FIRST = ../../gui/common/artsgui.h \
 	../common/artsmodulescommon.h ../../midi/artsmidi.h ../synth/artsmodulessynth.h \
@@ -44,10 +44,10 @@ libartsmoduleseffects_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-unde
 
 METASOURCES=AUTO
 
-artsmoduleseffects.cc artsmoduleseffects.h artsmoduleseffects.mcoptype artsmoduleseffects.mcopclass: $(srcdir)/artsmoduleseffects.idl $(MCOPIDL)
+artsmoduleseffects.cpp artsmoduleseffects.h artsmoduleseffects.mcoptype artsmoduleseffects.mcopclass: $(srcdir)/artsmoduleseffects.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(INCLUDES) $(srcdir)/artsmoduleseffects.idl
 
-DISTCLEANFILES= artsmoduleseffects.cc artsmoduleseffects.h artsmoduleseffects.mcop*
+DISTCLEANFILES= artsmoduleseffects.cpp artsmoduleseffects.h artsmoduleseffects.mcop*
 
 artsincludedir = $(includedir)/arts
 artsinclude_HEADERS = artsmoduleseffects.h artsmoduleseffects.idl
diff --git a/arts/modules/effects/artsmoduleseffects.idl b/arts/modules/effects/artsmoduleseffects.idl
index 13e978d9..9d7cd871 100644
--- a/arts/modules/effects/artsmoduleseffects.idl
+++ b/arts/modules/effects/artsmoduleseffects.idl
@@ -18,7 +18,7 @@
 */
 
 /*
- * DISCLAIMER: The interfaces in envmixer.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in envmixer.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/effects/effect_wavecapture_impl.cc b/arts/modules/effects/effect_wavecapture_impl.cpp
index 430c4fad..639307a8 100644
--- a/arts/modules/effects/effect_wavecapture_impl.cc
+++ b/arts/modules/effects/effect_wavecapture_impl.cpp
@@ -59,5 +59,3 @@ void Effect_WAVECAPTURE_impl::streamEnd()
 REGISTER_IMPLEMENTATION(Effect_WAVECAPTURE_impl);
 
 }
-
-// vim:ts=4:sw=4
diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cpp
index 59d0ef44..59d0ef44 100644
--- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc
+++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cpp
diff --git a/arts/modules/effects/freeverb/allpass.cpp b/arts/modules/effects/freeverb/allpass.cpp
index ca4d8bc5..850337e3 100644
--- a/arts/modules/effects/freeverb/allpass.cpp
+++ b/arts/modules/effects/freeverb/allpass.cpp
@@ -4,7 +4,7 @@
 // http://www.dreampoint.co.uk
 // This code is public domain
 
-#include "allpass.hpp"
+#include "allpass.h"
 
 allpass::allpass()
 {
diff --git a/arts/modules/effects/freeverb/allpass.hpp b/arts/modules/effects/freeverb/allpass.h
index 853c7d41..853c7d41 100644
--- a/arts/modules/effects/freeverb/allpass.hpp
+++ b/arts/modules/effects/freeverb/allpass.h
diff --git a/arts/modules/effects/freeverb/comb.cpp b/arts/modules/effects/freeverb/comb.cpp
index c05f5069..62be706d 100644
--- a/arts/modules/effects/freeverb/comb.cpp
+++ b/arts/modules/effects/freeverb/comb.cpp
@@ -4,7 +4,7 @@
 // http://www.dreampoint.co.uk
 // This code is public domain
 
-#include "comb.hpp"
+#include "comb.h"
 
 comb::comb()
 {
diff --git a/arts/modules/effects/freeverb/comb.hpp b/arts/modules/effects/freeverb/comb.h
index 4a73b615..4a73b615 100644
--- a/arts/modules/effects/freeverb/comb.hpp
+++ b/arts/modules/effects/freeverb/comb.h
diff --git a/arts/modules/effects/freeverb/revmodel.cpp b/arts/modules/effects/freeverb/revmodel.cpp
index 23a766cc..3688dd34 100644
--- a/arts/modules/effects/freeverb/revmodel.cpp
+++ b/arts/modules/effects/freeverb/revmodel.cpp
@@ -4,7 +4,7 @@
 // http://www.dreampoint.co.uk
 // This code is public domain
 
-#include "revmodel.hpp"
+#include "revmodel.h"
 
 revmodel::revmodel()
 {
diff --git a/arts/modules/effects/freeverb/revmodel.hpp b/arts/modules/effects/freeverb/revmodel.h
index ca6c89a0..aec39dfe 100644
--- a/arts/modules/effects/freeverb/revmodel.hpp
+++ b/arts/modules/effects/freeverb/revmodel.h
@@ -7,8 +7,8 @@
 #ifndef _revmodel_
 #define _revmodel_
 
-#include "comb.hpp"
-#include "allpass.hpp"
+#include "comb.h"
+#include "allpass.h"
 #include "tuning.h"
 
 class revmodel
diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cpp
index 4b5d4d34..4b5d4d34 100644
--- a/arts/modules/effects/freeverbguifactory_impl.cc
+++ b/arts/modules/effects/freeverbguifactory_impl.cpp
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
index e6e0c54c..d7f8d30b 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
@@ -30,7 +30,7 @@ using namespace Arts;
 KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) )
 {
 	//kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<<w<<" )"<<endl;
-	_mapper = new KStereoVolumeControlGui_EventMapper( this, TQT_TQOBJECT(_qframe) );
+	_mapper = new KStereoVolumeControlGui_EventMapper( this, _qframe );
 	this->addWidget( _label, -100 );
 	_label.bottom( Arts::East );
 	_label.text( "Volume" );
@@ -126,7 +126,5 @@ void KStereoVolumeControlGui_impl::updateValues() {
 }
 
 REGISTER_IMPLEMENTATION( KStereoVolumeControlGui_impl );
-
-// vim: sw=4 ts=4
 #include "kstereovolumecontrolgui_impl.moc"
 
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h
index b562b988..ff5d96dd 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.h
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h
@@ -80,7 +80,7 @@ private:
 #include <tqtimer.h>
 
 class KStereoVolumeControlGui_EventMapper : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	TQTimer* _timer;
@@ -88,11 +88,10 @@ public:
 public:
 	KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) {
 		_timer = new TQTimer( this );
-		connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) );
+		connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimerSignal() ) );
 	}
 public slots:
 	void slotTimerSignal() { _impl->updateValues(); }
 };
 
 #endif
-// vim: sw=4 ts=4
diff --git a/arts/modules/effects/monostereoconversion_impl.cc b/arts/modules/effects/monostereoconversion_impl.cpp
index 9bf1bbee..9bf1bbee 100644
--- a/arts/modules/effects/monostereoconversion_impl.cc
+++ b/arts/modules/effects/monostereoconversion_impl.cpp
diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cpp
index 0dd523e8..295ad65d 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cpp
@@ -106,9 +106,6 @@ public:
 		return hbox;
 	}
 };
-
-// vim:sw=4:ts=4
-
 REGISTER_IMPLEMENTATION(StereoCompressorGuiFactory_impl);
 
 }
diff --git a/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp b/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp
index 5a5e2a06..5db32751 100644
--- a/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp
+++ b/arts/modules/effects/stereovolumecontrolguifactory_impl.cpp
@@ -41,5 +41,3 @@ public:
 REGISTER_IMPLEMENTATION( StereoVolumeControlGuiFactory_impl );
 
 }
-// vim: sw=4 ts=4
-
diff --git a/arts/modules/effects/synth_freeverb_impl.cc b/arts/modules/effects/synth_freeverb_impl.cpp
index a1f35d06..3b882d48 100644
--- a/arts/modules/effects/synth_freeverb_impl.cc
+++ b/arts/modules/effects/synth_freeverb_impl.cpp
@@ -20,7 +20,7 @@
 
     */
 
-#include "freeverb/revmodel.hpp"
+#include "freeverb/revmodel.h"
 #include "artsmoduleseffects.h"
 #include "stdsynthmodule.h"
 
diff --git a/arts/modules/effects/synth_stereo_compressor_impl.cc b/arts/modules/effects/synth_stereo_compressor_impl.cpp
index 2707c334..3add8d46 100644
--- a/arts/modules/effects/synth_stereo_compressor_impl.cc
+++ b/arts/modules/effects/synth_stereo_compressor_impl.cpp
@@ -127,9 +127,6 @@ private:
 	}
 
 };
-
-// vim:sw=4:ts=4
-
 REGISTER_IMPLEMENTATION(Synth_STEREO_COMPRESSOR_impl);
 
 }
diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cpp
index 8f15a4dc..8f15a4dc 100644
--- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
+++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cpp
diff --git a/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cc b/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cpp
index 390fd04e..390fd04e 100644
--- a/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cc
+++ b/arts/modules/effects/synth_stereo_pitch_shift_fft_impl.cpp
diff --git a/arts/modules/effects/synth_stereo_pitch_shift_impl.cc b/arts/modules/effects/synth_stereo_pitch_shift_impl.cpp
index fbf7bb07..fbf7bb07 100644
--- a/arts/modules/effects/synth_stereo_pitch_shift_impl.cc
+++ b/arts/modules/effects/synth_stereo_pitch_shift_impl.cpp
diff --git a/arts/modules/effects/synth_voice_removal_impl.cc b/arts/modules/effects/synth_voice_removal_impl.cpp
index e35949a0..2ade0879 100644
--- a/arts/modules/effects/synth_voice_removal_impl.cc
+++ b/arts/modules/effects/synth_voice_removal_impl.cpp
@@ -104,5 +104,3 @@ public:
 };
 
 REGISTER_IMPLEMENTATION(Synth_VOICE_REMOVAL_impl);
-
-// vim: sw=4 ts=4
diff --git a/arts/modules/effects/voiceremovalguifactory_impl.cc b/arts/modules/effects/voiceremovalguifactory_impl.cpp
index d4879b87..dc9dce20 100644
--- a/arts/modules/effects/voiceremovalguifactory_impl.cc
+++ b/arts/modules/effects/voiceremovalguifactory_impl.cpp
@@ -72,5 +72,3 @@ Widget VoiceRemovalGuiFactory_impl::createGui( Object object )
 
 	return hbox;
 }
-
-// vim: ts=4 sw=4
diff --git a/arts/modules/mixers/CMakeLists.txt b/arts/modules/mixers/CMakeLists.txt
index 98e7147d..7f6d4dc4 100644
--- a/arts/modules/mixers/CMakeLists.txt
+++ b/arts/modules/mixers/CMakeLists.txt
@@ -37,10 +37,10 @@ link_directories(
 
 tde_add_library( artsmodulesmixers SHARED
   SOURCES
-    artsmodulesmixers.cc
-    monosimplemixerchannel_impl.cc monosimplemixerchannelguifactory_impl.cc
-    simplemixerchannel_impl.cc simplemixerchannelguifactory_impl.cc
-    littlestereomixerchannel_impl.cc
+    artsmodulesmixers.cpp
+    monosimplemixerchannel_impl.cpp monosimplemixerchannelguifactory_impl.cpp
+    simplemixerchannel_impl.cpp simplemixerchannelguifactory_impl.cpp
+    littlestereomixerchannel_impl.cpp
   VERSION 0.0.0
   LINK
     artsgui_idl-shared artsmodulescommon-shared artsmoduleseffects-shared
@@ -50,7 +50,7 @@ tde_add_library( artsmodulesmixers SHARED
 
 add_custom_command(
   OUTPUT
-    artsmodulesmixers.cc artsmodulesmixers.h
+    artsmodulesmixers.cpp artsmodulesmixers.h
     artsmodulesmixers.mcopclass artsmodulesmixers.mcoptype
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/mixers/Makefile.am b/arts/modules/mixers/Makefile.am
index b504bfba..0cb0b666 100644
--- a/arts/modules/mixers/Makefile.am
+++ b/arts/modules/mixers/Makefile.am
@@ -25,10 +25,10 @@ MCOPINCLUDES = \
 
 lib_LTLIBRARIES = libartsmodulesmixers.la
 
-libartsmodulesmixers_la_SOURCES = artsmodulesmixers.cc \
-	monosimplemixerchannel_impl.cc monosimplemixerchannelguifactory_impl.cc \
-	simplemixerchannel_impl.cc simplemixerchannelguifactory_impl.cc \
-	littlestereomixerchannel_impl.cc
+libartsmodulesmixers_la_SOURCES = artsmodulesmixers.cpp \
+	monosimplemixerchannel_impl.cpp monosimplemixerchannelguifactory_impl.cpp \
+	simplemixerchannel_impl.cpp simplemixerchannelguifactory_impl.cpp \
+	littlestereomixerchannel_impl.cpp
 libartsmodulesmixers_la_COMPILE_FIRST = ../synth/artsmodulessynth.h \
 	../../midi/artsmidi.h ../common/artsmodulescommon.h ../../gui/common/artsgui.h \
 	artsmodulesmixers.h
@@ -40,10 +40,10 @@ libartsmodulesmixers_la_LIBADD = \
 
 libartsmodulesmixers_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
 
-artsmodulesmixers.cc artsmodulesmixers.h artsmodulesmixers.mcoptype artsmodulesmixers.mcopclass: $(srcdir)/artsmodulesmixers.idl $(MCOPIDL)
+artsmodulesmixers.cpp artsmodulesmixers.h artsmodulesmixers.mcoptype artsmodulesmixers.mcopclass: $(srcdir)/artsmodulesmixers.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(MCOPINCLUDES) $(srcdir)/artsmodulesmixers.idl
 
-DISTCLEANFILES= artsmodulesmixers.cc artsmodulesmixers.h artsmodulesmixers.mcop*
+DISTCLEANFILES= artsmodulesmixers.cpp artsmodulesmixers.h artsmodulesmixers.mcop*
 
 artsincludedir = $(includedir)/arts
 artsinclude_HEADERS = artsmodulesmixers.h artsmodulesmixers.idl
diff --git a/arts/modules/mixers/artsmodulesmixers.idl b/arts/modules/mixers/artsmodulesmixers.idl
index 56ff073b..dbe82c5c 100644
--- a/arts/modules/mixers/artsmodulesmixers.idl
+++ b/arts/modules/mixers/artsmodulesmixers.idl
@@ -25,7 +25,7 @@
 */
 
 /*
-* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cc/.h files)
+* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cpp/.h files)
 *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
 *
 * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/mixers/littlestereomixerchannel_impl.cc b/arts/modules/mixers/littlestereomixerchannel_impl.cpp
index 3b14fa39..3b14fa39 100644
--- a/arts/modules/mixers/littlestereomixerchannel_impl.cc
+++ b/arts/modules/mixers/littlestereomixerchannel_impl.cpp
diff --git a/arts/modules/mixers/monosimplemixerchannel_impl.cc b/arts/modules/mixers/monosimplemixerchannel_impl.cpp
index 04bad0ce..04bad0ce 100644
--- a/arts/modules/mixers/monosimplemixerchannel_impl.cc
+++ b/arts/modules/mixers/monosimplemixerchannel_impl.cpp
diff --git a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cpp
index ab35e4fc..28fbab55 100644
--- a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cpp
@@ -92,5 +92,3 @@ namespace Arts {
 	};
 	REGISTER_IMPLEMENTATION(MonoSimpleMixerChannelGuiFactory_impl);
 }
-
-// vim:ts=4:sw=4
diff --git a/arts/modules/mixers/simplemixerchannel_impl.cc b/arts/modules/mixers/simplemixerchannel_impl.cpp
index 0c00768a..0c00768a 100644
--- a/arts/modules/mixers/simplemixerchannel_impl.cc
+++ b/arts/modules/mixers/simplemixerchannel_impl.cpp
diff --git a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc b/arts/modules/mixers/simplemixerchannelguifactory_impl.cpp
index 0a36470d..73ab31e2 100644
--- a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/simplemixerchannelguifactory_impl.cpp
@@ -80,7 +80,3 @@ namespace Arts {
 	};
 	REGISTER_IMPLEMENTATION(SimpleMixerChannelGuiFactory_impl);
 }
-
-
-// vim:ts=4:sw=4
-
diff --git a/arts/modules/synth/CMakeLists.txt b/arts/modules/synth/CMakeLists.txt
index 4362aaa7..9930b55d 100644
--- a/arts/modules/synth/CMakeLists.txt
+++ b/arts/modules/synth/CMakeLists.txt
@@ -34,20 +34,20 @@ link_directories(
 
 tde_add_library( artsmodulessynth SHARED
   SOURCES
-    artsmodulessynth.cc
-    synth_xfade_impl.cc synth_autopanner_impl.cc synth_delay_impl.cc
-    synth_cdelay_impl.cc synth_envelope_adsr_impl.cc synth_pscale_impl.cc
-    synth_tremolo_impl.cc synth_fx_cflanger_impl.cc synth_compressor_impl.cc
-    synth_pitch_shift_impl.cc synth_pitch_shift_fft_impl.cc c_filter_stuff.c
-    synth_shelve_cutoff_impl.cc synth_brickwall_limiter_impl.cc
-    synth_std_equalizer_impl.cc synth_rc_impl.cc synth_moog_vcf_impl.cc
-    synth_atan_saturate_impl.cc synth_fm_source_impl.cc
-    synth_wave_tri_impl.cc synth_noise_impl.cc synth_wave_softsaw_impl.cc
-    synth_wave_square_impl.cc synth_wave_pulse_impl.cc synth_osc_impl.cc
-    synth_play_pat_impl.cc synth_capture_wav_impl.cc
-    synth_midi_test_impl.cc synth_sequence_impl.cc synth_sequence_freq_impl.cc
-    synth_midi_debug_impl.cc objectcache_impl.cc synth_nil_impl.cc
-    synth_debug_impl.cc synth_data_impl.cc synth_div_impl.cc
+    artsmodulessynth.cpp
+    synth_xfade_impl.cpp synth_autopanner_impl.cpp synth_delay_impl.cpp
+    synth_cdelay_impl.cpp synth_envelope_adsr_impl.cpp synth_pscale_impl.cpp
+    synth_tremolo_impl.cpp synth_fx_cflanger_impl.cpp synth_compressor_impl.cpp
+    synth_pitch_shift_impl.cpp synth_pitch_shift_fft_impl.cpp c_filter_stuff.c
+    synth_shelve_cutoff_impl.cpp synth_brickwall_limiter_impl.cpp
+    synth_std_equalizer_impl.cpp synth_rc_impl.cpp synth_moog_vcf_impl.cpp
+    synth_atan_saturate_impl.cpp synth_fm_source_impl.cpp
+    synth_wave_tri_impl.cpp synth_noise_impl.cpp synth_wave_softsaw_impl.cpp
+    synth_wave_square_impl.cpp synth_wave_pulse_impl.cpp synth_osc_impl.cpp
+    synth_play_pat_impl.cpp synth_capture_wav_impl.cpp
+    synth_midi_test_impl.cpp synth_sequence_impl.cpp synth_sequence_freq_impl.cpp
+    synth_midi_debug_impl.cpp objectcache_impl.cpp synth_nil_impl.cpp
+    synth_debug_impl.cpp synth_data_impl.cpp synth_div_impl.cpp
   VERSION 0.0.0
   LINK
     artsbuilder-shared artsmidi_idl-shared
@@ -57,7 +57,7 @@ tde_add_library( artsmodulessynth SHARED
 
 add_custom_command(
   OUTPUT
-    artsmodulessynth.cc artsmodulessynth.h
+    artsmodulessynth.cpp artsmodulessynth.h
     artsmodulessynth.mcopclass artsmodulessynth.mcoptype
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${CMAKE_SOURCE_DIR}/arts/gui/common
diff --git a/arts/modules/synth/Makefile.am b/arts/modules/synth/Makefile.am
index 520b33fe..211d973c 100644
--- a/arts/modules/synth/Makefile.am
+++ b/arts/modules/synth/Makefile.am
@@ -15,17 +15,17 @@ MCOP_INCLUDES= \
 
 lib_LTLIBRARIES = libartsmodulessynth.la
 
-libartsmodulessynth_la_SOURCES = artsmodulessynth.cc \
-	synth_xfade_impl.cc synth_autopanner_impl.cc synth_delay_impl.cc synth_cdelay_impl.cc \
-	synth_envelope_adsr_impl.cc synth_pscale_impl.cc \
-	synth_tremolo_impl.cc synth_fx_cflanger_impl.cc synth_compressor_impl.cc \
-	synth_pitch_shift_impl.cc synth_pitch_shift_fft_impl.cc c_filter_stuff.c synth_shelve_cutoff_impl.cc synth_brickwall_limiter_impl.cc synth_std_equalizer_impl.cc synth_rc_impl.cc synth_moog_vcf_impl.cc synth_atan_saturate_impl.cc \
-	synth_fm_source_impl.cc \
-	synth_wave_tri_impl.cc synth_noise_impl.cc synth_wave_softsaw_impl.cc synth_wave_square_impl.cc synth_wave_pulse_impl.cc synth_osc_impl.cc synth_play_pat_impl.cc \
-	synth_capture_wav_impl.cc \
-	synth_midi_test_impl.cc synth_sequence_impl.cc synth_sequence_freq_impl.cc \
-	synth_midi_debug_impl.cc objectcache_impl.cc synth_nil_impl.cc synth_debug_impl.cc synth_data_impl.cc \
-	synth_div_impl.cc
+libartsmodulessynth_la_SOURCES = artsmodulessynth.cpp \
+	synth_xfade_impl.cpp synth_autopanner_impl.cpp synth_delay_impl.cpp synth_cdelay_impl.cpp \
+	synth_envelope_adsr_impl.cpp synth_pscale_impl.cpp \
+	synth_tremolo_impl.cpp synth_fx_cflanger_impl.cpp synth_compressor_impl.cpp \
+	synth_pitch_shift_impl.cpp synth_pitch_shift_fft_impl.cpp c_filter_stuff.c synth_shelve_cutoff_impl.cpp synth_brickwall_limiter_impl.cpp synth_std_equalizer_impl.cpp synth_rc_impl.cpp synth_moog_vcf_impl.cpp synth_atan_saturate_impl.cpp \
+	synth_fm_source_impl.cpp \
+	synth_wave_tri_impl.cpp synth_noise_impl.cpp synth_wave_softsaw_impl.cpp synth_wave_square_impl.cpp synth_wave_pulse_impl.cpp synth_osc_impl.cpp synth_play_pat_impl.cpp \
+	synth_capture_wav_impl.cpp \
+	synth_midi_test_impl.cpp synth_sequence_impl.cpp synth_sequence_freq_impl.cpp \
+	synth_midi_debug_impl.cpp objectcache_impl.cpp synth_nil_impl.cpp synth_debug_impl.cpp synth_data_impl.cpp \
+	synth_div_impl.cpp
 libartsmodulessynth_la_COMPILE_FIRST = artsmodulessynth.h ../../midi/artsmidi.h
 
 libartsmodulessynth_la_LIBADD = \
@@ -36,10 +36,10 @@ libartsmodulessynth_la_LIBADD = \
 #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_TDEUI) $(LIB_TDECORE)
 libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
 
-artsmodulessynth.cc artsmodulessynth.h artsmodulessynth.mcoptype artsmodulessynth.mcopclass: $(srcdir)/artsmodulessynth.idl $(MCOPIDL)
+artsmodulessynth.cpp artsmodulessynth.h artsmodulessynth.mcoptype artsmodulessynth.mcopclass: $(srcdir)/artsmodulessynth.idl $(MCOPIDL)
 	$(MCOPIDL) -t $(MCOP_INCLUDES) $(srcdir)/artsmodulessynth.idl
 
-DISTCLEANFILES= artsmodulessynth.cc artsmodulessynth.h artsmodulessynth.mcop*
+DISTCLEANFILES= artsmodulessynth.cpp artsmodulessynth.h artsmodulessynth.mcop*
 
 artsincludedir = $(includedir)/arts
 artsinclude_HEADERS = artsmodulessynth.h artsmodulessynth.idl
diff --git a/arts/modules/synth/artsmodulessynth.idl b/arts/modules/synth/artsmodulessynth.idl
index b9ac3d46..6ba4248b 100644
--- a/arts/modules/synth/artsmodulessynth.idl
+++ b/arts/modules/synth/artsmodulessynth.idl
@@ -25,7 +25,7 @@
 */
 
 /*
-* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cc/.h files)
+* DISCLAIMER: The interfaces in artsmodules.idl (and the derived .cpp/.h files)
 *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
 *
 * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/modules/synth/objectcache_impl.cc b/arts/modules/synth/objectcache_impl.cpp
index d4d833a3..d4d833a3 100644
--- a/arts/modules/synth/objectcache_impl.cc
+++ b/arts/modules/synth/objectcache_impl.cpp
diff --git a/arts/modules/synth/synth_atan_saturate_impl.cc b/arts/modules/synth/synth_atan_saturate_impl.cpp
index 7eb0b513..7eb0b513 100644
--- a/arts/modules/synth/synth_atan_saturate_impl.cc
+++ b/arts/modules/synth/synth_atan_saturate_impl.cpp
diff --git a/arts/modules/synth/synth_autopanner_impl.cc b/arts/modules/synth/synth_autopanner_impl.cpp
index 6e3526de..6e3526de 100644
--- a/arts/modules/synth/synth_autopanner_impl.cc
+++ b/arts/modules/synth/synth_autopanner_impl.cpp
diff --git a/arts/modules/synth/synth_brickwall_limiter_impl.cc b/arts/modules/synth/synth_brickwall_limiter_impl.cpp
index aea9d66e..aea9d66e 100644
--- a/arts/modules/synth/synth_brickwall_limiter_impl.cc
+++ b/arts/modules/synth/synth_brickwall_limiter_impl.cpp
diff --git a/arts/modules/synth/synth_capture_wav_impl.cc b/arts/modules/synth/synth_capture_wav_impl.cpp
index 84e91648..84e91648 100644
--- a/arts/modules/synth/synth_capture_wav_impl.cc
+++ b/arts/modules/synth/synth_capture_wav_impl.cpp
diff --git a/arts/modules/synth/synth_cdelay_impl.cc b/arts/modules/synth/synth_cdelay_impl.cpp
index 28f4d12f..0ab3255d 100644
--- a/arts/modules/synth/synth_cdelay_impl.cc
+++ b/arts/modules/synth/synth_cdelay_impl.cpp
@@ -119,7 +119,4 @@ public:
 		}
 	}
 };
-
-// vim:sw=4:ts=4
-
 REGISTER_IMPLEMENTATION(Synth_CDELAY_impl);
diff --git a/arts/modules/synth/synth_compressor_impl.cc b/arts/modules/synth/synth_compressor_impl.cpp
index b27b2be1..b27b2be1 100644
--- a/arts/modules/synth/synth_compressor_impl.cc
+++ b/arts/modules/synth/synth_compressor_impl.cpp
diff --git a/arts/modules/synth/synth_data_impl.cc b/arts/modules/synth/synth_data_impl.cpp
index 5b95d400..5b95d400 100644
--- a/arts/modules/synth/synth_data_impl.cc
+++ b/arts/modules/synth/synth_data_impl.cpp
diff --git a/arts/modules/synth/synth_debug_impl.cc b/arts/modules/synth/synth_debug_impl.cpp
index 456f4a6f..456f4a6f 100644
--- a/arts/modules/synth/synth_debug_impl.cc
+++ b/arts/modules/synth/synth_debug_impl.cpp
diff --git a/arts/modules/synth/synth_delay_impl.cc b/arts/modules/synth/synth_delay_impl.cpp
index 92c23fd1..92c23fd1 100644
--- a/arts/modules/synth/synth_delay_impl.cc
+++ b/arts/modules/synth/synth_delay_impl.cpp
diff --git a/arts/modules/synth/synth_div_impl.cc b/arts/modules/synth/synth_div_impl.cpp
index 90c19996..90c19996 100644
--- a/arts/modules/synth/synth_div_impl.cc
+++ b/arts/modules/synth/synth_div_impl.cpp
diff --git a/arts/modules/synth/synth_envelope_adsr_impl.cc b/arts/modules/synth/synth_envelope_adsr_impl.cpp
index e6f47220..e6f47220 100644
--- a/arts/modules/synth/synth_envelope_adsr_impl.cc
+++ b/arts/modules/synth/synth_envelope_adsr_impl.cpp
diff --git a/arts/modules/synth/synth_fm_source_impl.cc b/arts/modules/synth/synth_fm_source_impl.cpp
index 2c2bd0e8..2c2bd0e8 100644
--- a/arts/modules/synth/synth_fm_source_impl.cc
+++ b/arts/modules/synth/synth_fm_source_impl.cpp
diff --git a/arts/modules/synth/synth_fx_cflanger_impl.cc b/arts/modules/synth/synth_fx_cflanger_impl.cpp
index 3f67fd7a..3f67fd7a 100644
--- a/arts/modules/synth/synth_fx_cflanger_impl.cc
+++ b/arts/modules/synth/synth_fx_cflanger_impl.cpp
diff --git a/arts/modules/synth/synth_midi_debug_impl.cc b/arts/modules/synth/synth_midi_debug_impl.cpp
index 2c4cf711..2c4cf711 100644
--- a/arts/modules/synth/synth_midi_debug_impl.cc
+++ b/arts/modules/synth/synth_midi_debug_impl.cpp
diff --git a/arts/modules/synth/synth_midi_test_impl.cc b/arts/modules/synth/synth_midi_test_impl.cpp
index 91714cac..91714cac 100644
--- a/arts/modules/synth/synth_midi_test_impl.cc
+++ b/arts/modules/synth/synth_midi_test_impl.cpp
diff --git a/arts/modules/synth/synth_moog_vcf_impl.cc b/arts/modules/synth/synth_moog_vcf_impl.cpp
index 77bf5394..77bf5394 100644
--- a/arts/modules/synth/synth_moog_vcf_impl.cc
+++ b/arts/modules/synth/synth_moog_vcf_impl.cpp
diff --git a/arts/modules/synth/synth_nil_impl.cc b/arts/modules/synth/synth_nil_impl.cpp
index db7b1942..db7b1942 100644
--- a/arts/modules/synth/synth_nil_impl.cc
+++ b/arts/modules/synth/synth_nil_impl.cpp
diff --git a/arts/modules/synth/synth_noise_impl.cc b/arts/modules/synth/synth_noise_impl.cpp
index 474368e1..474368e1 100644
--- a/arts/modules/synth/synth_noise_impl.cc
+++ b/arts/modules/synth/synth_noise_impl.cpp
diff --git a/arts/modules/synth/synth_osc_impl.cc b/arts/modules/synth/synth_osc_impl.cpp
index 214c2a16..214c2a16 100644
--- a/arts/modules/synth/synth_osc_impl.cc
+++ b/arts/modules/synth/synth_osc_impl.cpp
diff --git a/arts/modules/synth/synth_pitch_shift_fft_impl.cc b/arts/modules/synth/synth_pitch_shift_fft_impl.cpp
index f356e1b8..f356e1b8 100644
--- a/arts/modules/synth/synth_pitch_shift_fft_impl.cc
+++ b/arts/modules/synth/synth_pitch_shift_fft_impl.cpp
diff --git a/arts/modules/synth/synth_pitch_shift_impl.cc b/arts/modules/synth/synth_pitch_shift_impl.cpp
index 37217c8a..37217c8a 100644
--- a/arts/modules/synth/synth_pitch_shift_impl.cc
+++ b/arts/modules/synth/synth_pitch_shift_impl.cpp
diff --git a/arts/modules/synth/synth_play_pat_impl.cc b/arts/modules/synth/synth_play_pat_impl.cpp
index 7c2699f7..7c2699f7 100644
--- a/arts/modules/synth/synth_play_pat_impl.cc
+++ b/arts/modules/synth/synth_play_pat_impl.cpp
diff --git a/arts/modules/synth/synth_pscale_impl.cc b/arts/modules/synth/synth_pscale_impl.cpp
index 72298397..72298397 100644
--- a/arts/modules/synth/synth_pscale_impl.cc
+++ b/arts/modules/synth/synth_pscale_impl.cpp
diff --git a/arts/modules/synth/synth_rc_impl.cc b/arts/modules/synth/synth_rc_impl.cpp
index 12b30260..ce0252ea 100644
--- a/arts/modules/synth/synth_rc_impl.cc
+++ b/arts/modules/synth/synth_rc_impl.cpp
@@ -60,7 +60,7 @@ public:
 
 		if (zero_lower < invalue[0] && invalue[0] < zero_upper)
 		{
-			/* for comments see equalizer.cc/Synth_STD_EQUALIZER implementation */
+			/* for comments see equalizer.cpp/Synth_STD_EQUALIZER implementation */
 			
 			/*
 			 * This implementation differs from the implementation there,
diff --git a/arts/modules/synth/synth_sequence_freq_impl.cc b/arts/modules/synth/synth_sequence_freq_impl.cpp
index 0014d535..e3458d74 100644
--- a/arts/modules/synth/synth_sequence_freq_impl.cc
+++ b/arts/modules/synth/synth_sequence_freq_impl.cpp
@@ -128,4 +128,3 @@ public:
 };
 
 REGISTER_IMPLEMENTATION(Synth_SEQUENCE_FREQ_impl);
-// vim: sw=4 ts=4 noet
diff --git a/arts/modules/synth/synth_sequence_impl.cc b/arts/modules/synth/synth_sequence_impl.cpp
index 981f0bba..dc2588f5 100644
--- a/arts/modules/synth/synth_sequence_impl.cc
+++ b/arts/modules/synth/synth_sequence_impl.cpp
@@ -129,4 +129,3 @@ public:
 };
 
 REGISTER_IMPLEMENTATION(Synth_SEQUENCE_impl);
-// vim: sw=4 ts=4 noet
diff --git a/arts/modules/synth/synth_shelve_cutoff_impl.cc b/arts/modules/synth/synth_shelve_cutoff_impl.cpp
index 01880b6c..01880b6c 100644
--- a/arts/modules/synth/synth_shelve_cutoff_impl.cc
+++ b/arts/modules/synth/synth_shelve_cutoff_impl.cpp
diff --git a/arts/modules/synth/synth_std_equalizer_impl.cc b/arts/modules/synth/synth_std_equalizer_impl.cpp
index be88a708..be88a708 100644
--- a/arts/modules/synth/synth_std_equalizer_impl.cc
+++ b/arts/modules/synth/synth_std_equalizer_impl.cpp
diff --git a/arts/modules/synth/synth_tremolo_impl.cc b/arts/modules/synth/synth_tremolo_impl.cpp
index 37b42302..37b42302 100644
--- a/arts/modules/synth/synth_tremolo_impl.cc
+++ b/arts/modules/synth/synth_tremolo_impl.cpp
diff --git a/arts/modules/synth/synth_wave_pulse_impl.cc b/arts/modules/synth/synth_wave_pulse_impl.cpp
index f179b376..f179b376 100644
--- a/arts/modules/synth/synth_wave_pulse_impl.cc
+++ b/arts/modules/synth/synth_wave_pulse_impl.cpp
diff --git a/arts/modules/synth/synth_wave_softsaw_impl.cc b/arts/modules/synth/synth_wave_softsaw_impl.cpp
index 5765250d..5765250d 100644
--- a/arts/modules/synth/synth_wave_softsaw_impl.cc
+++ b/arts/modules/synth/synth_wave_softsaw_impl.cpp
diff --git a/arts/modules/synth/synth_wave_square_impl.cc b/arts/modules/synth/synth_wave_square_impl.cpp
index c5693b18..c5693b18 100644
--- a/arts/modules/synth/synth_wave_square_impl.cc
+++ b/arts/modules/synth/synth_wave_square_impl.cpp
diff --git a/arts/modules/synth/synth_wave_tri_impl.cc b/arts/modules/synth/synth_wave_tri_impl.cpp
index 2333d31c..2333d31c 100644
--- a/arts/modules/synth/synth_wave_tri_impl.cc
+++ b/arts/modules/synth/synth_wave_tri_impl.cpp
diff --git a/arts/modules/synth/synth_xfade_impl.cc b/arts/modules/synth/synth_xfade_impl.cpp
index dcbb2290..dcbb2290 100644
--- a/arts/modules/synth/synth_xfade_impl.cc
+++ b/arts/modules/synth/synth_xfade_impl.cpp
diff --git a/arts/runtime/CMakeLists.txt b/arts/runtime/CMakeLists.txt
index 794ec7f5..ac8692c4 100644
--- a/arts/runtime/CMakeLists.txt
+++ b/arts/runtime/CMakeLists.txt
@@ -31,9 +31,9 @@ add_definitions(
 
 tde_add_library( artsbuilder SHARED
   SOURCES
-    artsbuilder.cc sequenceutils.cc
-    structurebuilder_impl.cc structures_impl.cc moduleinfo.cc
-    compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
+    artsbuilder.cpp sequenceutils.cpp
+    structurebuilder_impl.cpp structures_impl.cpp moduleinfo.cpp
+    compatibility.cpp localfactory_impl.cpp artsbuilderloader_impl.cpp
   VERSION 0.0.0
   LINK
     mcop artsflow artsflow_idl ${DL_LIBRARIES} ${ARTS_LIBRARIES}
@@ -42,7 +42,7 @@ tde_add_library( artsbuilder SHARED
 
 add_custom_command(
   OUTPUT
-    artsbuilder.cc artsbuilder.h
+    artsbuilder.cpp artsbuilder.h
     artsbuilder.mcoptype artsbuilder.mcopclass
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artsbuilder.idl
diff --git a/arts/runtime/Makefile.am b/arts/runtime/Makefile.am
index d97ad50b..5a883d83 100644
--- a/arts/runtime/Makefile.am
+++ b/arts/runtime/Makefile.am
@@ -7,9 +7,9 @@ INCLUDES= -I$(arts_includes) $(all_includes)
 
 lib_LTLIBRARIES = libartsbuilder.la
 
-libartsbuilder_la_SOURCES = artsbuilder.cc sequenceutils.cc \
-  structurebuilder_impl.cc structures_impl.cc moduleinfo.cc \
-  compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
+libartsbuilder_la_SOURCES = artsbuilder.cpp sequenceutils.cpp \
+  structurebuilder_impl.cpp structures_impl.cpp moduleinfo.cpp \
+  compatibility.cpp localfactory_impl.cpp artsbuilderloader_impl.cpp
 
 libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL) -lartsflow_idl
 libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
@@ -19,10 +19,10 @@ libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
 artsbuilder.lo: artsbuilder.h
 artsbuilder.mcopclass: artsbuilder.h
 artsbuilder.mcoptype: artsbuilder.h
-artsbuilder.h artsbuilder.cc: $(srcdir)/artsbuilder.idl $(MCOPIDL)
+artsbuilder.h artsbuilder.cpp: $(srcdir)/artsbuilder.idl $(MCOPIDL)
 	$(MCOPIDL) -t -I$(arts_includes) $(srcdir)/artsbuilder.idl
 
-DISTCLEANFILES = artsbuilder.cc artsbuilder.h \
+DISTCLEANFILES = artsbuilder.cpp artsbuilder.h \
   artsbuilder.mcoptype artsbuilder.mcopclass
 
 ####### install idl files
diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl
index 42ff393a..4cc62329 100644
--- a/arts/runtime/artsbuilder.idl
+++ b/arts/runtime/artsbuilder.idl
@@ -1,5 +1,5 @@
 /*
- * DISCLAIMER: The interfaces in artsbuilder.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in artsbuilder.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/runtime/artsbuilderloader_impl.cc b/arts/runtime/artsbuilderloader_impl.cpp
index 238daae2..238daae2 100644
--- a/arts/runtime/artsbuilderloader_impl.cc
+++ b/arts/runtime/artsbuilderloader_impl.cpp
diff --git a/arts/runtime/compatibility.cc b/arts/runtime/compatibility.cpp
index 72bed765..72bed765 100644
--- a/arts/runtime/compatibility.cc
+++ b/arts/runtime/compatibility.cpp
diff --git a/arts/runtime/localfactory_impl.cc b/arts/runtime/localfactory_impl.cpp
index bf55271c..bf55271c 100644
--- a/arts/runtime/localfactory_impl.cc
+++ b/arts/runtime/localfactory_impl.cpp
diff --git a/arts/runtime/moduleinfo.cc b/arts/runtime/moduleinfo.cpp
index 7bef4464..7bef4464 100644
--- a/arts/runtime/moduleinfo.cc
+++ b/arts/runtime/moduleinfo.cpp
diff --git a/arts/runtime/sequenceutils.cc b/arts/runtime/sequenceutils.cpp
index 335287d4..335287d4 100644
--- a/arts/runtime/sequenceutils.cc
+++ b/arts/runtime/sequenceutils.cpp
diff --git a/arts/runtime/structurebuilder_impl.cc b/arts/runtime/structurebuilder_impl.cpp
index 43e5485c..43e5485c 100644
--- a/arts/runtime/structurebuilder_impl.cc
+++ b/arts/runtime/structurebuilder_impl.cpp
diff --git a/arts/runtime/structures_impl.cc b/arts/runtime/structures_impl.cpp
index 7c5a5e05..7c5a5e05 100644
--- a/arts/runtime/structures_impl.cc
+++ b/arts/runtime/structures_impl.cpp
diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp
index d5c5f071..226c0bad 100644
--- a/arts/tools/artsactions.cpp
+++ b/arts/tools/artsactions.cpp
@@ -62,52 +62,52 @@ ArtsActions::~ArtsActions() {
 }
 
 TDEAction* ArtsActions::actionScopeView() {
-	if ( !_a_sv ) _a_sv = new TDEAction( i18n( "&FFT Scope" ), "artsfftscope", TDEShortcut(), this, TQT_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" );
+	if ( !_a_sv ) _a_sv = new TDEAction( i18n( "&FFT Scope" ), "artsfftscope", TDEShortcut(), this, TQ_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" );
 	return _a_sv;
 }
 TDEAction* ArtsActions::actionAudioManager() {
-	if ( !_a_am ) _a_am = new TDEAction( i18n( "&Audio Manager" ), "artsaudiomanager", TDEShortcut(), this, TQT_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" );
+	if ( !_a_am ) _a_am = new TDEAction( i18n( "&Audio Manager" ), "artsaudiomanager", TDEShortcut(), this, TQ_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" );
 	return _a_am;
 }
 TDEAction* ArtsActions::actionArtsStatusView() {
-	if ( !_a_asv ) _a_asv = new TDEAction( i18n( "aRts &Status" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" );
+	if ( !_a_asv ) _a_asv = new TDEAction( i18n( "aRts &Status" ), "artscontrol", TDEShortcut(), this, TQ_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" );
 	return _a_asv;
 }
 TDEAction* ArtsActions::actionMidiManagerView() {
-	if ( !_a_mmv ) _a_mmv = new TDEAction( i18n( "&MIDI Manager" ), "artsmidimanager", TDEShortcut(), this, TQT_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" );
+	if ( !_a_mmv ) _a_mmv = new TDEAction( i18n( "&MIDI Manager" ), "artsmidimanager", TDEShortcut(), this, TQ_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" );
 	return _a_mmv;
 }
 TDEAction* ArtsActions::actionEnvironmentView() {
-	if ( !_a_ev ) _a_ev = new TDEAction( i18n( "&Environment" ), "artsenvironment", TDEShortcut(), this, TQT_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" );
+	if ( !_a_ev ) _a_ev = new TDEAction( i18n( "&Environment" ), "artsenvironment", TDEShortcut(), this, TQ_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" );
 	return _a_ev;
 }
 TDEAction* ArtsActions::actionMediaTypesView() {
-	if ( !_a_mtv ) _a_mtv = new TDEAction( i18n( "Available Media &Types" ), "artsmediatypes", TDEShortcut(), this, TQT_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" );
+	if ( !_a_mtv ) _a_mtv = new TDEAction( i18n( "Available Media &Types" ), "artsmediatypes", TDEShortcut(), this, TQ_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" );
 	return _a_mtv;
 }
 
 TDEAction* ArtsActions::actionStyleNormal() {
-	if ( !_a_style_normal ) _a_style_normal = new TDEAction( i18n( "Style: NormalBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" );
+	if ( !_a_style_normal ) _a_style_normal = new TDEAction( i18n( "Style: NormalBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" );
 	return _a_style_normal;
 }
 TDEAction* ArtsActions::actionStyleFire() {
-	if ( !_a_style_fire ) _a_style_fire = new TDEAction( i18n( "Style: FireBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" );
+	if ( !_a_style_fire ) _a_style_fire = new TDEAction( i18n( "Style: FireBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" );
 	return _a_style_fire;
 }
 TDEAction* ArtsActions::actionStyleLine() {
-	if ( !_a_style_line ) _a_style_line = new TDEAction( i18n( "Style: LineBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" );
+	if ( !_a_style_line ) _a_style_line = new TDEAction( i18n( "Style: LineBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" );
 	return _a_style_line;
 }
 TDEAction* ArtsActions::actionStyleLED() {
-	if ( !_a_style_led ) _a_style_led = new TDEAction( i18n( "Style: LEDs" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" );
+	if ( !_a_style_led ) _a_style_led = new TDEAction( i18n( "Style: LEDs" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" );
 	return _a_style_led;
 }
 TDEAction* ArtsActions::actionStyleAnalog() {
-	if ( !_a_style_analog ) _a_style_analog = new TDEAction( i18n( "Style: Analog" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" );
+	if ( !_a_style_analog ) _a_style_analog = new TDEAction( i18n( "Style: Analog" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" );
 	return _a_style_analog;
 }
 TDEAction* ArtsActions::actionStyleSmall() {
-	if ( !_a_style_small ) _a_style_small = new TDEAction( i18n( "Style: Small" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" );
+	if ( !_a_style_small ) _a_style_small = new TDEAction( i18n( "Style: Small" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" );
 	return _a_style_small;
 }
 TDEPopupMenu* ArtsActions::stylemenu() {
@@ -136,7 +136,7 @@ TDEAction* ArtsActions::actionLessBars( const TQObject* receiver, const char* sl
 void ArtsActions::viewScopeView() {
 	if ( !_sv ) {
 		_sv = new FFTScopeView( _kartsserver->server() );
-		connect( _sv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewScopeView() ) );
+		connect( _sv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewScopeView() ) );
 	} else {
 		delete _sv;
 		_sv = 0;
@@ -145,7 +145,7 @@ void ArtsActions::viewScopeView() {
 void ArtsActions::viewAudioManager() {
 	if ( !_am ) {
 		_am = new Gui_AUDIO_MANAGER();
-		connect( _am, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewAudioManager() ) );
+		connect( _am, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewAudioManager() ) );
 	} else {
 		delete _am;
 		_am = 0;
@@ -154,7 +154,7 @@ void ArtsActions::viewAudioManager() {
 void ArtsActions::viewArtsStatusView() {
 	if ( !_asv ) {
 		_asv = new ArtsStatusView( _kartsserver->server() );
-		connect( _asv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewArtsStatusView() ) );
+		connect( _asv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewArtsStatusView() ) );
 	} else {
 		delete _asv;
 		_asv = 0;
@@ -163,7 +163,7 @@ void ArtsActions::viewArtsStatusView() {
 void ArtsActions::viewMidiManagerView() {
 	if ( !_mmv ) {
 		_mmv = new MidiManagerView();
-		connect( _mmv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewMidiManagerView() ) );
+		connect( _mmv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewMidiManagerView() ) );
 	} else {
 		delete _mmv;
 		_mmv = 0;
@@ -172,7 +172,7 @@ void ArtsActions::viewMidiManagerView() {
 void ArtsActions::viewEnvironmentView() {
 	if ( !_ev ) {
 		_ev = new EnvironmentView( defaultEnvironment() );
-		connect( _ev, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewEnvironmentView() ) );
+		connect( _ev, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewEnvironmentView() ) );
 	} else {
 		delete _ev;
 		_ev = 0;
@@ -181,7 +181,7 @@ void ArtsActions::viewEnvironmentView() {
 void ArtsActions::viewMediaTypesView() {
 	if ( !_mtv ) {
 		_mtv = new MediaTypesView();
-		connect( _mtv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewMediaTypesView() ) );
+		connect( _mtv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewMediaTypesView() ) );
 	} else {
 		delete _mtv;
 		_mtv = 0;
diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h
index b3005aa6..5bba632d 100644
--- a/arts/tools/artsactions.h
+++ b/arts/tools/artsactions.h
@@ -36,7 +36,7 @@ class MediaTypesView;
 
 class KDE_EXPORT ArtsActions : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	/**
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index 2697ff69..bada9d2c 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -61,7 +61,7 @@ ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int
 
 	p->layout->activate();
 
-	TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) );
+	TQTimer::singleShot( 100, this, TQ_SLOT( supdatelayout() ) );
 
 kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl;
 }
@@ -107,7 +107,7 @@ void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) {
 
 void ArtsControlApplet::mousePressEvent( TQMouseEvent* ev ) {
 	//kdDebug()<<"ArtsControlApplet::mousePressEvent( TQMouseEvent* "<<ev<<" )"<<endl;
-	if ( Qt::RightButton == ev->button() /*|| Qt::LeftButton == ev->button()*/ )
+	if ( TQt::RightButton == ev->button() /*|| TQt::LeftButton == ev->button()*/ )
 		p->menu->exec( TQCursor::pos() );
 }
 
@@ -139,7 +139,7 @@ kdDebug() << k_funcinfo << endl;
 	if ( !svinline ) {
 		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() ) );
+		connect( svinline, TQ_SIGNAL( closed() ), this, TQ_SLOT( SVinline() ) );
 		layout->addWidget( svinline );
 	} else {
 		delete svinline;
@@ -157,7 +157,5 @@ void ArtsControlAppletPrivate::styleLineBars()   { vu.left().style( Arts::lmLine
 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(); }
-
-// vim: sw=4 ts=4
 #include "artscontrolapplet.moc"
 #include "artscontrolapplet_private.moc"
diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h
index 515e4fb4..3e894870 100644
--- a/arts/tools/artscontrolapplet.h
+++ b/arts/tools/artscontrolapplet.h
@@ -30,7 +30,7 @@ class ArtsControlAppletPrivate;
 
 class ArtsControlApplet : public KPanelApplet
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	/**
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index 0cb5e140..7d14f458 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -46,7 +46,7 @@
 class VolumeSlider;
 
 class KDE_EXPORT ArtsControlAppletPrivate : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	ArtsControlApplet *_parent;
@@ -83,7 +83,7 @@ public:
 		menu = new TDEPopupMenu( 0 );
 		_showSV = _artsactions->actionScopeView();
 		_showSV->plug( menu );
-		_showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( SVinline() ), this );
+		_showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQ_SLOT( SVinline() ), this );
 		_showSVinline->plug( menu );
 		_showAM = _artsactions->actionAudioManager();
 		_showAM->plug( menu );
@@ -97,12 +97,12 @@ public:
 		_showMediaTypes->plug( menu );
 		menu->insertSeparator();
 		menu->insertItem( i18n( "VU-Style" ), _artsactions->stylemenu() );
-		connect( _artsactions, TQT_SIGNAL( styleNormal() ), this, TQT_SLOT( styleNormalBars() ) );
-		connect( _artsactions, TQT_SIGNAL( styleFire() ), this, TQT_SLOT( styleFireBars() ) );
-		connect( _artsactions, TQT_SIGNAL( styleLine() ), this, TQT_SLOT( styleLineBars() ) );
-		connect( _artsactions, TQT_SIGNAL( styleLED() ), this, TQT_SLOT( styleLEDs() ) );
-		connect( _artsactions, TQT_SIGNAL( styleAnalog() ), this, TQT_SLOT( styleAnalog() ) );
-		connect( _artsactions, TQT_SIGNAL( styleSmall() ), this, TQT_SLOT( styleSmall() ) );
+		connect( _artsactions, TQ_SIGNAL( styleNormal() ), this, TQ_SLOT( styleNormalBars() ) );
+		connect( _artsactions, TQ_SIGNAL( styleFire() ), this, TQ_SLOT( styleFireBars() ) );
+		connect( _artsactions, TQ_SIGNAL( styleLine() ), this, TQ_SLOT( styleLineBars() ) );
+		connect( _artsactions, TQ_SIGNAL( styleLED() ), this, TQ_SLOT( styleLEDs() ) );
+		connect( _artsactions, TQ_SIGNAL( styleAnalog() ), this, TQ_SLOT( styleAnalog() ) );
+		connect( _artsactions, TQ_SIGNAL( styleSmall() ), this, TQ_SLOT( styleSmall() ) );
 	}
 	~ArtsControlAppletPrivate() {
 		if ( svinline ) SVinline();
@@ -118,6 +118,4 @@ public slots:
 	void styleAnalog();
 	void styleSmall();
 };
-
-// vim: sw=4 ts=4
 #endif
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index 542abec1..10f901ee 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -55,7 +55,7 @@ Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Tem
 
 	TQTimer *updatetimer = new TQTimer(this);
 	updatetimer->start(500);
-	TQObject::connect(updatetimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(tick()));
+	TQObject::connect(updatetimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(tick()));
 }
 
 Gui_AUDIO_MANAGER::~Gui_AUDIO_MANAGER()
@@ -103,8 +103,8 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
 
 	listview->setMinimumSize(300,100);
 
-	TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy,
-								TQT_SLOT(edit(TQListViewItem *)));
+	TQObject::connect(listview,TQ_SIGNAL(executed(TQListViewItem *)),proxy,
+								TQ_SLOT(edit(TQListViewItem *)));
 
 	mainlayout->addWidget(listview);
 
@@ -194,5 +194,3 @@ AudioManagerItem::~AudioManagerItem()
 	//
 }
 #include "audiomanager.moc"
-
-// vim: sw=4 ts=4
diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h
index d787cf37..1378e702 100644
--- a/arts/tools/audiomanager.h
+++ b/arts/tools/audiomanager.h
@@ -36,7 +36,7 @@ class TQBoxLayout;
 
 class Gui_AUDIO_MANAGER : public Template_ArtsView
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	TQWidget *ParentWidget;
@@ -59,7 +59,7 @@ public slots:
 };
 
 class GuiAudioManagerProxy :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	Gui_AUDIO_MANAGER *gim;
 public:
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index 24e233e4..e3a533a7 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -105,7 +105,7 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 	TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this );
 	layout2->addWidget( newbuslabel );
 	lineedit = new KLineEdit( this );
-	connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) );
+	connect( lineedit, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( textChanged( const TQString & ) ) );
 	layout2->addWidget( lineedit );
 
 // hruler
@@ -126,15 +126,15 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TQPushButton * okbutton = bbox->addButton(KStdGuiItem::ok());
 	okbutton->setDefault( true );
-	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
 
 	TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
-	connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+	connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
 
 	bbox->layout();
 
@@ -180,5 +180,3 @@ void ChooseBusDlg::textChanged( const TQString & busname )
 }
 
 #include "choosebusdlg.moc"
-
-// vim: sw=4 ts=4
diff --git a/arts/tools/choosebusdlg.h b/arts/tools/choosebusdlg.h
index 49829b5b..7282811e 100644
--- a/arts/tools/choosebusdlg.h
+++ b/arts/tools/choosebusdlg.h
@@ -29,7 +29,7 @@ class KLineEdit;
 class TQPushButton;
 
 class ChooseBusDlg :public KDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 	TQListBox *listbox;
 	KLineEdit * lineedit;
@@ -46,5 +46,3 @@ protected slots:
 	void textChanged( const TQString & );
 };
 #endif
-
-// vim: sw=4 ts=4
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index aca373e9..1e223629 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -71,25 +71,25 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c
         defaultEnvFileName.replace('~', TQDir::homeDirPath());
         listBox = new TDEListBox(this);
 	update();
-	connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)),
-			this,TQT_SLOT(view(TQListBoxItem*)));
+	connect(listBox,TQ_SIGNAL(executed(TQListBoxItem*)),
+			this,TQ_SLOT(view(TQListBoxItem*)));
 	
 	TQPushButton *mixerButton = new TQPushButton(i18n("Add Mixer"), this);
-	connect(mixerButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addMixer()));
+	connect(mixerButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addMixer()));
 
 	TQPushButton *effectRackButton = new TQPushButton(i18n("Add Effect Rack"), this);
-	connect(effectRackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEffectRack()));
+	connect(effectRackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addEffectRack()));
 
 	TQPushButton *delButton = new TQPushButton(i18n("Delete Item"), this);
-	connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delItem()));
+	connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(delItem()));
 
 	TQPushButton *loadButton = new
 		TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this);
-	connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load()));
+	connect(loadButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(load()));
 
 	TQPushButton *saveButton = new
 		TQPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this);
-	connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save()));
+	connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(save()));
 	show();
 }
 
diff --git a/arts/tools/environmentview.h b/arts/tools/environmentview.h
index 792ae2f8..a0c2b578 100644
--- a/arts/tools/environmentview.h
+++ b/arts/tools/environmentview.h
@@ -32,7 +32,7 @@ class TQListBoxItem;
 class TDEListBox;
 
 class EnvironmentView : public Template_ArtsView {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	Arts::Environment::Container container;
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index d998c41a..975b2943 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -77,23 +77,23 @@ kdDebug()<<k_funcinfo<<endl;
 
 	updatetimer = new TQTimer( this );
 	updatetimer->start( 100 );
-	connect( updatetimer,TQT_SIGNAL( timeout() ),this,TQT_SLOT( updateScope() ) );
+	connect( updatetimer,TQ_SIGNAL( timeout() ),this,TQ_SLOT( updateScope() ) );
 
 	_artsactions = new ArtsActions( 0, 0, this );
-	_moreBars = ArtsActions::actionMoreBars( TQT_TQOBJECT(this), TQT_SLOT( moreBars() ), 0 );
-	_lessBars = ArtsActions::actionLessBars( TQT_TQOBJECT(this), TQT_SLOT( lessBars() ), 0 );
+	_moreBars = ArtsActions::actionMoreBars( this, TQ_SLOT( moreBars() ), 0 );
+	_lessBars = ArtsActions::actionLessBars( this, TQ_SLOT( lessBars() ), 0 );
 	_menu = new TDEPopupMenu( 0 );
 	_moreBars->plug( _menu ); _lessBars->plug( _menu );
-	_substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) );
+	_substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), this, TQ_SLOT( substyle() ), this );
 	_substyle->plug( _menu );
 	_menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() );
 
-	connect( _artsactions, TQT_SIGNAL( styleNormal() ), this, TQT_SLOT( styleNormalBars() ) );
-	connect( _artsactions, TQT_SIGNAL( styleFire() ), this, TQT_SLOT( styleFireBars() ) );
-	connect( _artsactions, TQT_SIGNAL( styleLine() ), this, TQT_SLOT( styleLineBars() ) );
-	connect( _artsactions, TQT_SIGNAL( styleLED() ), this, TQT_SLOT( styleLEDs() ) );
-	connect( _artsactions, TQT_SIGNAL( styleAnalog() ), this, TQT_SLOT( styleAnalog() ) );
-	connect( _artsactions, TQT_SIGNAL( styleSmall() ), this, TQT_SLOT( styleSmall() ) );
+	connect( _artsactions, TQ_SIGNAL( styleNormal() ), this, TQ_SLOT( styleNormalBars() ) );
+	connect( _artsactions, TQ_SIGNAL( styleFire() ), this, TQ_SLOT( styleFireBars() ) );
+	connect( _artsactions, TQ_SIGNAL( styleLine() ), this, TQ_SLOT( styleLineBars() ) );
+	connect( _artsactions, TQ_SIGNAL( styleLED() ), this, TQ_SLOT( styleLEDs() ) );
+	connect( _artsactions, TQ_SIGNAL( styleAnalog() ), this, TQ_SLOT( styleAnalog() ) );
+	connect( _artsactions, TQ_SIGNAL( styleSmall() ), this, TQ_SLOT( styleSmall() ) );
 }
 
 FFTScopeView::~FFTScopeView() {
@@ -122,7 +122,7 @@ void FFTScopeView::updateScope() {
 }
 
 void FFTScopeView::mousePressEvent( TQMouseEvent* ev ) {
-	if ( Qt::RightButton == ev->button() /*|| Qt::LeftButton == ev->button()*/ )
+	if ( TQt::RightButton == ev->button() /*|| TQt::LeftButton == ev->button()*/ )
 		_menu->exec(  TQCursor::pos() );
 }
 
@@ -159,5 +159,3 @@ void FFTScopeView::substyle() {
 }
 
 #include "fftscopeview.moc"
-// vim: sw=4 ts=4
-
diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h
index 723f14a4..0a0a93cb 100644
--- a/arts/tools/fftscopeview.h
+++ b/arts/tools/fftscopeview.h
@@ -39,7 +39,7 @@ class KArtsWidget;
 class ArtsActions;
 
 class KDE_EXPORT FFTScopeView : public Template_ArtsView {
-   Q_OBJECT
+   TQ_OBJECT
   
 protected:
 	Arts::StereoFFTScope scopefx;
@@ -77,6 +77,4 @@ public slots:
 	void styleSmall();
 	void substyle();
 };
-
-// vim: sw=4 ts=4
 #endif
diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h
index 475a096a..24b0c374 100644
--- a/arts/tools/levelmeters.h
+++ b/arts/tools/levelmeters.h
@@ -43,7 +43,7 @@ inline float DBToLevel(float db) {
  * Base class for a single volume / value bar.
  */
 class ACLevelMeter : public TQFrame {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	ACLevelMeter(TQWidget *parent): TQFrame(parent) {}
@@ -55,7 +55,7 @@ public slots:
  * Base class for a pair of volume / value bars.
  */
 class StereoLevelMeter : public TQFrame {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	StereoLevelMeter(TQWidget *parent): TQFrame(parent) {}
@@ -68,7 +68,7 @@ public slots:
  * milliseconds and displays a full bar with optional max/min markers.
  */
 class PeakBar : public ACLevelMeter {
-	Q_OBJECT
+	TQ_OBJECT
   
 	bool clipped;
 
@@ -104,7 +104,7 @@ public:
  * Special class which draws the Db scale with ticks, numbers and so on.
  */
 class ScaleView : public TQFrame {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	TQFont font;
@@ -124,7 +124,7 @@ public:
  * options like Db range, whether minimal values are also shown and others.
  */
 class PeakLevelMeters : public StereoLevelMeter {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	int dbRange;
@@ -147,7 +147,7 @@ class KLed;
  * case it's all blue. (Original artscontrol widget by stw.)
  */
 class LedMeter : public ACLevelMeter {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	KLed *leds[12];
@@ -161,7 +161,7 @@ public:
  * A simple pair of LedMeters.
  */
 class StereoLedMeters : public StereoLevelMeter {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	LedMeter left, right;
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index b651c625..74a9ed6f 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -87,7 +87,7 @@ VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent)
 	, server( artsserver )
 {
 
-	connect( server, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( initaRtsConnections() ) );
+	connect( server, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( initaRtsConnections() ) );
 /*   	if(server.isNull())
    	{
 		KMessageBox::error( 0, i18n("Connection to the soundserver failed - make sure that artsd is really running and that your tdelibs version is not older than tdemultimedia."));
@@ -136,7 +136,7 @@ void VControl::useOldVolumeBar(int old) {
 void VControl::showFreeVerbView() {
 	if(!freeVerbView) {
 		freeVerbView = new FreeVerbView(server->server());
-		connect(freeVerbView,TQT_SIGNAL(closed()),this,TQT_SLOT(showFreeVerbView()));
+		connect(freeVerbView,TQ_SIGNAL(closed()),this,TQ_SLOT(showFreeVerbView()));
 	} else {
 		delete freeVerbView;
 		freeVerbView = 0;
@@ -158,9 +158,9 @@ void MainWindow::toggleVolumeBar() {
 	vc->useOldVolumeBar(showOldVolumeDisplay->isChecked());
 }
 
-MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) {
+MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( this ) ) {
 kdDebug() << k_funcinfo << endl;
-	connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) );
+	connect( kartsserver, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( serverRestarted() ) );
 
 	vc = new VControl( kartsserver, this );
 	setCentralWidget( vc );
@@ -172,11 +172,11 @@ kdDebug() << k_funcinfo << endl;
 	( void ) artsactions->actionMidiManagerView();
 	( void ) artsactions->actionEnvironmentView();
 	( void ) artsactions->actionMediaTypesView();
-	( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
+	( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, vc, TQ_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
 	showOldVolumeDisplay=
-		new TDEToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this),
-		TQT_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" );
-	( void ) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
+		new TDEToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, this,
+		TQ_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" );
+	( void ) KStdAction::quit( this, TQ_SLOT( close() ), actionCollection(), "quit_artscontrol" );
 
 	createGUI("artscontrol.rc");
 	resize(20,300);
diff --git a/arts/tools/main.h b/arts/tools/main.h
index ef349216..13496756 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -48,7 +48,7 @@ class PeakLevelMeter;
 class VScale;
 
 class FreeVerbView : public TQWidget {
-	Q_OBJECT
+	TQ_OBJECT
 	
 protected:
 	Arts::Synth_FREEVERB freeverb;
@@ -66,7 +66,7 @@ signals:
 class KArtsWidget;
 
 class VControl : public TQFrame {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	class StereoLevelMeter *stereoMeter;
@@ -92,7 +92,7 @@ private slots:
 #include "artsactions.h"
 
 class MainWindow : public TDEMainWindow {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	VControl *vc;
diff --git a/arts/tools/mediatypesview.h b/arts/tools/mediatypesview.h
index 44cfb95a..4c7e4d63 100644
--- a/arts/tools/mediatypesview.h
+++ b/arts/tools/mediatypesview.h
@@ -27,7 +27,7 @@
 #include "templateview.h"
 
 class MediaTypesView : public Template_ArtsView {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	MediaTypesView( TQWidget* =0, const char* =0 );
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 6d155b06..f07a7b8f 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -135,11 +135,11 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
-	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
 
 	bbox->layout();
 
diff --git a/arts/tools/midiinstdlg.h b/arts/tools/midiinstdlg.h
index 5fecce3f..03f08de7 100644
--- a/arts/tools/midiinstdlg.h
+++ b/arts/tools/midiinstdlg.h
@@ -27,7 +27,7 @@
 #include <tqcstring.h>
 
 class MidiInstDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 	TQComboBox *box;
 public:
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index b32c09f2..4e92c000 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -115,21 +115,21 @@ MidiManagerView::MidiManagerView()
 {
 	TQTimer *updatetimer = new TQTimer(this);
 	updatetimer->start(5000);
-	connect(updatetimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateLists()));
+	connect(updatetimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateLists()));
 
 	widget = new MidiManagerWidget(this);
 	setCentralWidget(widget);
 	setCaption(i18n("MIDI Manager"));
 	setIcon( MainBarIcon( "artsfftscope", 32 ) );
 
-	(void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()),
+	(void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, this, TQ_SLOT(addOSSMidiPort()),
 		  actionCollection(), "add_oss_midi_port");
-	(void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this),
-		  TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output");
+	(void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, this,
+		  TQ_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output");
 
-	(void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
-	connect(widget->connectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotConnect()));
-	connect(widget->disconnectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDisconnect()));
+	(void) KStdAction::quit( this, TQ_SLOT(close()), actionCollection());
+	connect(widget->connectButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConnect()));
+	connect(widget->disconnectButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDisconnect()));
 
 	connectionWidget = new ConnectionWidget(this, widget->connectionFrame);
 	connectionWidget->setMinimumSize(60,10);
diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h
index e5cd1467..eec8d0b0 100644
--- a/arts/tools/midimanagerview.h
+++ b/arts/tools/midimanagerview.h
@@ -35,7 +35,7 @@ class MidiManagerItem;
 class MidiManagerWidget;
 
 class MidiManagerView : public TDEMainWindow {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	friend class ConnectionWidget;
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 1273bf58..5c20e2bf 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -80,13 +80,13 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
 	bbox->addStretch(1);
 	helpbutton->setAutoDefault( true );
 	helpbutton->setDefault( true );
 
 	TQPushButton *okbutton = bbox->addButton(KStdGuiItem::ok());
-	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
 	okbutton->setAutoDefault( true );
 	okbutton->setDefault( true );
 
diff --git a/arts/tools/midiportdlg.h b/arts/tools/midiportdlg.h
index e34bc37e..3189e942 100644
--- a/arts/tools/midiportdlg.h
+++ b/arts/tools/midiportdlg.h
@@ -30,7 +30,7 @@
 #include <tqlayout.h>
 
 class MidiPortDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 	TQLineEdit *edit;
 public:
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index 197d620d..4f21657d 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -63,10 +63,10 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con
 	suspendButton= new TQPushButton(this, "suspendButton");
 	suspendButton->setText(i18n("&Suspend Now"));
 	l->addWidget(suspendButton);
-	connect(suspendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(suspendButtonClicked()));
+	connect(suspendButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(suspendButtonClicked()));
 
 	artsPollStatusTimer= new TQTimer(this);
-	connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus()));
+	connect(artsPollStatusTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateStatus()));
 	artsPollStatusTimer->start(1000);
 	//l->activate();
 	show();
diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h
index a0969ad4..c970e0a6 100644
--- a/arts/tools/statusview.h
+++ b/arts/tools/statusview.h
@@ -34,7 +34,7 @@ class TQTimer;
 class TQLabel;
 
 class ArtsStatusView : public Template_ArtsView {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	ArtsStatusView(Arts::SoundServer server, TQWidget* =0, const char* =0 );
diff --git a/arts/tools/templateview.h b/arts/tools/templateview.h
index 30269533..9b1124bb 100644
--- a/arts/tools/templateview.h
+++ b/arts/tools/templateview.h
@@ -26,7 +26,7 @@
 
 class Template_ArtsView : public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	Template_ArtsView( TQWidget* =0, const char* =0 );