Rename additional global functions and variables for tqt3

10 files changed, 20 insertions, 20 deletions

diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 31ced17a8..67c3903fe 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -103,7 +103,7 @@ TQPixmap TrayIcon::takeScreenshot() const
         y = desktopHeight - h;
 
         // Grab the desktop and draw a circle arround the icon:
-    TQPixmap shot = TQPixmap::grabWindow(qt_xrootwin(), x, y, w, h);
+    TQPixmap shot = TQPixmap::grabWindow(tqt_xrootwin(), x, y, w, h);
     TQPainter painter(&shot);
     const int MARGINS = 6;
     const int WIDTH   = 3;
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 0221ea86b..e1e897e37 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -1074,7 +1074,7 @@ bool runKOrganizer()
 void x11_cancelScreenSaver()
 {
 	kdDebug(5950) << "KAlarm::cancelScreenSaver()" << endl;
-	Display* display = qt_xdisplay();
+	Display* display = tqt_xdisplay();
 	static int XTestKeyCode = 0;
 	if (!XTestKeyCode)
 		XTestKeyCode = XKeysymToKeycode(display, XK_Shift_L);
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 81af39266..62c93f6ea 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -329,7 +329,7 @@ bool TrayWindow::inSystemTray() const
 	Window* children = 0;
 	unsigned int nchildren;
 	// Find the X parent window of the widget. This is not the same as the TQt parent widget.
-	if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &children, &nchildren))
+	if (!XQueryTree(tqt_xdisplay(), winId(), &root, &xParent, &children, &nchildren))
 		return true;    // error determining its parent X window
 	if (children)
 		XFree(children);
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index bd0b253c2..03aba9216 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -16,7 +16,7 @@ IdleTimeDetector::IdleTimeDetector(int maxIdle)
 #ifdef HAVE_LIBXSS
   kdDebug(5970) << "IdleTimeDetector: LIBXSS detected @ compile time" << endl;
   int event_base, error_base;
-  if(XScreenSaverQueryExtension(qt_xdisplay(), &event_base, &error_base)) 
+  if(XScreenSaverQueryExtension(tqt_xdisplay(), &event_base, &error_base)) 
   {
     _idleDetectionPossible = true;
   }
@@ -45,7 +45,7 @@ void IdleTimeDetector::check()
   if (_idleDetectionPossible)
   {
     _mit_info = XScreenSaverAllocInfo ();
-    XScreenSaverQueryInfo(qt_xdisplay(), qt_xrootwin(), _mit_info);
+    XScreenSaverQueryInfo(tqt_xdisplay(), tqt_xrootwin(), _mit_info);
     int idleSeconds = (_mit_info->idle/1000);
     if (idleSeconds >= _maxIdle)
       informOverrun(idleSeconds);
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index fef3b89ce..911f85a4f 100644
--- a/kmail/filterlogdlg.cpp
+++ b/kmail/filterlogdlg.cpp
@@ -159,7 +159,7 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent )
   // HACK - KWin keeps all dialogs on top of their mainwindows, but that's probably
   // wrong (#76026), and should be done only for modals. CVS HEAD should get
   // proper fix in KWin (see also searchwindow.cpp)
-  XDeleteProperty( qt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR );
+  XDeleteProperty( tqt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR );
 #endif
 }
 
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index eac720214..dc226b9b0 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -125,7 +125,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
   // HACK - KWin keeps all dialogs on top of their mainwindows, but that's probably
   // wrong (#76026), and should be done only for modals. CVS HEAD should get
   // proper fix in KWin (l.lunak@kde.org)
-  XDeleteProperty( qt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR );
+  XDeleteProperty( tqt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR );
 #endif
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 2b0ae9599..182aee863 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -443,7 +443,7 @@ void KNote::saveConfig() const
       m_config->setHeight( 0 );
     m_config->setPosition( pos() );
 
-    NETWinInfo wm_client( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMDesktop );
+    NETWinInfo wm_client( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMDesktop );
     if ( wm_client.desktop() == NETWinInfo::OnAllDesktops || wm_client.desktop() > 0 )
         m_config->setDesktop( wm_client.desktop() );
 
@@ -489,7 +489,7 @@ void KNote::setName( const TQString& name )
         saveData();
 
     // set the window's name for the taskbar entry to be more helpful (#58338)
-    NETWinInfo note_win( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMDesktop );
+    NETWinInfo note_win( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMDesktop );
     note_win.setName( name.utf8() );
 
     emit sigNameChanged();
