Rename additional global functions and variables for tqt3

6 files changed, 44 insertions, 44 deletions

diff --git a/klaptopdaemon/xautolock.cc b/klaptopdaemon/xautolock.cc
index 630b175..61502ab 100644
--- a/klaptopdaemon/xautolock.cc
+++ b/klaptopdaemon/xautolock.cc
@@ -61,20 +61,20 @@ XAutoLock::XAutoLock()
     xautolock_useXidle = 0;
     xautolock_useMit = 0;
 #ifdef HAVE_XIDLE
-    useXidle = XidleQueryExtension( qt_xdisplay(), &dummy, &dummy );
+    useXidle = XidleQueryExtension( tqt_xdisplay(), &dummy, &dummy );
 #endif
 #ifdef HAVE_XSCREENSAVER
     if( !xautolock_useXidle )
-        xautolock_useMit = XScreenSaverQueryExtension( qt_xdisplay(), &dummy, &dummy );
+        xautolock_useMit = XScreenSaverQueryExtension( tqt_xdisplay(), &dummy, &dummy );
 #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);
     }
 
@@ -175,7 +175,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);
     }
 
@@ -193,8 +193,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);
@@ -211,7 +211,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
@@ -229,7 +229,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;
@@ -253,7 +253,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;
 }
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp
index df4c6a4..7851509 100644
--- a/ksim/monitors/lm_sensors/sensorbase.cpp
+++ b/ksim/monitors/lm_sensors/sensorbase.cpp
@@ -72,7 +72,7 @@ SensorBase::SensorBase() : TQObject()
   {
       int eventBase;
       int errorBase;
-      m_hasNVControl = XNVCTRLQueryExtension(qt_xdisplay(), &eventBase, &errorBase) == True;
+      m_hasNVControl = XNVCTRLQueryExtension(tqt_xdisplay(), &eventBase, &errorBase) == True;
   }
 
   m_updateTimer = new TQTimer(this);
@@ -133,13 +133,13 @@ void SensorBase::update()
 
   if (m_hasNVControl) {
       int temp = 0;
-      if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_GPU_CORE_TEMPERATURE, &temp)) {
+      if (XNVCTRLQueryAttribute(tqt_xdisplay(), tqt_xscreen(), 0 /* not used? */, NV_CTRL_GPU_CORE_TEMPERATURE, &temp)) {
           TQString name = TQString::fromLatin1("GPU Temp");
           m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp),
                                          name, TQString(), TQString(), sensorType(name)));
       }
 
-      if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_AMBIENT_TEMPERATURE, &temp)) {
+      if (XNVCTRLQueryAttribute(tqt_xdisplay(), tqt_xscreen(), 0 /* not used? */, NV_CTRL_AMBIENT_TEMPERATURE, &temp)) {
           TQString name = TQString::fromLatin1("GPU Ambient Temp");
           m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp),
                                          name, TQString(), TQString(), sensorType(name)));
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index 9bcb01d..d6e270a 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -136,7 +136,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
   }
 
   widgetMask = 0;
-  info = new NETWinInfo( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMState );
+  info = new NETWinInfo( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMState );
 
   // could be replaced with TaskManager
   kWinModule = new KWinModule();
