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

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

2 files changed, 22 insertions, 22 deletions

diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp
index 800075ca..09e9777a 100644
--- a/tdescreensaver/kdesavers/slideshow.cpp
+++ b/tdescreensaver/kdesavers/slideshow.cpp
@@ -285,7 +285,7 @@ int kSlideShowSaver::effectSpiralIn(bool aInit)
     my0 += miy;
   }
 
-  bitBlt(TQT_TQPAINTDEVICE(this), mx, my, TQT_TQPAINTDEVICE(&mNextScreen), mx, my, mix, miy, CopyROP, true);
+  bitBlt(this, mx, my, &mNextScreen, mx, my, mix, miy, CopyROP, true);
 
   mx += mdx;
   my += mdy;
@@ -321,8 +321,8 @@ int kSlideShowSaver::effectMeltdown(bool aInit)
     if (y >= mh) continue;
     done = false;
     if ((TDEApplication::random()&15) < 6) continue;
-    bitBlt(TQT_TQPAINTDEVICE(this), x, y+mdy, TQT_TQPAINTDEVICE(this), x, y, mdx, mh-y-mdy, CopyROP, true);
-    bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, mdx, mdy, CopyROP, true);
+    bitBlt(this, x, y+mdy, this, x, y, mdx, mh-y-mdy, CopyROP, true);
+    bitBlt(this, x, y, &mNextScreen, x, y, mdx, mdy, CopyROP, true);
     mIntArray[i] += mdy;
   }
 
@@ -407,7 +407,7 @@ int kSlideShowSaver::effectSweep(bool aInit)
     }
     for (w=2,i=4,x=mx; i>0; i--, w<<=1, x-=mdx)
     {
-      bitBlt(TQT_TQPAINTDEVICE(this), x, 0, TQT_TQPAINTDEVICE(&mNextScreen), x, 0, w, mh, CopyROP, true);
+      bitBlt(this, x, 0, &mNextScreen, x, 0, w, mh, CopyROP, true);
     }
     mx += mdx;
   }
@@ -421,7 +421,7 @@ int kSlideShowSaver::effectSweep(bool aInit)
     }
     for (h=2,i=4,y=my; i>0; i--, h<<=1, y-=mdy)
     {
-      bitBlt(TQT_TQPAINTDEVICE(this), 0, y, TQT_TQPAINTDEVICE(&mNextScreen), 0, y, mw, h, CopyROP, true);
+      bitBlt(this, 0, y, &mNextScreen, 0, y, mw, h, CopyROP, true);
     }
     my += mdy;
   }
@@ -477,7 +477,7 @@ int kSlideShowSaver::effectRandom(bool /*aInit*/)
   {
     x = (TDEApplication::random() % w) << fact;
     y = (TDEApplication::random() % h) << fact;
-    bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, sz, sz, CopyROP, true);
+    bitBlt(this, x, y, &mNextScreen, x, y, sz, sz, CopyROP, true);
   }
   showNextScreen();
 
@@ -509,7 +509,7 @@ int kSlideShowSaver::effectGrowing(bool aInit)
     return -1;
   }
 
