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/utils.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/utils.cpp')
| -rw-r--r-- | kwin/utils.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/kwin/utils.cpp b/kwin/utils.cpp index 5a8d5ad3c..796c7932b 100644 --- a/kwin/utils.cpp +++ b/kwin/utils.cpp @@ -36,14 +36,6 @@ License. See the file "COPYING" for the exact licensing terms. #include <Qt/qx11info_x11.h> #endif // USE_QT4 -#ifdef USE_QT4 -#define SET_X_TIME(x) QX11Info::setAppTime(x) -#else // USE_QT4 -#define SET_X_TIME(x) qt_x_time = x -#endif // USE_QT4 - -extern Time qt_x_time; - #endif namespace KWinInternal @@ -281,7 +273,7 @@ void updateXTime() XCheckIfEvent( qt_xdisplay(), &dummy, update_x_time_predicate, NULL ); } assert( next_x_time != CurrentTime ); - SET_X_TIME(next_x_time); + SET_QT_X_TIME(next_x_time); XEvent ev; // remove the PropertyNotify event from the events queue XWindowEvent( qt_xdisplay(), w->winId(), PropertyChangeMask, &ev ); } |