TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

1 files changed, 31 insertions, 31 deletions

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