-  bitBlt(TQT_TQPAINTDEVICE(this), mx, my, TQT_TQPAINTDEVICE(&mNextScreen), mx, my,
+  bitBlt(this, mx, my, &mNextScreen, mx, my,
 	 mw - (mx<<1), mh - (my<<1), CopyROP, true);
 
   return 20;
@@ -548,9 +548,9 @@ int kSlideShowSaver::effectChessboard(bool aInit)
 
   for (y=0; y<mw; y+=(mdy<<1))
   {
-    bitBlt(TQT_TQPAINTDEVICE(this), mix, y+miy, TQT_TQPAINTDEVICE(&mNextScreen), mix, y+miy,
+    bitBlt(this, mix, y+miy, &mNextScreen, mix, y+miy,
 	   mdx, mdy, CopyROP, true);
-    bitBlt(TQT_TQPAINTDEVICE(this), mx, y+my, TQT_TQPAINTDEVICE(&mNextScreen), mx, y+my,
+    bitBlt(this, mx, y+my, &mNextScreen, mx, y+my,
 	   mdx, mdy, CopyROP, true);
   }
 
@@ -591,18 +591,18 @@ int kSlideShowSaver::effectIncomingEdges(bool aInit)
   if (mSubType)
   {
     // moving image edges
-    bitBlt(TQT_TQPAINTDEVICE(this),  0,  0, TQT_TQPAINTDEVICE(&mNextScreen), mix-mx, miy-my, mx, my, CopyROP, true);
-    bitBlt(TQT_TQPAINTDEVICE(this), x1,  0, TQT_TQPAINTDEVICE(&mNextScreen), mix, miy-my, mx, my, CopyROP, true);
-    bitBlt(TQT_TQPAINTDEVICE(this),  0, y1, TQT_TQPAINTDEVICE(&mNextScreen), mix-mx, miy, mx, my, CopyROP, true);
-    bitBlt(TQT_TQPAINTDEVICE(this), x1, y1, TQT_TQPAINTDEVICE(&mNextScreen), mix, miy, mx, my, CopyROP, true);
+    bitBlt(this,  0,  0, &mNextScreen, mix-mx, miy-my, mx, my, CopyROP, true);
+    bitBlt(this, x1,  0, &mNextScreen, mix, miy-my, mx, my, CopyROP, true);
+    bitBlt(this,  0, y1, &mNextScreen, mix-mx, miy, mx, my, CopyROP, true);
+    bitBlt(this, x1, y1, &mNextScreen, mix, miy, mx, my, CopyROP, true);
   }
   else
   {
     // fixed image edges
-    bitBlt(TQT_TQPAINTDEVICE(this),  0,  0, TQT_TQPAINTDEVICE(&mNextScreen),  0,  0, mx, my, CopyROP, true);
-    bitBlt(TQT_TQPAINTDEVICE(this), x1,  0, TQT_TQPAINTDEVICE(&mNextScreen), x1,  0, mx, my, CopyROP, true);
-    bitBlt(TQT_TQPAINTDEVICE(this),  0, y1, TQT_TQPAINTDEVICE(&mNextScreen),  0, y1, mx, my, CopyROP, true);
-    bitBlt(TQT_TQPAINTDEVICE(this), x1, y1, TQT_TQPAINTDEVICE(&mNextScreen), x1, y1, mx, my, CopyROP, true);
+    bitBlt(this,  0,  0, &mNextScreen,  0,  0, mx, my, CopyROP, true);
+    bitBlt(this, x1,  0, &mNextScreen, x1,  0, mx, my, CopyROP, true);
+    bitBlt(this,  0, y1, &mNextScreen,  0, y1, mx, my, CopyROP, true);
+    bitBlt(this, x1, y1, &mNextScreen, x1, y1, mx, my, CopyROP, true);
   }
   return 20;
 }
@@ -625,7 +625,7 @@ int kSlideShowSaver::effectHorizLines(bool aInit)
 
   for (y=iyPos[mi]; y<mh; y+=8)
   {
-    bitBlt(TQT_TQPAINTDEVICE(this), 0, y, TQT_TQPAINTDEVICE(&mNextScreen), 0, y, mw, 1, CopyROP, true);
+    bitBlt(this, 0, y, &mNextScreen, 0, y, mw, 1, CopyROP, true);
   }
 
   mi++;
@@ -651,7 +651,7 @@ int kSlideShowSaver::effectVertLines(bool aInit)
 
   for (x=ixPos[mi]; x<mw; x+=8)
   {
-    bitBlt(TQT_TQPAINTDEVICE(this), x, 0, TQT_TQPAINTDEVICE(&mNextScreen), x, 0, 1, mh, CopyROP, true);
+    bitBlt(this, x, 0, &mNextScreen, x, 0, 1, mh, CopyROP, true);
   }
 
   mi++;
@@ -716,7 +716,7 @@ void kSlideShowSaver::slotTimeout()
 //----------------------------------------------------------------------------
 void kSlideShowSaver::showNextScreen()
 {
-  bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), 0, 0,
+  bitBlt(this, 0, 0, &mNextScreen, 0, 0,
 	 mNextScreen.width(), mNextScreen.height(), CopyROP, true);
 }
 
@@ -798,7 +798,7 @@ void kSlideShowSaver::createNextScreen()
             y = ((wh - ih) >> 1) + geoptr->mYorg;
         }
 
-        // bitBlt(TQT_TQPAINTDEVICE(&mNextScreen), x, y, TQT_TQPAINTDEVICE(&mImage), 0, 0, iw, ih, CopyROP, false);
+        // bitBlt(&mNextScreen, x, y, &mImage, 0, 0, iw, ih, CopyROP, false);
         p.drawImage(x, y, mImage);
       }
     }
diff --git a/tdescreensaver/kxsconfig/kxsxml.cpp b/tdescreensaver/kxsconfig/kxsxml.cpp
index c09e3728..3891d75a 100644
--- a/tdescreensaver/kxsconfig/kxsxml.cpp
+++ b/tdescreensaver/kxsconfig/kxsxml.cpp
@@ -36,7 +36,7 @@ bool KXSXml::parse( const TQString &filename )
 {
     TQFile file( filename );
     handler = new KXSXmlHandler( parent );
-    TQXmlInputSource source( TQT_TQIODEVICE(&file) );
+    TQXmlInputSource source( &file );
     TQXmlSimpleReader reader;
     reader.setContentHandler( handler );
     if ( !reader.parse( &source, FALSE ) )