diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-03 23:58:37 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-03 23:58:37 +0000 |
| commit | e057cf9e08ab13e3f6ed139f6b0be3a06c2ec20c (patch) | |
| tree | a022bd82c4c7b10cd396a463dd491d2897f70abe /kwin/activation.cpp | |
| parent | c3e2931a5bb4c067b0983cf23d064264d1d6b175 (diff) | |
| download | tdebase-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/activation.cpp')
| -rw-r--r-- | kwin/activation.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kwin/activation.cpp b/kwin/activation.cpp index e964ed1b9..ad9dc8eba 100644 --- a/kwin/activation.cpp +++ b/kwin/activation.cpp @@ -31,8 +31,6 @@ License. See the file "COPYING" for the exact licensing terms. #include "group.h" #include "rules.h" -extern Time qt_x_time; - namespace KWinInternal { @@ -672,7 +670,7 @@ void Workspace::unfakeActivity( Client* c ) void Client::updateUserTime( Time time ) { // copied in Group::updateUserTime if( time == CurrentTime ) - time = qt_x_time; + time = GET_QT_X_TIME(); if( time != -1U && ( user_time == CurrentTime || timestampCompare( time, user_time ) > 0 )) // time > user_time @@ -997,7 +995,7 @@ void Group::startupIdChanged() void Group::updateUserTime( Time time ) { // copy of Client::updateUserTime if( time == CurrentTime ) - time = qt_x_time; + time = GET_QT_X_TIME(); if( time != -1U && ( user_time == CurrentTime || timestampCompare( time, user_time ) > 0 )) // time > user_time |