diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
| commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
| tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kwin/activation.cpp | |
| parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
| download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip | |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin/activation.cpp')
| -rw-r--r-- | kwin/activation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kwin/activation.cpp b/kwin/activation.cpp index 2cd836555..e964ed1b9 100644 --- a/kwin/activation.cpp +++ b/kwin/activation.cpp @@ -433,7 +433,7 @@ bool Workspace::activateNextClient( Client* c ) if( c == NULL && !(*it)->isOnScreen( activeScreen())) continue; } - if( mainwindows.contains( *it )) + if( mainwindows.tqcontains( *it )) { get_focus = *it; break; @@ -486,7 +486,7 @@ void Workspace::setCurrentScreen( int new_screen ) void Workspace::gotFocusIn( const Client* c ) { - if( should_get_focus.contains( const_cast< Client* >( c ))) + if( should_get_focus.tqcontains( const_cast< Client* >( c ))) { // remove also all sooner elements that should have got FocusIn, // but didn't for some reason (and also won't anymore, because they were sooner) while( should_get_focus.first() != c ) @@ -523,7 +523,7 @@ bool Workspace::allowClientActivation( const Client* c, Time time, bool focus_in Client* ac = mostRecentlyActivatedClient(); if( focus_in ) { - if( should_get_focus.contains( const_cast< Client* >( c ))) + if( should_get_focus.tqcontains( const_cast< Client* >( c ))) return true; // FocusIn was result of KWin's action // Before getting FocusIn, the active Client already // got FocusOut, and therefore got deactivated. |