Rename additional global functions and variables for tqt3

1 files changed, 13 insertions, 13 deletions

diff --git a/kdesktop/xautolock.cc b/kdesktop/xautolock.cc
index b69325f17..a2e18a0cd 100644
--- a/kdesktop/xautolock.cc
+++ b/kdesktop/xautolock.cc
@@ -62,21 +62,21 @@ XAutoLock::XAutoLock()
     xautolock_useMit = 0;
 #ifdef HAVE_XIDLE
     int dummy1;
-    xautolock_useXidle = XidleQueryExtension( qt_xdisplay(), &dummy1, &dummy1 );
+    xautolock_useXidle = XidleQueryExtension( tqt_xdisplay(), &dummy1, &dummy1 );
 #endif
 #ifdef HAVE_XSCREENSAVER
     int dummy2;
     if( !xautolock_useXidle )
-        xautolock_useMit = XScreenSaverQueryExtension( qt_xdisplay(), &dummy2, &dummy2 );
+        xautolock_useMit = XScreenSaverQueryExtension( tqt_xdisplay(), &dummy2, &dummy2 );
 #endif
     if( !xautolock_useXidle && !xautolock_useMit )
     {
         kapp->installX11EventFilter( this );
         int (*oldHandler)(Display *, XErrorEvent *);
         oldHandler = XSetErrorHandler(catchFalseAlarms);
-        XSync(qt_xdisplay(), False );
-        xautolock_initDiy( qt_xdisplay());
-        XSync(qt_xdisplay(), False );
+        XSync(tqt_xdisplay(), False );
+        xautolock_initDiy( tqt_xdisplay());
+        XSync(tqt_xdisplay(), False );
         XSetErrorHandler(oldHandler);
     }
 
@@ -115,7 +115,7 @@ void XAutoLock::setDPMS(bool s)
 #ifdef HAVE_DPMS
     BOOL on;
     CARD16 state;
-    DPMSInfo( qt_xdisplay(), &state, &on );
+    DPMSInfo( tqt_xdisplay(), &state, &on );
     if (!on)
         s = false;
 #endif
@@ -184,7 +184,7 @@ void XAutoLock::timerEvent(TQTimerEvent *ev)
     int (*oldHandler)(Display *, XErrorEvent *) = NULL;
     if( !xautolock_useXidle && !xautolock_useMit )
     { // only the diy way needs special X handler
-        XSync( qt_xdisplay(), False );
+        XSync( tqt_xdisplay(), False );
         oldHandler = XSetErrorHandler(catchFalseAlarms);
     }
 
@@ -202,8 +202,8 @@ void XAutoLock::timerEvent(TQTimerEvent *ev)
 
     mLastTimeout = now;
 
-    xautolock_queryIdleTime( qt_xdisplay());
-    xautolock_queryPointer( qt_xdisplay());
+    xautolock_queryIdleTime( tqt_xdisplay());
+    xautolock_queryPointer( tqt_xdisplay());
 
     if( !xautolock_useXidle && !xautolock_useMit )
         XSetErrorHandler(oldHandler);
@@ -220,7 +220,7 @@ void XAutoLock::timerEvent(TQTimerEvent *ev)
 #ifdef HAVE_DPMS
     BOOL on;
     CARD16 state;
-    DPMSInfo( qt_xdisplay(), &state, &on );
+    DPMSInfo( tqt_xdisplay(), &state, &on );
 
     //kdDebug() << "DPMSInfo " << state << " " << on << endl;
     // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time
@@ -232,7 +232,7 @@ void XAutoLock::timerEvent(TQTimerEvent *ev)
     if(!on && mDPMS) {
         activate = false;
 #ifdef HAVE_XSCREENSAVER
-        XForceScreenSaver(qt_xdisplay(), ScreenSaverReset );
+        XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset );
 #endif
         resetTrigger();
     }
@@ -241,7 +241,7 @@ void XAutoLock::timerEvent(TQTimerEvent *ev)
 #ifdef HAVE_XSCREENSAVER
     static XScreenSaverInfo* mitInfo = 0;
     if (!mitInfo) mitInfo = XScreenSaverAllocInfo ();
-    if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) {
+    if (XScreenSaverQueryInfo (tqt_xdisplay(), DefaultRootWindow (tqt_xdisplay()), mitInfo)) {
         //kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl;
         if (mitInfo->state == ScreenSaverDisabled)
             activate = false;
@@ -265,7 +265,7 @@ bool XAutoLock::x11Event( XEvent* ev )
 
 bool XAutoLock::ignoreWindow( WId w )
 {
-    if( w != qt_xrootwin() && TQWidget::find( w ))
+    if( w != tqt_xrootwin() && TQWidget::find( w ))
         return true;
     return false;
 }