1 files changed, 29 insertions, 29 deletions

diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index 790691e8..8ead524a 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -20,7 +20,7 @@
     */
 
 #include <tqfile.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
@@ -41,7 +41,7 @@
 
 #ifndef KDE_USE_FINAL
 static void min_size(TQWidget *w) {
-  w->setMinimumSize(w->tqsizeHint());
+  w->setMinimumSize(w->sizeHint());
 }
 #endif
 
@@ -53,19 +53,19 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 
 	setCaption(i18n("aRts Module Execution"));
 
-	maintqlayout = new TQVBoxLayout(this);
+	mainlayout = new TQVBoxLayout(this);
 
 // caption label: "Synthesis running..."
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
 	TQLabel *captionlabel = new TQLabel(this);
 	TQFont labelfont(captionlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(TQString(" ")+i18n("Synthesis running...")+TQString(" "));
-	captionlabel->tqsetAlignment(AlignCenter);
+	captionlabel->setAlignment(AlignCenter);
 	min_size(captionlabel);
-	maintqlayout->addWidget(captionlabel);
+	mainlayout->addWidget(captionlabel);
 
 	cpuusagelabel = new TQLabel(this);
 	cpuusagelabel->setText(i18n("CPU usage: unknown"));
@@ -78,41 +78,41 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 	cpuusagetimer->start( 2000, false );
 
 	min_size(cpuusagelabel);
-	maintqlayout->addWidget(cpuusagelabel);
+	mainlayout->addWidget(cpuusagelabel);
 
-//	ruler above the slidertqlayout
+//	ruler above the sliderlayout
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
         KSeparator* sep = new KSeparator( KSeparator::HLine, this);
-	maintqlayout->addWidget(sep);
-	maintqlayout->addSpacing(5);
+	mainlayout->addWidget(sep);
+	mainlayout->addSpacing(5);
 
 //	sliders, controlpanels
 
-	slidertqlayout = new TQVBoxLayout;
-	maintqlayout->addLayout(slidertqlayout);
+	sliderlayout = new TQVBoxLayout;
+	mainlayout->addLayout(sliderlayout);
 
 #if 0 /* PORT */
 	this->GUIServer = GUIServer;
 	GUIServer->setGlobalParent(this);
-	GUIServer->setGlobalLayout(slidertqlayout);
+	GUIServer->setGlobalLayout(sliderlayout);
 #endif
 
-//  hruler below the slidertqlayout
+//  hruler below the sliderlayout
 
-	maintqlayout->addSpacing(5);
+	mainlayout->addSpacing(5);
         sep = new KSeparator( KSeparator::HLine, this);
-	maintqlayout->addWidget(sep);
-	maintqlayout->addSpacing(5);
+	mainlayout->addWidget(sep);
+	mainlayout->addSpacing(5);
 
 // buttons
 
-	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
-	maintqlayout->addSpacing(5);
-	maintqlayout->addLayout(buttontqlayout);
-	maintqlayout->addSpacing(5);
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
+	mainlayout->addSpacing(5);
+	mainlayout->addLayout(buttonlayout);
+	mainlayout->addSpacing(5);
 
-	buttontqlayout->addSpacing(5);
+	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
 	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -125,18 +125,18 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
 	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
 
-	bbox->tqlayout();
+	bbox->layout();
 	//min_size(bbox);
 
-	buttontqlayout->addWidget(bbox);
-	buttontqlayout->addSpacing(5);
+	buttonlayout->addWidget(bbox);
+	buttonlayout->addSpacing(5);
 
-//	maintqlayout->freeze();
+//	mainlayout->freeze();
 }
 
 void ExecDlg::start()
 {
-	maintqlayout->freeze();
+	mainlayout->freeze();
 }
 
 void ExecDlg::guiServerTick()
@@ -151,7 +151,7 @@ void ExecDlg::updateCpuUsage()
 #if 0 /* TODO:PORT */
 	char cpuusage[100];
 
-	ArtsCorba::tqStatus s = Synthesizer->gettqStatus();
+	ArtsCorba::Status s = Synthesizer->getStatus();
 	if(s.halted)
 	{
 		cpuusagetimer->stop();