1 files changed, 11 insertions, 11 deletions

diff --git a/libtdescreensaver/tdescreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp
index 30120b164..cb0508eaa 100644
--- a/libtdescreensaver/tdescreensaver.cpp
+++ b/libtdescreensaver/tdescreensaver.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 #include <tdeapplication.h>
 #include "tdescreensaver.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #else
 typedef WId Window;
@@ -50,13 +50,13 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget()
     XSync(tqt_xdisplay(), false);
 
     d = new KScreenSaverPrivate;
-    d->owner = TQT_TQWIDGET(find( id ));
+    d->owner = find( id );
     if ( d->owner )
 	installEventFilter( this );
 
     if ( id )
     {
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
         XGetGeometry(tqt_xdisplay(), (Drawable)id, &root, &ai, &ai,
             &w, &h, &au, &au); 
 #endif
@@ -80,7 +80,7 @@ KScreenSaver::~KScreenSaver()
 void KScreenSaver::embed( TQWidget *w )
 {
     TDEApplication::sendPostedEvents();
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
     XReparentWindow(tqt_xdisplay(), w->winId(), winId(), 0, 0);
 #endif
     w->setGeometry( 0, 0, width(), height() );
@@ -90,7 +90,7 @@ void KScreenSaver::embed( TQWidget *w )
 bool KScreenSaver::eventFilter( TQObject *o, TQEvent *e )
 {
     // make sure events get to the original window owner
-    if ( d->owner && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) {
+    if ( d->owner && o == this ) {
 	TQApplication::sendEvent( d->owner, e );
 	return false;
     }
@@ -122,7 +122,7 @@ KBlankEffect::KBlankEffect( TQObject *parent ) : TQObject( parent )
     d->currentEffect = &KBlankEffect::blankNormal;
     d->effectProgress = 0;
     d->timer = new TQTimer( this );
-    connect( d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) );
+    connect( d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) );
 }
 
 
@@ -147,7 +147,7 @@ void KBlankEffect::blank( TQWidget *w, Effect effect )
     }
 
     if ( effect == Random )
-        effect = (Effect)(kapp->random() % MaximumEffects);
+        effect = (Effect)(tdeApp->random() % MaximumEffects);
 
     d->effectProgress = 0;
     d->widget = w;
@@ -172,7 +172,7 @@ void KBlankEffect::blankSweepRight()
 {
     TQPainter p( d->widget );
     p.fillRect( d->effectProgress, 0, 50, d->widget->height(), black );
-    kapp->flushX();
+    tdeApp->flushX();
     d->effectProgress += 50;
     if ( d->effectProgress >= d->widget->width() )
         finished();
@@ -183,7 +183,7 @@ void KBlankEffect::blankSweepDown()
 {
     TQPainter p( d->widget );
     p.fillRect( 0, d->effectProgress, d->widget->width(), 50, black );
-    kapp->flushX();
+    tdeApp->flushX();
     d->effectProgress += 50;
     if ( d->effectProgress >= d->widget->height() )
         finished();
@@ -203,7 +203,7 @@ void KBlankEffect::blankBlocks()
         for ( int i = 0; i < bx*by; i++ )
             block[i] = i;
         for ( int i = 0; i < bx*by; i++ ) {
-            int swap = kapp->random()%(bx*by);
+            int swap = tdeApp->random()%(bx*by);
             int tmp = block[i];
             block[i] = block[swap];
             block[swap] = tmp;
@@ -220,7 +220,7 @@ void KBlankEffect::blankBlocks()
         d->effectProgress++;
     }
 
-    kapp->flushX();
+    tdeApp->flushX();
 
     if ( d->effectProgress >= bx*by ) {
         delete[] block;