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

diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp
index 09d64678..682c4f6a 100644
--- a/noatun/library/scrollinglabel.cpp
+++ b/noatun/library/scrollinglabel.cpp
@@ -40,11 +40,11 @@ class ScrollingLabel::Private
 		}
 
 		// Order dependency.
-		QString		text;
-		QString		originalText;
-		QPixmap		buf;
-		QTimer		scrollTimer;
-		QTimer		resetTimer;
+		TQString		text;
+		TQString		originalText;
+		TQPixmap		buf;
+		TQTimer		scrollTimer;
+		TQTimer		resetTimer;
 		int				scrollSize;
 		int				pos;
 		bool			add;
@@ -54,11 +54,11 @@ class ScrollingLabel::Private
 
 ScrollingLabel::ScrollingLabel
 (
- const QString	& initialText,
- QWidget				* parent,
+ const TQString	& initialText,
+ TQWidget				* tqparent,
  const char			* name
 )
-	: TQWidget(parent, name)
+	: TQWidget(tqparent, name)
 {
 	d = new Private;
 
@@ -116,10 +116,10 @@ ScrollingLabel::_update()
 
 	setFixedHeight(h);
 
-	d->scrollSize = QMAX(0, w - width());
+	d->scrollSize = TQMAX(0, w - width());
 
 	d->buf.resize(w, h);
-	d->buf.fill(colorGroup().background());
+	d->buf.fill(tqcolorGroup().background());
 
 	TQPainter p(&d->buf);
 	p.setFont(font());
@@ -128,14 +128,14 @@ ScrollingLabel::_update()
 	if (d->scroll && (d->scrollSize > 0))
 		d->scrollTimer.start(100, true);
 
-	repaint(false);
+	tqrepaint(false);
 }
 
 	void
 ScrollingLabel::paintEvent(TQPaintEvent *)
 {
 	bitBlt
-		(this, 0, 0, &d->buf, d->pos, 0, d->pos + width(), height(), Qt::CopyROP);
+		(this, 0, 0, &d->buf, d->pos, 0, d->pos + width(), height(), TQt::CopyROP);
 }
 
 	void
@@ -149,7 +149,7 @@ ScrollingLabel::scroll()
 {
 	d->scrollTimer.stop();
 
-	repaint(false);
+	tqrepaint(false);
 
 	int scrollTime = 100;
 
@@ -165,19 +165,19 @@ ScrollingLabel::scroll()
 		d->scrollTimer.start(scrollTime, true);
 }
 
-	QSize
-ScrollingLabel::sizeHint() const
+	TQSize
+ScrollingLabel::tqsizeHint() const
 {
 	return fontMetrics().boundingRect(d->text).size();
 }
 
-	QSize
-ScrollingLabel::minimumSizeHint() const
+	TQSize
+ScrollingLabel::tqminimumSizeHint() const
 {
 	return TQSize(0, fontMetrics().height());
 }
 
-	QString
+	TQString
 ScrollingLabel::text() const
 {
 	return d->text;