yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deprecated--

Browse source 
basically:
QRegExp::search() --> QRegExp::indexIn()
QString::find() --> QString::indexOf()
QString::findRev() --> QString::lastIndexOf()
QString::lower() --> QString::toLower()
QString::upper() --> QString::toUpper()
QString::setLength() --> QString::resize()
QByteArray::find() --> QByteArray::indexOf()
QByteArray::findRev() --> QByteArray::lastIndexof()
QTimer::start(ms,sShot) --> {QTimer::setSingleShot() ; QTimer::start()}
QList::remove() --> QList::removeAll()
iterator QList::remove() --> iterator QList::erase()
QComboBox::text() --> QComboBox::itemText()
QByteArray::upper() --> QByteArray::toUpper()
QByteArray::lower() --> QByteArray::toLower()
QString::contains() --> QString::contains()
QEvent::accept(bool) --> QEvent::setAccepted(bool)


svn path=/trunk/KDE/kdebase/workspace/; revision=528719
This commit is contained in:
Thorsten Roeder 2006-04-11 17:12:05 +00:00
parent 4d8462f579
commit 98fa3320c5
11 changed files with 73 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
activation.cpp
View file

@ -677,9 +677,10 @@ void Client::demandAttention( bool set )
if( demandAttentionKNotifyTimer == NULL )
{
demandAttentionKNotifyTimer = new QTimer( this );
demandAttentionKNotifyTimer->setSingleShot( true );
connect( demandAttentionKNotifyTimer, SIGNAL( timeout()), SLOT( demandAttentionKNotify()));
}
demandAttentionKNotifyTimer->start( 1000, true );
demandAttentionKNotifyTimer->start( 1000 );
}
else
info->setState( set ? NET::DemandsAttention : 0, NET::DemandsAttention );

14
client.cpp
View file

