summaryrefslogtreecommitdiffstats
path: root/kwin/manage.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-03 23:58:37 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-03 23:58:37 +0000
commite057cf9e08ab13e3f6ed139f6b0be3a06c2ec20c (patch)
treea022bd82c4c7b10cd396a463dd491d2897f70abe /kwin/manage.cpp
parentc3e2931a5bb4c067b0983cf23d064264d1d6b175 (diff)
downloadtdebase-e057cf9e08ab13e3f6ed139f6b0be3a06c2ec20c.tar.gz
tdebase-e057cf9e08ab13e3f6ed139f6b0be3a06c2ec20c.zip
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
Diffstat (limited to 'kwin/manage.cpp')
-rw-r--r--kwin/manage.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/kwin/manage.cpp b/kwin/manage.cpp
index c50a504d0..3df18027e 100644
--- a/kwin/manage.cpp
+++ b/kwin/manage.cpp
@@ -25,8 +25,6 @@ License. See the file "COPYING" for the exact licensing terms.
#include "rules.h"
#include "group.h"
-extern Time qt_x_time;
-
namespace KWinInternal
{
@@ -522,9 +520,9 @@ bool Client::manage( Window w, bool isMapped )
if( user_time == CurrentTime || user_time == -1U ) // no known user time, set something old
{
- user_time = qt_x_time - 1000000;
+ user_time = GET_QT_X_TIME() - 1000000;
if( user_time == CurrentTime || user_time == -1U ) // let's be paranoid
- user_time = qt_x_time - 1000000 + 10;
+ user_time = GET_QT_X_TIME() - 1000000 + 10;
}
updateWorkareaDiffs();