From 99f8ff81b59e27ca0946951f7dbbb30b9195659c Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 6 Mar 2006 14:30:06 +0000 Subject: [PATCH] Deprecated-- svn path=/trunk/KDE/kdebase/kmenuedit/; revision=516274 --- activation.cpp | 6 +++--- kcmkwin/kwinrules/main.cpp | 2 +- layers.cpp | 14 +++++++------- lib/kdecorationfactory.cpp | 2 +- sm.cpp | 6 +++--- tabbox.cpp | 4 ++-- workspace.h | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/activation.cpp b/activation.cpp index 1272f1e933..a42111934f 100644 --- a/activation.cpp +++ b/activation.cpp @@ -394,7 +394,7 @@ bool Workspace::activateNextClient( Client* c ) { if( c == active_client ) setActiveClient( NULL, Allowed ); - should_get_focus.remove( c ); + should_get_focus.removeAll( c ); } if( focusChangeEnabled()) { @@ -577,11 +577,11 @@ void Workspace::clientAttentionChanged( Client* c, bool set ) { if( set ) { - attention_chain.remove( c ); + attention_chain.removeAll( c ); attention_chain.prepend( c ); } else - attention_chain.remove( c ); + attention_chain.removeAll( c ); } // This is used when a client should be shown active immediately after requestFocus(), diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp index 0c22635868..4a70a8970d 100644 --- a/kcmkwin/kwinrules/main.cpp +++ b/kcmkwin/kwinrules/main.cpp @@ -242,7 +242,7 @@ static int edit( Window wid, bool whole_app ) Rules* edited_rule = dlg.edit( orig_rule, wid, true ); if( edited_rule == NULL || edited_rule->isEmpty()) { - rules.remove( orig_rule ); + rules.removeAll( orig_rule ); delete orig_rule; if( orig_rule != edited_rule ) delete edited_rule; diff --git a/layers.cpp b/layers.cpp index b21c402dfe..1d7ea109f1 100644 --- a/layers.cpp +++ b/layers.cpp @@ -261,7 +261,7 @@ void Workspace::lowerClient( Client* c ) StackingUpdatesBlocker blocker( this ); - unconstrained_stacking_order.remove( c ); + unconstrained_stacking_order.removeAll( c ); unconstrained_stacking_order.prepend( c ); if( c->isTransient()) { @@ -288,7 +288,7 @@ void Workspace::lowerClientWithinApplication( Client* c ) StackingUpdatesBlocker blocker( this ); - unconstrained_stacking_order.remove( c ); + unconstrained_stacking_order.removeAll( c ); bool lowered = false; // first try to put it below the bottom-most window of the application for( ClientList::Iterator it = unconstrained_stacking_order.begin(); @@ -325,7 +325,7 @@ void Workspace::raiseClient( Client* c ) raiseClient( *it ); } - unconstrained_stacking_order.remove( c ); + unconstrained_stacking_order.removeAll( c ); unconstrained_stacking_order.append( c ); if( !c->isSpecialWindow()) @@ -354,7 +354,7 @@ void Workspace::raiseClientWithinApplication( Client* c ) return; if( Client::belongToSameApplication( unconstrained_stacking_order.at( i ), c )) { - unconstrained_stacking_order.remove( c ); + unconstrained_stacking_order.removeAll( c ); unconstrained_stacking_order.insert( ++i, c ); // insert after the found one return; } @@ -404,7 +404,7 @@ void Workspace::restackClientUnderActive( Client* c ) { if( *it != c ) { - unconstrained_stacking_order.remove( c ); + unconstrained_stacking_order.removeAll( c ); unconstrained_stacking_order.insert( it, c ); } break; @@ -418,7 +418,7 @@ void Workspace::restackClientUnderActive( Client* c ) if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].contains( active_client )) { // also put in focus_chain[currentDesktop()] after all windows belonging to the active applicationa - focus_chain[ desktop ].remove( c ); + focus_chain[ desktop ].removeAll( c ); for ( int i = focus_chain[ desktop ].size() - 1; i >= 0; --i ) @@ -586,7 +586,7 @@ ClientList Workspace::ensureStackingOrder( const ClientList& list ) const for( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it ) - if( result.remove( *it ) != 0 ) + if( result.removeAll( *it ) != 0 ) result.append( *it ); return result; } diff --git a/lib/kdecorationfactory.cpp b/lib/kdecorationfactory.cpp index 9e8d7e34ca..6af9b05738 100644 --- a/lib/kdecorationfactory.cpp +++ b/lib/kdecorationfactory.cpp @@ -68,7 +68,7 @@ void KDecorationFactory::addDecoration( KDecoration* deco ) void KDecorationFactory::removeDecoration( KDecoration* deco ) { - _decorations.remove( deco ); + _decorations.removeAll( deco ); } void KDecorationFactory::resetDecorations( unsigned long changed ) diff --git a/sm.cpp b/sm.cpp index 653a6a950d..5ecad02046 100644 --- a/sm.cpp +++ b/sm.cpp @@ -215,7 +215,7 @@ SessionInfo* Workspace::takeSessionInfo( Client* c ) { if ( info->windowRole == windowRole ) realInfo = info; - session.remove(info); + session.removeAll(info); } else { @@ -223,7 +223,7 @@ SessionInfo* Workspace::takeSessionInfo( Client* c ) info->resourceName == resourceName && info->resourceClass == resourceClass ) realInfo = info; - session.remove(info); + session.removeAll(info); } } } @@ -239,7 +239,7 @@ SessionInfo* Workspace::takeSessionInfo( Client* c ) sessionInfoWindowTypeMatch( c, info )) if ( wmCommand.isEmpty() || info->wmCommand == wmCommand ) { realInfo = info; - session.remove( info ); + session.removeAll( info ); } } } diff --git a/tabbox.cpp b/tabbox.cpp index 9927c45b33..828fc85616 100644 --- a/tabbox.cpp +++ b/tabbox.cpp @@ -100,7 +100,7 @@ void TabBox::createClientList(ClientList &list, int desktop /*-1 = all*/, Client { if ( start == c ) { - list.remove( c ); + list.removeAll( c ); list.prepend( c ); } else @@ -187,7 +187,7 @@ void TabBox::reset() // how many clients to remove int howMany = (h - (r.height()-(2*frameWidth())))/lineHeight; for (; howMany; howMany--) - clients.remove(clients.last()); + clients.removeAll(clients.last()); h = clients.count() * lineHeight; } diff --git a/workspace.h b/workspace.h index 6a18655cf6..6d1f555c7d 100644 --- a/workspace.h +++ b/workspace.h @@ -702,7 +702,7 @@ inline void Workspace::addGroup( Group* group, allowed_t ) inline void Workspace::removeGroup( Group* group, allowed_t ) { - groups.remove( group ); + groups.removeAll( group ); } inline const ClientList& Workspace::stackingOrder() const