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, 24 insertions, 24 deletions

diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index 57cfde36..c54cbabd 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -37,33 +37,33 @@
 #include <tqpushbutton.h>
 
 static void min_size(TQWidget *w) {
-  w->setMinimumSize(w->sizeHint());
+  w->setMinimumSize(w->tqsizeHint());
 }
 
-RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
+RetrieveDlg::RetrieveDlg(TQWidget *tqparent) :TQDialog(tqparent,"X", TRUE)
 {
 	setCaption(i18n("Retrieve Structure From Server"));
 
-	TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
 
 // caption label: "Synthesis running..."
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	TQLabel *captionlabel = new TQLabel(this);
 	TQFont labelfont(captionlabel->font());
 	labelfont.setPointSize(labelfont.pointSize()*3/2);
 	captionlabel->setFont(labelfont);
 	captionlabel->setText(TQString(" ")+i18n("Published structures")+TQString(" "));
-	captionlabel->setAlignment(AlignCenter);
+	captionlabel->tqsetAlignment(AlignCenter);
 	min_size(captionlabel);
-	mainlayout->addWidget(captionlabel);
+	maintqlayout->addWidget(captionlabel);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler2);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(ruler2);
+	maintqlayout->addSpacing(5);
 
 // listwidget
 
@@ -85,26 +85,26 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
 		listbox->insertItem((*ni).c_str());
 #endif
 
-	mainlayout->addWidget(listbox);
+	maintqlayout->addWidget(listbox);
 
 // hruler
 
-	mainlayout->addSpacing(5);
+	maintqlayout->addSpacing(5);
 	KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
-	mainlayout->addWidget(ruler);
-	mainlayout->addSpacing(5);
+	maintqlayout->addWidget(ruler);
+	maintqlayout->addSpacing(5);
 
 // buttons
 
-	TQHBoxLayout *buttonlayout = new TQHBoxLayout;
-	mainlayout->addSpacing(5);
-	mainlayout->addLayout(buttonlayout);
-	mainlayout->addSpacing(5);
+	TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+	maintqlayout->addSpacing(5);
+	maintqlayout->addLayout(buttontqlayout);
+	maintqlayout->addSpacing(5);
 
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
@@ -113,12 +113,12 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
 	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
 
-	bbox->layout();
+	bbox->tqlayout();
 
-	buttonlayout->addWidget(bbox);
-	buttonlayout->addSpacing(5);
+	buttontqlayout->addWidget(bbox);
+	buttontqlayout->addSpacing(5);
 
-	mainlayout->freeze();
+	maintqlayout->freeze();
 }
 
 TQString RetrieveDlg::result()
@@ -127,7 +127,7 @@ TQString RetrieveDlg::result()
 	{
 		return(listbox->text(listbox->currentItem()));
 	}
-	return TQString::null;
+	return TQString();
 }
 
 void RetrieveDlg::help()