@@ -758,7 +758,7 @@ void KNote::slotUpdateReadOnly()
 
 void KNote::slotClose()
 {
-    NETWinInfo wm_client( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMDesktop );
+    NETWinInfo wm_client( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMDesktop );
     if ( wm_client.desktop() == NETWinInfo::OnAllDesktops || wm_client.desktop() > 0 )
         m_config->setDesktop( wm_client.desktop() );
 
@@ -977,8 +977,8 @@ void KNote::slotUpdateShowInTaskbar()
 
 void KNote::slotUpdateDesktopActions()
 {
-    NETRootInfo wm_root( qt_xdisplay(), NET::NumberOfDesktops | NET::DesktopNames );
-    NETWinInfo wm_client( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMDesktop );
+    NETRootInfo wm_root( tqt_xdisplay(), NET::NumberOfDesktops | NET::DesktopNames );
+    NETWinInfo wm_client( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMDesktop );
 
     TQStringList desktops;
     desktops.append( i18n("&All Desktops") );
@@ -1334,8 +1334,8 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev )
             e->button() == Qt::LeftButton ? KWin::raiseWindow( winId() )
                                       : KWin::lowerWindow( winId() );
 
-            XUngrabPointer( qt_xdisplay(), GET_QT_X_TIME() );
-            NETRootInfo wm_root( qt_xdisplay(), NET::WMMoveResize );
+            XUngrabPointer( tqt_xdisplay(), GET_QT_X_TIME() );
+            NETRootInfo wm_root( tqt_xdisplay(), NET::WMMoveResize );
             wm_root.moveResizeRequest( winId(), e->globalX(), e->globalY(), NET::Move );
             return true;
         }
@@ -1343,7 +1343,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev )
 #if KDE_IS_VERSION( 3, 5, 1 )
         if ( ev->type() == TQEvent::MouseButtonRelease )
         {
-            NETRootInfo wm_root( qt_xdisplay(), NET::WMMoveResize );
+            NETRootInfo wm_root( tqt_xdisplay(), NET::WMMoveResize );
             wm_root.moveResizeRequest( winId(), e->globalX(), e->globalY(), NET::MoveResizeCancel );
             return false;
         }
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index e62c3f456..27c13ee50 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -102,7 +102,7 @@ KNotesApp::KNotesApp()
     m_noteActions.setAutoDelete( true );
 
     // create the dock widget...
-    KWin::setSystemTrayWindowFor( winId(), qt_xrootwin() );
+    KWin::setSystemTrayWindowFor( winId(), tqt_xrootwin() );
     TQToolTip::add( this, i18n( "KNotes: Sticky notes for KDE" ) );
     setBackgroundMode( X11ParentRelative );
     setPixmap( KSystemTray::loadSizedIcon( "knotes", TQWidget::width() ) );
diff --git a/knotes/main.cpp b/knotes/main.cpp
index bf38e4c71..a14d52acf 100644
--- a/knotes/main.cpp
+++ b/knotes/main.cpp
@@ -43,11 +43,11 @@ void remove_sm_from_client_leader()
     Atom atoms[ 2 ];
     char *atom_names[ 2 ] = { (char*)"WM_CLIENT_LEADER", (char*)"SM_CLIENT_ID" };
 
-    XInternAtoms( qt_xdisplay(), atom_names, 2, False, atoms );
+    XInternAtoms( tqt_xdisplay(), atom_names, 2, False, atoms );
 
     TQWidget w;
     KXErrorHandler handler; // ignore X errors
-    status = XGetWindowProperty( qt_xdisplay(), w.winId(), atoms[ 0 ], 0, 10000,
+    status = XGetWindowProperty( tqt_xdisplay(), w.winId(), atoms[ 0 ], 0, 10000,
                                  FALSE, XA_WINDOW, &type, &format,
                                  &nitems, &extra, &data );
 
@@ -56,7 +56,7 @@ void remove_sm_from_client_leader()
         if (data && nitems > 0)
         {
             Window leader = *((Window*) data);
-            XDeleteProperty( qt_xdisplay(), leader, atoms[ 1 ] );
+            XDeleteProperty( tqt_xdisplay(), leader, atoms[ 1 ] );
         }
         XFree(data);
     }
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 1ced5338e..d84340789 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -507,7 +507,7 @@ void KODayMatrix::dropEvent( TQDropEvent *e )
   int root_x, root_y, win_x, win_y;
   uint keybstate;
   Window rootw, childw;
-  XQueryPointer( qt_xdisplay(), qt_xrootwin(), &rootw, &childw,
+  XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &rootw, &childw,
                  &root_x, &root_y, &win_x, &win_y, &keybstate );
 
   if ( keybstate & ControlMask ) {