@ -1510,7 +1510,7 @@ static int nullErrorHandler(Display *, XErrorEvent *)
*/
QByteArray Client::staticWindowRole(WId w)
{
return getStringProperty(w, atoms->wm_window_role).lower();
return getStringProperty(w, atoms->wm_window_role).toLower();
}
/*!
@ -1856,7 +1856,7 @@ void Client::updateOpacity()
ClientList tmpGroupMembers = group()->members();
ClientList activeGroupMembers;
activeGroupMembers.append(this);
tmpGroupMembers.remove(this);
tmpGroupMembers.removeAll(this);
ClientList::Iterator it = tmpGroupMembers.begin();
while (it != tmpGroupMembers.end())
// search for next attached and not activated client and repeat if found
@ -1875,7 +1875,7 @@ void Client::updateOpacity()
// qWarning("activated, search restarted (1)");
(*it)->setShadowSize(options->activeWindowShadowSize);
activeGroupMembers.append(*it);
tmpGroupMembers.remove(it);
tmpGroupMembers.erase(it);
it = tmpGroupMembers.begin(); // restart, search next client
continue;
}
@ -1893,7 +1893,7 @@ void Client::updateOpacity()
(*it)->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity);
(*it)->setShadowSize(options->activeWindowShadowSize);
activeGroupMembers.append(*it);
tmpGroupMembers.remove(it);
tmpGroupMembers.erase(it);
it = tmpGroupMembers.begin(); // reset potential client search
found = true;
// qWarning("activated, search restarted (2)");
@ -1931,7 +1931,7 @@ void Client::updateOpacity()
ClientList tmpGroupMembers = group()->members();
ClientList inactiveGroupMembers;
inactiveGroupMembers.append(this);
tmpGroupMembers.remove(this);
tmpGroupMembers.removeAll(this);
ClientList::Iterator it = tmpGroupMembers.begin();
while ( it != tmpGroupMembers.end() )
// search for next attached and not activated client and repeat if found
@ -1950,7 +1950,7 @@ void Client::updateOpacity()
(*it)->setShadowSize(options->inactiveWindowShadowSize);
// qWarning("deactivated, search restarted (1)");
inactiveGroupMembers.append(*it);
tmpGroupMembers.remove(it);
tmpGroupMembers.erase(it);
it = tmpGroupMembers.begin(); // restart, search next client
continue;
}
@ -1969,7 +1969,7 @@ void Client::updateOpacity()
(*it)->setShadowSize(options->inactiveWindowShadowSize);
// qWarning("deactivated, search restarted (2)");
inactiveGroupMembers.append(*it);
tmpGroupMembers.remove(it);
tmpGroupMembers.erase(it);
it = tmpGroupMembers.begin(); // reset potential client search
found = true;
break; // skip this loop

5
clients/plastik/plastikbutton.cpp
View file

@ -52,6 +52,7 @@ PlastikButton::PlastikButton(ButtonType type, PlastikClient *parent)
// no need to reset here as the button will be resetted on first resize.
animTmr = new QTimer(this);
animTmr->setSingleShot(true); // single-shot
connect(animTmr, SIGNAL(timeout() ), this, SLOT(animate() ) );
animProgress = 0;
}
@ -128,7 +129,7 @@ void PlastikButton::animate()
} else {
animProgress = ANIMATIONSTEPS;
}
animTmr->start(TIMERINTERVAL, true); // single-shot
animTmr->start(TIMERINTERVAL); // single-shot timer
}
} else {
if(animProgress > 0) {
@ -137,7 +138,7 @@ void PlastikButton::animate()
} else {
animProgress = 0;
}
animTmr->start(TIMERINTERVAL, true); // single-shot
animTmr->start(TIMERINTERVAL); // single-shot timer
}
}

6
events.cpp
View file

@ -893,7 +893,8 @@ void Client::enterNotifyEvent( XCrossingEvent* e )
delete shadeHoverTimer;
shadeHoverTimer = new QTimer( this );
connect( shadeHoverTimer, SIGNAL( timeout() ), this, SLOT( shadeHover() ));
shadeHoverTimer->start( options->shadeHoverInterval, true );
shadeHoverTimer->setSingleShot( true );
shadeHoverTimer->start( options->shadeHoverInterval );
}
if ( options->focusPolicy == Options::ClickToFocus )
@ -906,7 +907,8 @@ void Client::enterNotifyEvent( XCrossingEvent* e )
delete autoRaiseTimer;
autoRaiseTimer = new QTimer( this );
connect( autoRaiseTimer, SIGNAL( timeout() ), this, SLOT( autoRaise() ) );
autoRaiseTimer->start( options->autoRaiseInterval, true );
autoRaiseTimer->setSingleShot( true );
autoRaiseTimer->start( options->autoRaiseInterval );
}
if ( options->focusPolicy != Options::FocusStrictlyUnderMouse && ( isDesktop() || isDock() || isTopMenu() ) )

14
group.cpp
View file

@ -100,7 +100,7 @@ void Group::removeMember( Client* member_P )
// kDebug() << "GROUPREMOVE:" << this << ":" << member_P << endl;
// kDebug() << kBacktrace() << endl;
Q_ASSERT( _members.contains( member_P ));
_members.remove( member_P );
_members.removeAll( member_P );
if( _members.isEmpty())
{
workspace()->removeGroup( this, Allowed );
@ -532,7 +532,7 @@ void Client::checkGroupTransients()
{
if( cl == *it1 )
{ // don't use removeTransient(), that would modify *it2 too
(*it2)->transients_list.remove( *it1 );
(*it2)->transients_list.removeAll( *it1 );
continue;
}
}
@ -541,7 +541,7 @@ void Client::checkGroupTransients()
// and should be therefore on top of *it1
// TODO This could possibly be optimized, it also requires hasTransient() to check for loops.
if( (*it2)->groupTransient() && (*it1)->hasTransient( *it2, true ) && (*it2)->hasTransient( *it1, true ))
(*it2)->transients_list.remove( *it1 );
(*it2)->transients_list.removeAll( *it1 );
// if there are already windows W1 and W2, W2 being transient for W1, and group transient W3
// is added, make it transient only for W2, not for W1, because it's already indirectly
// transient for it - the indirect transiency actually shouldn't break anything,
@ -556,9 +556,9 @@ void Client::checkGroupTransients()
if( (*it2)->hasTransient( *it1, false ) && (*it3)->hasTransient( *it1, false ))
{
if( (*it2)->hasTransient( *it3, true ))
(*it3)->transients_list.remove( *it1 );
(*it3)->transients_list.removeAll( *it1 );
if( (*it3)->hasTransient( *it2, true ))
(*it2)->transients_list.remove( *it1 );
(*it2)->transients_list.removeAll( *it1 );
}
}
}
@ -661,7 +661,7 @@ void Client::removeTransient( Client* cl )
{
// kDebug() << "REMOVETRANS:" << this << ":" << cl << endl;
// kDebug() << kBacktrace() << endl;
transients_list.remove( cl );
transients_list.removeAll( cl );
// cl is transient for this, but this is going away
// make cl group transient
if( cl->transientFor() == this )
@ -834,7 +834,7 @@ void Client::checkGroup( Group* set_group, bool force )
)
{ // group transients in the old group are no longer transient for it
if( (*it)->groupTransient() && (*it)->group() != group())
it = transients_list.remove( it );
it = transients_list.erase( it );
else
++it;
}

4
kcmkwin/kwindecoration/buttons.cpp
View file

@ -552,12 +552,12 @@ bool ButtonDropSite::removeButton(ButtonDropSiteItem *item) {
return false;
// try to remove the item from the left button list
if (buttonsLeft.remove(item) >= 1) {
if (buttonsLeft.removeAll(item) >= 1) {
return true;
}
// try to remove the item from the right button list
if (buttonsRight.remove(item) >= 1) {
if (buttonsRight.removeAll(item) >= 1) {
return true;
}

4
popupinfo.cpp
View file

@ -43,6 +43,8 @@ PopupInfo::PopupInfo( const char *name )
m_shown = false;
reset();
reconfigure();
m_delayedHideTimer.setSingleShot(true);
connect(&m_delayedHideTimer, SIGNAL(timeout()), this, SLOT(hide()));
QFont f = font();
@ -144,7 +146,7 @@ void PopupInfo::showInfo(QString infoString)
raise();
m_shown = true;
}
m_delayedHideTimer.start(m_delayTime, true);
m_delayedHideTimer.start(m_delayTime);
}
}

17
rules.cpp
View file

@ -331,7 +331,7 @@ bool Rules::matchWMClass( const QByteArray& match_class, const QByteArray& match
{ // TODO optimize?
QByteArray cwmclass = wmclasscomplete
? match_name + ' ' + match_class : match_class;
if( wmclassmatch == RegExpMatch && QRegExp( wmclass ).search( cwmclass ) == -1 )
if( wmclassmatch == RegExpMatch && QRegExp( wmclass ).indexIn( cwmclass ) == -1 )
return false;
if( wmclassmatch == ExactMatch && wmclass != cwmclass )
return false;
@ -345,7 +345,7 @@ bool Rules::matchRole( const QByteArray& match_role ) const
{
if( windowrolematch != UnimportantMatch )
{
if( windowrolematch == RegExpMatch && QRegExp( windowrole ).search( match_role ) == -1 )
if( windowrolematch == RegExpMatch && QRegExp( windowrole ).indexIn( match_role ) == -1 )
return false;
if( windowrolematch == ExactMatch && windowrole != match_role )
return false;
@ -359,7 +359,7 @@ bool Rules::matchTitle( const QString& match_title ) const
{
if( titlematch != UnimportantMatch )
{
if( titlematch == RegExpMatch && QRegExp( title ).search( match_title ) == -1 )
if( titlematch == RegExpMatch && QRegExp( title ).indexIn( match_title ) == -1 )
return false;
if( titlematch == ExactMatch && title != match_title )
return false;
@ -378,7 +378,7 @@ bool Rules::matchClientMachine( const QByteArray& match_machine ) const
&& matchClientMachine( "localhost" ))
return true;
if( clientmachinematch == RegExpMatch
&& QRegExp( clientmachine ).search( match_machine ) == -1 )
&& QRegExp( clientmachine ).indexIn( match_machine ) == -1 )
return false;
if( clientmachinematch == ExactMatch
&& clientmachine != match_machine )
@ -926,7 +926,7 @@ WindowRules Workspace::findWindowRules( const Client* c, bool ignore_temporary )
Rules* rule = *it;
kDebug( 1212 ) << "Rule found:" << rule << ":" << c << endl;
if( rule->isTemporary())
it = rules.remove( it );
it = rules.erase( it );
else
++it;
ret.append( rule );
@ -1013,7 +1013,7 @@ void Workspace::cleanupTemporaryRules()
)
{
if( (*it)->discardTemporary( false ))
it = rules.remove( it );
it = rules.erase( it );
else
{
if( (*it)->isTemporary())
@ -1040,7 +1040,7 @@ void Workspace::discardUsedWindowRules( Client* c, bool withdrawn )
{
c->removeRule( *it );
Rules* r = *it;
it = rules.remove( it );
it = rules.erase( it );
delete r;
continue;
}
@ -1053,7 +1053,8 @@ void Workspace::discardUsedWindowRules( Client* c, bool withdrawn )
void Workspace::rulesUpdated()
{
rulesUpdatedTimer.start( 1000, true );
rulesUpdatedTimer.setSingleShot( true );
rulesUpdatedTimer.start( 1000 );
}
#endif

3
tabbox.cpp
View file

@ -557,7 +557,8 @@ void TabBox::delayedShow()
}
int delayTime = c->readEntry("DelayTime", 90);
delayedShowTimer.start(delayTime, true);
delayedShowTimer.setSingleShot(true);
delayedShowTimer.start(delayTime);
}

2
useractions.cpp
View file

@ -1062,7 +1062,7 @@ void Client::setShortcut( const QString& _cut )
++it )
{
QRegExp reg( "(.*\\+)\\((.*)\\)" );
if( reg.search( *it ) > -1 )
if( reg.indexIn( *it ) > -1 )
{
QString base = reg.cap( 1 );
QString list = reg.cap( 2 );

62
workspace.cpp
View file

@ -326,6 +326,9 @@ void Workspace::init()
// now we know how many desktops we'll, thus, we initialise the positioning object
initPositioning = new Placement(this);
reconfigureTimer.setSingleShot( true );
updateToolWindowsTimer.setSingleShot( true );
connect(&reconfigureTimer, SIGNAL(timeout()), this,
SLOT(slotReconfigure()));
connect( &updateToolWindowsTimer, SIGNAL( timeout()), this, SLOT( slotUpdateToolWindows()));
@ -560,16 +563,16 @@ void Workspace::removeClient( Client* c, allowed_t )
Notify::raise( Notify::Delete );
Q_ASSERT( clients.contains( c ) || desktops.contains( c ));
clients.remove( c );
desktops.remove( c );
unconstrained_stacking_order.remove( c );
stacking_order.remove( c );
clients.removeAll( c );
desktops.removeAll( c );
unconstrained_stacking_order.removeAll( c );
stacking_order.removeAll( c );
for( int i = 1;
i <= numberOfDesktops();
++i )
focus_chain[ i ].remove( c );
global_focus_chain.remove( c );
attention_chain.remove( c );
focus_chain[ i ].removeAll( c );
global_focus_chain.removeAll( c );
attention_chain.removeAll( c );
if( c->isTopMenu())
removeTopMenu( c );
Group* group = findGroup( c->window());
@ -578,7 +581,7 @@ void Workspace::removeClient( Client* c, allowed_t )
if ( c == most_recently_raised )
most_recently_raised = 0;
should_get_focus.remove( c );
should_get_focus.removeAll( c );
Q_ASSERT( c != active_client );
if ( c == last_active_client )
last_active_client = 0;
@ -602,8 +605,8 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
for( int i=1;
i<= numberOfDesktops();
++i )
focus_chain[i].remove(c);
global_focus_chain.remove( c );
focus_chain[i].removeAll(c);
global_focus_chain.removeAll( c );
return;
}
if(c->desktop() == NET::OnAllDesktops)
@ -613,7 +616,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
if( i == currentDesktop()
&& ( change == FocusChainMakeFirst || change == FocusChainMakeLast ))
{
focus_chain[ i ].remove( c );
focus_chain[ i ].removeAll( c );
if( change == FocusChainMakeFirst )
focus_chain[ i ].append( c );
else
@ -631,7 +634,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
{
if( change == FocusChainMakeFirst )
{
focus_chain[ i ].remove( c );
focus_chain[ i ].removeAll( c );
focus_chain[ i ].append( c );
}
else if( change == FocusChainMakeLast )
@ -643,12 +646,12 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
focus_chain[ i ].prepend( c );
}
else
focus_chain[ i ].remove( c );
focus_chain[ i ].removeAll( c );
}
}
if( change == FocusChainMakeFirst )
{
global_focus_chain.remove( c );
global_focus_chain.removeAll( c );
global_focus_chain.append( c );
}
else if( change == FocusChainMakeLast )
@ -742,7 +745,7 @@ void Workspace::updateCurrentTopMenu()
// make it appear like it's been raised manually - it's in the Dock layer anyway,
// and not raising it could mess up stacking order of topmenus within one application,
// and thus break raising of mainclients in raiseClient()
unconstrained_stacking_order.remove( menubar );
unconstrained_stacking_order.removeAll( menubar );
unconstrained_stacking_order.append( menubar );
}
else if( !block_desktop_menubar )
@ -851,7 +854,7 @@ void Workspace::updateToolWindows( bool also_hide )
}
else // setActiveClient() is after called with NULL client, quickly followed
{ // by setting a new client, which would result in flickering
updateToolWindowsTimer.start( 50, true );
updateToolWindowsTimer.start( 50 );
}
}
@ -877,7 +880,7 @@ void Workspace::updateColormap()
void Workspace::reconfigure()
{
reconfigureTimer.start(200, true);
reconfigureTimer.start( 200 );
}
@ -1063,9 +1066,9 @@ bool Workspace::isNotManaged( const QString& title )
for ( QStringList::Iterator it = doNotManageList.begin(); it != doNotManageList.end(); ++it )
{
QRegExp r( (*it) );
if (r.search(title) != -1)
if (r.indexIn(title) != -1)
{
doNotManageList.remove( it );
doNotManageList.erase( it );
return true;
}
}
@ -1114,7 +1117,7 @@ void ObscuringWindows::create( Client* c )
int mask = CWSibling | CWStackMode;
if( cached->count() > 0 )
{
cached->remove( obs_win = cached->first());
cached->removeAll( obs_win = cached->first());
chngs.x = c->x();
chngs.y = c->y();
chngs.width = c->width();
@ -1583,7 +1586,7 @@ bool Workspace::removeSystemTrayWin( WId w, bool check )
XFree( props );
}
}
systemTrayWins.remove( w );
systemTrayWins.removeAll( w );
propagateSystemTrayWins();
return true;
}
@ -1963,7 +1966,8 @@ void Workspace::requestDelayFocus( Client* c )
delete delayFocusTimer;
delayFocusTimer = new QTimer( this );
connect( delayFocusTimer, SIGNAL( timeout() ), this, SLOT( delayFocus() ) );
delayFocusTimer->start( options->delayFocusInterval, true );
delayFocusTimer->setSingleShot( true );
delayFocusTimer->start( options->delayFocusInterval );
}
void Workspace::cancelDelayFocus()
@ -2269,7 +2273,7 @@ void Workspace::removeTopMenu( Client* c )
// kDebug() << "REMOVE TOPMENU:" << c << endl;
assert( c->isTopMenu());
assert( topmenus.contains( c ));
topmenus.remove( c );
topmenus.removeAll( c );
updateCurrentTopMenu();
// TODO reduce topMenuHeight() if possible?
}
@ -2506,20 +2510,20 @@ void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen)
{
QString message;
QString output = QString::fromLocal8Bit( buffer, buflen );
if (output.contains("Started",false))
if (output.contains("Started",Qt::CaseInsensitive))
; // don't do anything, just pass to the connection release
else if (output.contains("Can't open display",false))
else if (output.contains("Can't open display",Qt::CaseInsensitive))
message = i18n("<qt><b>kompmgr failed to open the display</b><br>There is probably an invalid display entry in your ~/.xcompmgrrc.</qt>");
else if (output.contains("No render extension",false))
else if (output.contains("No render extension",Qt::CaseInsensitive))
message = i18n("<qt><b>kompmgr cannot find the Xrender extension</b><br>You are using either an outdated or a crippled version of XOrg.<br>Get XOrg &ge; 6.8 from www.freedesktop.org.<br></qt>");
else if (output.contains("No composite extension",false))
else if (output.contains("No composite extension",Qt::CaseInsensitive))
message = i18n("<qt><b>Composite extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.<br>Additionally, you need to add a new section to your X config file:<br>"
"<i>Section \"Extensions\"<br>"
"Option \"Composite\" \"Enable\"<br>"
"EndSection</i></qt>");
else if (output.contains("No damage extension",false))
else if (output.contains("No damage extension",Qt::CaseInsensitive))
message = i18n("<qt><b>Damage extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>");
else if (output.contains("No XFixes extension",false))
else if (output.contains("No XFixes extension",Qt::CaseInsensitive))
message = i18n("<qt><b>XFixes extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>");
else return; //skip others
// kompmgr startup failed or succeeded, release connection