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

2 files changed, 16 insertions, 15 deletions

diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index dac6fbb3..86c4f500 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -67,12 +67,12 @@ Excellent::Excellent()
 {
 	setAcceptDrops(true);
 
-	KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
-	KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection());
+	KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection());
+	KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection());
 	setStandardToolBarMenuEnabled(true);
 
-	menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection());
-	KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection());
+	menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection());
+	KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection());
 
 	// buttons
 	NoatunStdAction::back(actionCollection(), "back");
@@ -82,7 +82,7 @@ Excellent::Excellent()
 	NoatunStdAction::forward(actionCollection(), "forward");
 	NoatunStdAction::playlist(actionCollection(), "show_playlist");
 
-	volumeAction = new KToggleAction(i18n("Show &Volume Control"), 0, this, TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
+	volumeAction = new KToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
 	volumeAction->setCheckedState(i18n("Hide &Volume Control"));
 	NoatunStdAction::effects(actionCollection(), "effects");
 	NoatunStdAction::equalizer(actionCollection(), "equalizer");
@@ -94,11 +94,11 @@ Excellent::Excellent()
 	napp->pluginActionMenu()->plug(menuBar(),3);
 	toolBar("mainToolBar")->hide();
 
-	// Who needs Qt Designer?
+	// Who needs TQt Designer?
 	mainFrame = new TQHBox(this);
 	mainFrame->setSpacing(KDialog::spacingHint());
 	mainFrame->setMargin(0);
-	slider = new L33tSlider(0, 1000, 10, 0, L33tSlider::Horizontal, mainFrame);
+	slider = new L33tSlider(0, 1000, 10, 0, Qt::Horizontal, mainFrame);
 	slider->setTickmarks(TQSlider::NoMarks);
 
 	elapsed = new TQLabel(mainFrame);
@@ -107,10 +107,10 @@ Excellent::Excellent()
 	labelFont.setBold(true);
 	TQFontMetrics labelFontMetrics = labelFont;
 	elapsed->setFont(labelFont);
-	elapsed->setAlignment(AlignCenter | AlignVCenter | ExpandTabs);
+	elapsed->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs);
 	elapsed->setText("--:--");
 	elapsed->setFixedHeight(labelFontMetrics.height());
-	elapsed->setMinimumWidth(elapsed->sizeHint().width());
+	elapsed->setMinimumWidth(elapsed->tqsizeHint().width());
 
 	// Doing this makes the slider the same heigh as the font. This is just plain wrong...
 	//slider->setFixedHeight(labelFontMetrics.height());
@@ -121,9 +121,9 @@ Excellent::Excellent()
 	labelFont = total->font();
 	labelFont.setBold(true);
 	total->setFont(labelFont);
-	total->setAlignment(AlignCenter | AlignVCenter | ExpandTabs);
+	total->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs);
 	total->setText("--:--");
-	total->setMinimumWidth(total->sizeHint().width());
+	total->setMinimumWidth(total->tqsizeHint().width());
 	total->setText("");
 
 	statusBar()->addWidget(total, 0, true);
@@ -186,7 +186,7 @@ Excellent::Excellent()
 		break;
 	}
 
-	for (TQPtrListIterator<TQObject> i(*children()); i.current(); ++i)
+	for (TQPtrListIterator<TQObject> i(childrenListObject()); i.current(); ++i)
 		(*i)->installEventFilter(this);
 }
 
@@ -248,7 +248,7 @@ bool Excellent::eventFilter(TQObject *o, TQEvent *e)
 {
 	if (e->type() == TQEvent::Wheel)
 	{
-		wheelEvent(static_cast<TQWheelEvent*>(e));
+		wheelEvent(TQT_TQWHEELEVENT(e));
 		return true;
 	}
 	return TQWidget::eventFilter(o, e);
@@ -335,7 +335,7 @@ void Excellent::showMenubar(void)
 	}
 	else
 	{
-		KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").arg(menubarAction->shortcut().toString()), TQString::null, "Hide Menu warning");
+		KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").tqarg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning");
 		menuBar()->hide();
 	}
 }
@@ -373,7 +373,7 @@ void Excellent::handleLengthString(const TQString &text)
 
 void Excellent::growVolumeControl(void)
 {
-	volumeSlider = new L33tSlider(0, 100, 10, 0, Vertical, mainFrame);
+	volumeSlider = new L33tSlider(0, 100, 10, 0,Qt::Vertical, mainFrame);
 	volumeSlider->setValue(100 - napp->player()->volume());
 	volumeSlider->show();
 	connect(volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(changeVolume(int)));
diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h
index c6a958de..72628430 100644
--- a/noatun/modules/excellent/userinterface.h
+++ b/noatun/modules/excellent/userinterface.h
@@ -50,6 +50,7 @@ class KToggleAction;
 class Excellent : public KMainWindow, public UserInterface
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	Excellent();