diff --git a/superkaramba/src/showdesktop.cpp b/superkaramba/src/showdesktop.cpp
index 16a04b8..57d1f46 100644
--- a/superkaramba/src/showdesktop.cpp
+++ b/superkaramba/src/showdesktop.cpp
@@ -65,7 +65,7 @@ void ShowDesktop::slotWindowChanged(WId w, unsigned int dirty)
   // SELI this needs checking for twin_iii (_NET_SHOWING_DESKTOP)
   if ( dirty & NET::XAWMState )
   {
-    NETWinInfo inf(qt_xdisplay(), w, qt_xrootwin(),
+    NETWinInfo inf(tqt_xdisplay(), w, tqt_xrootwin(),
                    NET::XAWMState | NET::WMWindowType);
 #ifdef KDE_3_2
     NET::WindowType windowType = inf.windowType(NET_ALL_TYPES_MASK);
@@ -96,7 +96,7 @@ void ShowDesktop::showDesktop( bool b )
         TQValueList<WId>::ConstIterator end( windows.end() );
         for ( it=windows.begin(); it!=end; ++it ) {
             WId w = *it;
-            NETWinInfo info( qt_xdisplay(), w, qt_xrootwin(),
+            NETWinInfo info( tqt_xdisplay(), w, tqt_xrootwin(),
                              NET::XAWMState | NET::WMDesktop );
             if ( info.mappingState() == NET::Visible &&
                  ( info.desktop() == NETWinInfo::OnAllDesktops
diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp
index 353f7de..fbe220d 100644
--- a/superkaramba/src/systemtray.cpp
+++ b/superkaramba/src/systemtray.cpp
@@ -68,18 +68,18 @@ void Systemtray::updateBackgroundPixmap ( const TQPixmap & pixmap) {
   }
 
     TQPoint topPoint = mapToGlobal(TQPoint(0,0));
-    Window hack = XCreateSimpleWindow(qt_xdisplay(), winId(), 0,0, width(), height(), 0, 0, 0);
-    XRaiseWindow(qt_xdisplay(), hack);
-    XMapWindow(qt_xdisplay(), hack);
-    XUnmapWindow(qt_xdisplay(), hack);
-    XDestroyWindow(qt_xdisplay(), hack);
+    Window hack = XCreateSimpleWindow(tqt_xdisplay(), winId(), 0,0, width(), height(), 0, 0, 0);
+    XRaiseWindow(tqt_xdisplay(), hack);
+    XMapWindow(tqt_xdisplay(), hack);
+    XUnmapWindow(tqt_xdisplay(), hack);
+    XDestroyWindow(tqt_xdisplay(), hack);
 }
 
 void Systemtray::initSystray( void )
 {
   bool existing = false;
   //bool content = false;
-  Display *display = qt_xdisplay();
+  Display *display = tqt_xdisplay();
   no_of_systray_windows = 0;
 
   twin_module = new KWinModule();
@@ -111,7 +111,7 @@ void Systemtray::initSystray( void )
   connect(twin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId)));
 
   TQCString screenstr;
-  screenstr.setNum(qt_xscreen());
+  screenstr.setNum(tqt_xscreen());
   TQCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr;
 
   net_system_tray_selection = XInternAtom( display, trayatom, false );
@@ -123,7 +123,7 @@ void Systemtray::initSystray( void )
     winId(),
     CurrentTime );
 
-  WId root = qt_xrootwin();
+  WId root = tqt_xrootwin();
 
   if (XGetSelectionOwner(display, net_system_tray_selection) == winId())
   {
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 79ef9a9..1092342 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -114,7 +114,7 @@ Task* TaskManager::findTask(WId w)
 
 void TaskManager::windowAdded(WId w )
 {
-  NETWinInfo info(qt_xdisplay(),  w, qt_xrootwin(),
+  NETWinInfo info(tqt_xdisplay(),  w, tqt_xrootwin(),
                   NET::WMWindowType | NET::WMPid | NET::WMState );
   #ifdef KDE_3_2
   NET::WindowType windowType = info.windowType(NET_ALL_TYPES_MASK);
@@ -133,7 +133,7 @@ void TaskManager::windowAdded(WId w )
   }
 
   Window transient_for_tmp;
-  if (XGetTransientForHint(qt_xdisplay(), (Window) w, &transient_for_tmp))
+  if (XGetTransientForHint(tqt_xdisplay(), (Window) w, &transient_for_tmp))
   {
     WId transient_for = (WId) transient_for_tmp;
 
@@ -142,7 +142,7 @@ void TaskManager::windowAdded(WId w )
       return;
 
     // lets see if this is a transient for an existing task
-    if (transient_for != qt_xrootwin() && transient_for != 0 )
+    if (transient_for != tqt_xrootwin() && transient_for != 0 )
     {
       Task* t = findTask(transient_for);
       if (t)
@@ -188,7 +188,7 @@ void TaskManager::windowRemoved(WId w )
 void TaskManager::windowChanged(WId w, unsigned int dirty)
 {
     if( dirty & NET::WMState ) {
-        NETWinInfo info ( qt_xdisplay(),  w, qt_xrootwin(), NET::WMState );
+        NETWinInfo info ( tqt_xdisplay(),  w, tqt_xrootwin(), NET::WMState );
         if ( (info.state() & NET::SkipTaskbar) != 0 ) {
             windowRemoved( w );
             _skiptaskbar_windows.push_front( w );
@@ -474,19 +474,19 @@ bool Task::isModified() const
 
 TQString Task::iconName() const
 {
-    NETWinInfo ni( qt_xdisplay(),  _win, qt_xrootwin(), NET::WMIconName);
+    NETWinInfo ni( tqt_xdisplay(),  _win, tqt_xrootwin(), NET::WMIconName);
     return TQString::fromUtf8(ni.iconName());
 }
 TQString Task::visibleIconName() const
 {
-    NETWinInfo ni( qt_xdisplay(),  _win, qt_xrootwin(), NET::WMVisibleIconName);
+    NETWinInfo ni( tqt_xdisplay(),  _win, tqt_xrootwin(), NET::WMVisibleIconName);
     return TQString::fromUtf8(ni.visibleIconName());
 }
 
 TQString Task::className()
 {
     XClassHint hint;
-    if(XGetClassHint(qt_xdisplay(), _win, &hint)) {
+    if(XGetClassHint(tqt_xdisplay(), _win, &hint)) {
   TQString nh( hint.res_name );
   XFree( hint.res_name );
   XFree( hint.res_class );
@@ -498,7 +498,7 @@ TQString Task::className()
 TQString Task::classClass()
 {
     XClassHint hint;
-    if(XGetClassHint(qt_xdisplay(), _win, &hint)) {
+    if(XGetClassHint(tqt_xdisplay(), _win, &hint)) {
   TQString ch( hint.res_class );
   XFree( hint.res_name );
   XFree( hint.res_class );
@@ -620,7 +620,7 @@ bool Task::idMatch( const TQString& id1, const TQString& id2 )
 
 void Task::maximize()
 {
-  NETWinInfo ni( qt_xdisplay(),  _win, qt_xrootwin(), NET::WMState);
+  NETWinInfo ni( tqt_xdisplay(),  _win, tqt_xrootwin(), NET::WMState);
   ni.setState( NET::Max, NET::Max );
 
 #ifdef KDE_3_2
@@ -633,7 +633,7 @@ void Task::maximize()
 
 void Task::restore()
 {
-  NETWinInfo ni( qt_xdisplay(),  _win, qt_xrootwin(), NET::WMState);
+  NETWinInfo ni( tqt_xdisplay(),  _win, tqt_xrootwin(), NET::WMState);
   ni.setState( 0, NET::Max );
 #ifdef KDE_3_2
   if (_info.mappingState() == NET::Iconic)
@@ -645,31 +645,31 @@ void Task::restore()
 
 void Task::iconify()
 {
-  XIconifyWindow( qt_xdisplay(), _win, qt_xscreen() );
+  XIconifyWindow( tqt_xdisplay(), _win, tqt_xscreen() );
 }
 
 void Task::close()
 {
-    NETRootInfo ri( qt_xdisplay(),  NET::CloseWindow );
+    NETRootInfo ri( tqt_xdisplay(),  NET::CloseWindow );
     ri.closeWindowRequest( _win );
 }
 
 void Task::raise()
 {
 //    kdDebug(1210) << "Task::raise(): " << name() << endl;
-    XRaiseWindow( qt_xdisplay(), _win );
+    XRaiseWindow( tqt_xdisplay(), _win );
 }
 
 void Task::lower()
 {
 //    kdDebug(1210) << "Task::lower(): " << name() << endl;
-    XLowerWindow( qt_xdisplay(), _win );
+    XLowerWindow( tqt_xdisplay(), _win );
 }
 
 void Task::activate()
 {
 //    kdDebug(1210) << "Task::activate():" << name() << endl;
-    NETRootInfo ri( qt_xdisplay(), 0 );
+    NETRootInfo ri( tqt_xdisplay(), 0 );
     ri.setActiveWindow( _win );
 }
 
@@ -686,7 +686,7 @@ void Task::activateRaiseOrIconify()
 
 void Task::toDesktop(int desk)
 {
-  NETWinInfo ni(qt_xdisplay(), _win, qt_xrootwin(), NET::WMDesktop);
+  NETWinInfo ni(tqt_xdisplay(), _win, tqt_xrootwin(), NET::WMDesktop);
   if (desk == 0)
   {
 #ifdef KDE_3_2
@@ -722,7 +722,7 @@ void Task::toCurrentDesktop()
 
 void Task::setAlwaysOnTop(bool stay)
 {
-    NETWinInfo ni( qt_xdisplay(),  _win, qt_xrootwin(), NET::WMState);
+    NETWinInfo ni( tqt_xdisplay(),  _win, tqt_xrootwin(), NET::WMState);
     if(stay)
         ni.setState( NET::StaysOnTop, NET::StaysOnTop );
     else
@@ -736,7 +736,7 @@ void Task::toggleAlwaysOnTop()
 
 void Task::setShaded(bool shade)
 {
-    NETWinInfo ni( qt_xdisplay(),  _win, qt_xrootwin(), NET::WMState);
+    NETWinInfo ni( tqt_xdisplay(),  _win, tqt_xrootwin(), NET::WMState);
     if(shade)
         ni.setState( NET::Shaded, NET::Shaded );
     else
@@ -750,7 +750,7 @@ void Task::toggleShaded()
 
 void Task::publishIconGeometry(TQRect rect)
 {
-    NETWinInfo ni( qt_xdisplay(),  _win, qt_xrootwin(), NET::WMIconGeometry);
+    NETWinInfo ni( tqt_xdisplay(),  _win, tqt_xrootwin(), NET::WMIconGeometry);
     NETRect r;
     r.pos.x = rect.x();
     r.pos.y = rect.y();