qt4-ification by Thorsten Röder <thorsten.roeder weihenstephan.org>

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()}

+ commenting out call to artsshell in startkde.

svn path=/trunk/KDE/kdebase/workspace/; revision=527991
This commit is contained in:
David Faure 2006-04-09 20:16:13 +00:00
parent 45c632848a
commit f2a598e7d0

View file

@ -326,8 +326,8 @@ bool Client::sameAppWindowRoleMatch( const Client* c1, const Client* c2, bool ac
|| c1->group()->leaderClient() == c1 || c2->group()->leaderClient() == c2; || c1->group()->leaderClient() == c1 || c2->group()->leaderClient() == c2;
#endif #endif
} }
int pos1 = c1->windowRole().find( '#' ); int pos1 = c1->windowRole().indexOf( '#' );
int pos2 = c2->windowRole().find( '#' ); int pos2 = c2->windowRole().indexOf( '#' );
if(( pos1 >= 0 && pos2 >= 0 ) if(( pos1 >= 0 && pos2 >= 0 )
|| ||
// hacks here // hacks here