Wean kdebase off of hacky static qt_x_*_tim variables

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1227011 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 11 insertions, 14 deletions

diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc
index a22788858..a512f5686 100644
--- a/konqueror/KonquerorIface.cc
+++ b/konqueror/KonquerorIface.cc
@@ -39,7 +39,6 @@
 // TODO a valid timestamp should be passed in the DCOP calls that
 // are not for user scripting
 #include <X11/Xlib.h>
-extern Time qt_x_user_time;
 
 KonquerorIface::KonquerorIface()
  : DCOPObject( "KonquerorIface" )
@@ -52,7 +51,7 @@ KonquerorIface::~KonquerorIface()
 
 DCOPRef KonquerorIface::openBrowserWindow( const TQString &url )
 {
-    qt_x_user_time = 0;
+    SET_QT_X_USER_TIME(0);
     KonqMainWindow *res = KonqMisc::createSimpleWindow( KURL(url) );
     if ( !res )
         return DCOPRef();
@@ -78,7 +77,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString
 
 DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStringList filesToSelect )
 {
-    qt_x_user_time = 0;
+    SET_QT_X_USER_TIME(0);
     KonqMainWindow *res = KonqMisc::createNewWindow( KURL(url), KParts::URLArgs(), false, filesToSelect );
     if ( !res )
         return DCOPRef();
@@ -93,7 +92,7 @@ DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQ
 
 DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mimetype, bool tempFile )
 {
-    qt_x_user_time = 0;
+    SET_QT_X_USER_TIME(0);
     KParts::URLArgs args;
     args.serviceType = mimetype;
     // Filter the URL, so that "kfmclient openURL gg:foo" works also when konq is already running
@@ -113,7 +112,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path )
 {
-    qt_x_user_time = 0;
+    SET_QT_X_USER_TIME(0);
     kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) " << endl;
     kdDebug(1202) << path << endl;
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, TQString::null );
@@ -130,7 +129,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path,
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, const TQString &filename )
 {
-    qt_x_user_time = 0;
+    SET_QT_X_USER_TIME(0);
     kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( path, filename ) " << endl;
     kdDebug(1202) << path << "," << filename << endl;
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename );
@@ -148,7 +147,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path,
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & path, const TQString &filename, const TQString &url )
 {
-    qt_x_user_time = 0;
+    SET_QT_X_USER_TIME(0);
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url) );
     if ( !res )
         return DCOPRef();
@@ -164,7 +163,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype )
 {
-    qt_x_user_time = 0;
+    SET_QT_X_USER_TIME(0);
     KParts::URLArgs args;
     args.serviceType = mimetype;
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url), args );
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 79b88daa3..aa237261f 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -1292,8 +1292,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
 // well. If the WM has support for _NET_WM_USER_TIME, it will be just set to 0 (=don't focus on show),
 // and the WM should take care of it itself.
     bool wm_usertime_support = false;
-    extern Time qt_x_user_time;
-    Time saved_last_input_time = qt_x_user_time;
+    Time saved_last_input_time = GET_QT_X_USER_TIME();
     if ( windowArgs.lowerWindow )
     {
         NETRootInfo wm_info( qt_xdisplay(), NET::Supported );
@@ -1303,7 +1302,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
         // *sigh*, and I thought nobody would need TQWidget::dontFocusOnShow().
         // Avoid Qt's support for user time by setting it to 0, and
         // set the property ourselves.
-            qt_x_user_time = 0;
+            SET_QT_X_USER_TIME(0);
             KWin::setUserTime( mainWindow->winId(), 0 );
         }
         // Put below the current window before showing, in case that actually works with the WM.
@@ -1316,7 +1315,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
 
     if ( windowArgs.lowerWindow )
     {
-        qt_x_user_time = saved_last_input_time;
+        SET_QT_X_USER_TIME(saved_last_input_time);
         if( !wm_usertime_support )
         { // No WM support. Let's try ugly tricks.
             mainWindow->lower();
@@ -5815,8 +5814,7 @@ void KonqMainWindow::resetWindow()
     static Atom atom = XInternAtom( qt_xdisplay(), "_KDE_NET_WM_USER_CREATION_TIME", False );
     XChangeProperty( qt_xdisplay(), winId(), atom, XA_CARDINAL, 32,
 		     PropModeReplace, (unsigned char *) &x_time, 1);
-    extern Time qt_x_user_time;   // reset also user time, so that this window
-    qt_x_user_time = CurrentTime; // won't have _NET_WM_USER_TIME set
+    SET_QT_X_USER_TIME(CurrentTime); // won't have _NET_WM_USER_TIME set
 #if !KDE_IS_VERSION( 3, 2, 90 ) // _KDE_NET_USER_TIME is obsolete
     static Atom atom2 = XInternAtom( qt_xdisplay(), "_KDE_NET_USER_TIME", False );
     timeval tv;