summaryrefslogtreecommitdiffstats
path: root/kdecore/kstartupinfo.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-03 20:56:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-03 20:56:33 +0000
commit7b12a18bb964683b857ca2250db3919303a99838 (patch)
tree1a2215bcfa2bdb06cac04a103d2d9e3617852212 /kdecore/kstartupinfo.cpp
parentb1960071ca0d9303610b4afd8c07afdf1f091756 (diff)
downloadtdelibs-7b12a18bb964683b857ca2250db3919303a99838.tar.gz
tdelibs-7b12a18bb964683b857ca2250db3919303a99838.zip
Wean kdelibs off of the qt_x_*_time static variables
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1226986 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kstartupinfo.cpp')
-rw-r--r--kdecore/kstartupinfo.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/kdecore/kstartupinfo.cpp b/kdecore/kstartupinfo.cpp
index a55c82f55..19ba9797f 100644
--- a/kdecore/kstartupinfo.cpp
+++ b/kdecore/kstartupinfo.cpp
@@ -934,13 +934,8 @@ TQCString KStartupInfo::createNewStartupId()
hostname[ 0 ] = '\0';
if (!gethostname( hostname, 255 ))
hostname[sizeof(hostname)-1] = '\0';
-#ifdef Q_WS_X11
- extern Time qt_x_user_time;
-#else
- unsigned long qt_x_user_time = 0;
-#endif
TQCString id = TQString(TQString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
- .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time )).utf8();
+ .arg( tm.tv_usec ).arg( getpid()).arg( GET_QT_X_USER_TIME() )).utf8();
kdDebug( 172 ) << "creating: " << id << ":" << tqAppName() << endl;
return id;
}