diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 9a3f0aacd44fb866833ebcb852df3cd31475cb33 (patch) | |
tree | 9f699684624f4e78e13e7dd2393a103cc6fa8274 /kwin/layers.cpp | |
parent | 341ad02235b9c85cd31782225181ed475b74eaa3 (diff) | |
download | tdebase-9a3f0aacd44fb866833ebcb852df3cd31475cb33.tar.gz tdebase-9a3f0aacd44fb866833ebcb852df3cd31475cb33.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin/layers.cpp')
-rw-r--r-- | kwin/layers.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kwin/layers.cpp b/kwin/layers.cpp index 8bb3f8c99..7f6c90378 100644 --- a/kwin/layers.cpp +++ b/kwin/layers.cpp @@ -304,7 +304,7 @@ void Workspace::raiseOrLowerClient( Client *c) if (!c) return; Client* topmost = NULL; // TODO Q_ASSERT( block_stacking_updates == 0 ); - if ( most_recently_raised && stacking_order.tqcontains( most_recently_raised ) && + if ( most_recently_raised && stacking_order.contains( most_recently_raised ) && most_recently_raised->isShown( true ) && c->isOnCurrentDesktop()) topmost = most_recently_raised; else @@ -469,11 +469,11 @@ void Workspace::restackClientUnderActive( Client* c ) return; } - assert( unconstrained_stacking_order.tqcontains( active_client )); + assert( unconstrained_stacking_order.contains( active_client )); if( Client::belongToSameApplication( active_client, c )) { // put it below the active window if it's the same app unconstrained_stacking_order.remove( c ); - unconstrained_stacking_order.insert( unconstrained_stacking_order.tqfind( active_client ), c ); + unconstrained_stacking_order.insert( unconstrained_stacking_order.find( active_client ), c ); } else { // put in the stacking order below _all_ windows belonging to the active application @@ -492,17 +492,17 @@ void Workspace::restackClientUnderActive( Client* c ) } } } - assert( unconstrained_stacking_order.tqcontains( c )); + assert( unconstrained_stacking_order.contains( c )); for( int desktop = 1; desktop <= numberOfDesktops(); ++desktop ) { // do for every virtual desktop to handle the case of onalldesktop windows - if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].tqcontains( active_client )) + if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].contains( active_client )) { if( Client::belongToSameApplication( active_client, c )) { // put it after the active window if it's the same app focus_chain[ desktop ].remove( c ); - focus_chain[ desktop ].insert( focus_chain[ desktop ].tqfind( active_client ), c ); + focus_chain[ desktop ].insert( focus_chain[ desktop ].find( active_client ), c ); } else { // put it in focus_chain[currentDesktop()] after all windows belonging to the active applicationa @@ -521,12 +521,12 @@ void Workspace::restackClientUnderActive( Client* c ) } } // the same for global_focus_chain - if( c->wantsTabFocus() && global_focus_chain.tqcontains( active_client )) + if( c->wantsTabFocus() && global_focus_chain.contains( active_client )) { if( Client::belongToSameApplication( active_client, c )) { global_focus_chain.remove( c ); - global_focus_chain.insert( global_focus_chain.tqfind( active_client ), c ); + global_focus_chain.insert( global_focus_chain.find( active_client ), c ); } else { @@ -581,7 +581,7 @@ ClientList Workspace::constrainedStackingOrder() // If a window is raised above some other window in the same window group // which is in the ActiveLayer (i.e. it's fulscreened), make sure it stays // above that window (see #95731). - if( minimum_layer.tqcontains( (*it)->group()) + if( minimum_layer.contains( (*it)->group()) && minimum_layer[ (*it)->group() ] == ActiveLayer && ( l == NormalLayer || l == AboveLayer )) { |