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/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 706576d1..9680fc7e 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -41,50 +41,50 @@
 
 using namespace std;
 
-InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
+InterfaceDlg::InterfaceDlg(TQWidget *tqparent) :TQDialog(tqparent,"Props", TRUE)
 {
 	setCaption(i18n("aRts: Structureport View"));
 
-	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
-	//TQHBoxLayout *contentslayout = new TQHBoxLayout;
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
+	//TQHBoxLayout *contentstqlayout = new TQHBoxLayout;
 
 // object type
 /*
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *objectlabel = new TQLabel(this);
 	TQFont labelfont(objectlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	objectlabel->setFont(labelfont);
 	objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" "));
-	objectlabel->setAlignment(AlignCenter);
+	objectlabel->tqsetAlignment(AlignCenter);
 	min_size(objectlabel);
-	mainlayout->addWidget(objectlabel);
+	maintqlayout->addWidget(objectlabel);
 */
 
 // port description
 
 /*
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *portlabel = new TQLabel(this);
 	labelfont.setPointSize(labelfont.pointSize()*4/5);
 	portlabel->setFont(labelfont);
 	portlabel->setText(i18n("Port description: ")+ port->description);
 	min_size(portlabel);
-	portlabel->setAlignment(AlignCenter);
-	mainlayout->addWidget(portlabel);
+	portlabel->tqsetAlignment(AlignCenter);
+	maintqlayout->addWidget(portlabel);
 
-	int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width());
+	int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width());
 
 	portlabel->setMinimumWidth(labelwidth);
 	objectlabel->setMinimumWidth(labelwidth);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler);
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(contentslayout);
+	maintqlayout->addWidget(ruler);
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(contentstqlayout);
 */
 // list
 
@@ -93,26 +93,26 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 	update();
 
 	listbox->setMinimumSize(340,400);
-	mainlayout->addWidget(listbox);
+	maintqlayout->addWidget(listbox);
         connect( listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *)), this,
                  TQT_SLOT(accept()));
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler2);
+	maintqlayout->addWidget(ruler2);
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(buttonlayout);
-	mainlayout->addSpacing(5);
+	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(buttontqlayout);
+	maintqlayout->addSpacing(5);
 
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
@@ -121,14 +121,14 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 	TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
 	connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
 
-	bbox->layout();
+	bbox->tqlayout();
 	//min_size(bbox);
 
-	buttonlayout->addWidget(bbox);
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addWidget(bbox);
+	buttontqlayout->addSpacing(5);
 
-	//mainlayout->activate();
-	mainlayout->freeze();
+	//maintqlayout->activate();
+	maintqlayout->freeze();
 }
 
 string InterfaceDlg::interfaceName()
@@ -159,10 +159,10 @@ void InterfaceDlg::update(const string& interface, const string& indent)
 {
 	listbox->insertItem((indent + interface).c_str());
 
-	vector<string> *children = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface);
-	for (vector<string>::iterator ci = children->begin(); ci != children->end(); ++ci)
+	vector<string> *tqchildren = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface);
+	for (vector<string>::iterator ci = tqchildren->begin(); ci != tqchildren->end(); ++ci)
 		update(ci->c_str(), indent+"  ");
-	delete children;
+	delete tqchildren;
 }
 
 void InterfaceDlg::update()