Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8729e642ea)

arts/gui/kde/klevelmeter_linebars.cpp

@@ -94,7 +94,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) {
 		p.drawLine( 0, top, w, top );
 	}
 
-	bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&pm), 0, 0, pm.width(), pm.height(), CopyROP, true );
+	bitBlt( this, 0, 0, &pm, 0, 0, pm.width(), pm.height(), CopyROP, true );
 }
 
 /**

juk/cache.cpp

@@ -275,7 +275,7 @@ void Cache::load()
     if(!f.open(IO_ReadOnly))
         return;
 
-    CacheDataStream s(TQT_TQIODEVICE(&f));
+    CacheDataStream s(&f);
 
     TQ_INT32 version;
     s >> version;

noatun/library/playlistsaver.cpp

@@ -449,7 +449,7 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt)
 		reset();
 
 		// TQXml is horribly documented
-		TQXmlInputSource source(TQT_TQIODEVICE(&file));
+		TQXmlInputSource source(&file);
 		TQXmlSimpleReader reader;
 
 		if (opt == ASX ||

noatun/modules/winskin/waDigit.cpp

@@ -57,24 +57,24 @@ void WaDigit::paintEvent(TQPaintEvent *)
     // continue parsing
     mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_MINUS);
     if (len == 6) {
-        waSkinModel->getDigit('-', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+        waSkinModel->getDigit('-', this, mapRect.x() - x, mapRect.y() - y);
         time++;
     }
     else {
-        waSkinModel->getDigit(' ', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+        waSkinModel->getDigit(' ', this, mapRect.x() - x, mapRect.y() - y);
     }
 
     mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_1);
-    waSkinModel->getDigit(time[0], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+    waSkinModel->getDigit(time[0], this, mapRect.x() - x, mapRect.y() - y);
 
     mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_2);
-    waSkinModel->getDigit(time[1], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+    waSkinModel->getDigit(time[1], this, mapRect.x() - x, mapRect.y() - y);
 
     mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_3);
-    waSkinModel->getDigit(time[3], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+    waSkinModel->getDigit(time[3], this, mapRect.x() - x, mapRect.y() - y);
 
     mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_4);
-    waSkinModel->getDigit(time[4], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
+    waSkinModel->getDigit(time[4], this, mapRect.x() - x, mapRect.y() - y);
 }
 
 void WaDigit::mousePressEvent(TQMouseEvent* e) {

noatun/modules/winskin/waInfo.cpp

@@ -132,7 +132,7 @@ void WaInfo::pixmapChange()
     completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
 
     for (i = 0; i < n; i++) {
-	WaSkinModel::instance()->getText(infoString[i], TQT_TQPAINTDEVICE(completePixmap), x, 0);
+	WaSkinModel::instance()->getText(infoString[i], 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(' ', TQT_TQPAINTDEVICE(completePixmap), x, 0);
+	    WaSkinModel::instance()->getText(' ', completePixmap, x, 0);
 	    x += _WA_TEXT_WIDTH;
 	}
     }

noatun/modules/winskin/waLabel.cpp

@@ -58,7 +58,7 @@ void WaLabel::pixmapChange()
     int n = label_text ? strlen(label_text) : 0;
 
     for (int i = 0; i < n; i++) 
-	WaSkinModel::instance()->getText(label_text[i], TQT_TQPAINTDEVICE(completePixmap), 
+	WaSkinModel::instance()->getText(label_text[i], completePixmap, 
 				      i * _WA_TEXT_WIDTH, 0);
 }
 

noatun/modules/winskin/waWidget.cpp

@@ -14,31 +14,31 @@ WaWidget::~WaWidget() {
 
 void WaWidget::paintPixmap(int pixmap_mapping) {
     if (pixmap_mapping != -1) 
-        WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0);
+        WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0);
      else
-        WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0);
+        WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0);
 }
 
 void WaWidget::paintPixmap(int pixmap_mapping, int x, int y) {
     if (pixmap_mapping != -1) 
-        WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y);
+        WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y);
      else
-        WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y);
+        WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y);
 }
 
 void WaWidget::paintPixmap(int pixmap_mapping, int argument) {
     if (pixmap_mapping != -1) 
-        WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0, argument);
+        WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0, argument);
      else
-        WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0);
+        WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0);
 
 }
 
 void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) {
     if (pixmap_mapping != -1) 
-        WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y, argument);
+        WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y, argument);
     else
-        WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y);
+        WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y);
 }
 
 TQSize WaWidget::sizeHint() {

noatun/modules/winskin/waWidget.h

@@ -19,7 +19,7 @@ public:
     void paintPixmap(int wa_mapping, int x, int y);
     void paintPixmap(int wa_mapping, int number, int x, int y);
  
-    void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); }
+    void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); }
 
 protected:
     void mousePressEvent(TQMouseEvent *);