diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-03 20:56:33 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-03 20:56:33 +0000 |
| commit | 7b12a18bb964683b857ca2250db3919303a99838 (patch) | |
| tree | 1a2215bcfa2bdb06cac04a103d2d9e3617852212 /kdecore/kwin.cpp | |
| parent | b1960071ca0d9303610b4afd8c07afdf1f091756 (diff) | |
| download | tdelibs-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/kwin.cpp')
| -rw-r--r-- | kdecore/kwin.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kdecore/kwin.cpp b/kdecore/kwin.cpp index 706b985fb..01f942aac 100644 --- a/kdecore/kwin.cpp +++ b/kdecore/kwin.cpp @@ -57,8 +57,6 @@ static bool atoms_created = false; extern Atom qt_wm_protocols; -extern Time qt_x_time; -extern Time qt_x_user_time; static Atom net_wm_context_help; static Atom kde_wm_change_state; @@ -241,7 +239,7 @@ void KWin::activateWindow( WId win, long time ) #ifdef Q_WS_X11 NETRootInfo info( qt_xdisplay(), 0 ); if( time == 0 ) - time = qt_x_user_time; + time = GET_QT_X_USER_TIME(); info.setActiveWindow( win, NET::FromApplication, time, kapp->activeWindow() ? kapp->activeWindow()->winId() : 0 ); #endif // Q_WS_X11 ... @@ -253,7 +251,7 @@ void KWin::forceActiveWindow( WId win, long time ) #ifdef Q_WS_X11 NETRootInfo info( qt_xdisplay(), 0 ); if( time == 0 ) - time = qt_x_time; + time = GET_QT_X_TIME(); info.setActiveWindow( win, NET::FromTool, time, 0 ); #endif // Q_WS_X11 KUniqueApplication::setHandleAutoStarted(); |