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

diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index 758d3950..1fa07fdd 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -20,14 +20,14 @@ Monoscope::Monoscope() : TQWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin()
 	NOATUNPLUGINC(Monoscope);
 
 	mAction=0L;
-	mLowColor=qRgb(0,0,0);
-	mHighColor=qRgb(238,238,238);
+	mLowColor=tqRgb(0,0,0);
+	mHighColor=tqRgb(238,238,238);
 	resize(320, 240);
 	MonoScope::start();
 	setCaption(i18n("Monoscope"));
 	show();
 	resizeEvent(0);
-	repaint(0,0, TQWidget::width(), height(), false);
+	tqrepaint(0,0, TQWidget::width(), height(), false);
 	resizeEvent(0);
 	setBackgroundColor(mLowColor);
 }
@@ -41,7 +41,7 @@ Monoscope::~Monoscope()
 void Monoscope::init()
 {
 	mAction = new KToggleAction(i18n("Toggle Monoscope"), 0, 0,
-		this, TQT_SLOT(toggle()), this, "togglemonoscope");
+		TQT_TQOBJECT(this), TQT_SLOT(toggle()), TQT_TQOBJECT(this), "togglemonoscope");
 	mAction->setChecked(!isHidden());
 	napp->pluginActionMenu()->insert(mAction);
 }
@@ -83,7 +83,7 @@ void Monoscope::scopeEvent(float *d, int size)
 	buffer.fill(mLowColor);
 	TQPainter p(&buffer);
 	p.setPen(mHighColor);
-	repaint(rect());
+	tqrepaint(rect());
 
 	if (line)
 		p.moveTo(0, y);
@@ -105,7 +105,7 @@ void Monoscope::scopeEvent(float *d, int size)
 	}
 	if (line)
 		p.drawLine(0, y, size, y);
-	bitBlt(this, 0, 0, &buffer, 0, 0, viewWidth, viewHeight, Qt::CopyROP);
+	bitBlt(this, 0, 0, &buffer, 0, 0, viewWidth, viewHeight, TQt::CopyROP);
 }
 
 #include "monoscope.moc"
diff --git a/noatun/modules/monoscope/monoscope.h b/noatun/modules/monoscope/monoscope.h
index 0f9ddcff..59ae7500 100644
--- a/noatun/modules/monoscope/monoscope.h
+++ b/noatun/modules/monoscope/monoscope.h
@@ -8,6 +8,7 @@ class KToggleAction;
 class Monoscope : public TQWidget,  public MonoScope, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 NOATUNPLUGIND
 
 public:
@@ -26,7 +27,7 @@ protected:
 	virtual void resizeEvent(TQResizeEvent *);
 
 private:
-	QRgb mHighColor, mLowColor;
+	TQRgb mHighColor, mLowColor;
 	KToggleAction *mAction;
 };