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

diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index d64191da..fb923994 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -30,7 +30,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO)
 
     completePixmap = new TQPixmap();
 
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
     completePixmap->resize(size.width(), size.height());
 
     xGrabbedPos = -1;
@@ -55,7 +55,7 @@ void WaInfo::timeEvent()
         }
 
         if (isVisible())
-            repaint(false);
+            tqrepaint(false);
     }
 }
 
@@ -65,7 +65,7 @@ void WaInfo::scrollerSetup()
     xScrollPos = 0;
     xScrollDirection = 0;
     timer->stop();
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
     if (completePixmap->width() > size.width()) {
 		xScrollDirection = 1;
 		
@@ -79,7 +79,7 @@ void WaInfo::scrollerSetup()
 
 void WaInfo::paintEvent(TQPaintEvent *)
 {
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
 
     if (completePixmap->width() <= size.width()) {
 	bitBlt(this, 0, 0, completePixmap);
@@ -127,12 +127,12 @@ void WaInfo::pixmapChange()
     int x = 0;
     int n=infoString ? strlen(infoString) : 0;
 
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
 
-    completePixmap->resize(QMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
+    completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
 
     for (i = 0; i < n; i++) {
-	WaSkinModel::instance()->getText(infoString[i], completePixmap, x, 0);
+	WaSkinModel::instance()->getText(infoString[i], TQT_TQPAINTDEVICE(completePixmap), x, 0);
 	x += _WA_TEXT_WIDTH;
     }
 
@@ -140,7 +140,7 @@ void WaInfo::pixmapChange()
     // fill the pixmap with spaces
     if (x < size.width()) {
 	while (x < size.width()) {
-	    WaSkinModel::instance()->getText(' ', completePixmap, x, 0);
+	    WaSkinModel::instance()->getText(' ', TQT_TQPAINTDEVICE(completePixmap), x, 0);
 	    x += _WA_TEXT_WIDTH;
 	}
     }
@@ -150,7 +150,7 @@ void WaInfo::pixmapChange()
 }
 
 void WaInfo::mousePressEvent (TQMouseEvent *e) {
-    if (e->button() == LeftButton)
+    if (e->button() == Qt::LeftButton)
         xGrabbedPos = (e->x() + xScrollPos) % completePixmap->width();
 }