[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/apps
From: Laurent Montel <montel () kde ! org>
Date: 2008-11-11 21:58:38
Message-ID: 1226440718.142330.24738.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 883019 by mlaurent:
Fix iterator
M +2 -2 kappfinder/common.cpp
M +2 -2 kappfinder/main_install.cpp
M +4 -4 kdepasswd/kcm/chfacedlg.cpp
M +6 -6 kinfocenter/usbview/usbdevices.cpp
M +6 -6 nsplugins/kcm_nsplugins.cpp
M +2 -2 nsplugins/plugin_part.cpp
M +2 -2 nsplugins/plugin_paths.cpp
M +9 -9 nsplugins/pluginscan.cpp
--- trunk/KDE/kdebase/apps/kappfinder/common.cpp #883018:883019
@@ -141,10 +141,10 @@
else
destDir += '/';
- QStringList dirs = KGlobal::dirs()->findAllResources( "data", \
"kappfinder/apps/*.directory", KStandardDirs::Recursive ); + const QStringList dirs \
= KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.directory", \
KStandardDirs::Recursive );
QStringList::const_iterator it;
- for ( it = dirs.begin(); it != dirs.end(); ++it ) {
+ for ( it = dirs.constBegin(); it != dirs.constEnd(); ++it ) {
// find out the name of the file to store
QString destName = *it;
int pos = destName.indexOf( "kappfinder/apps/" );
--- trunk/KDE/kdebase/apps/kappfinder/main_install.cpp #883018:883019
@@ -42,14 +42,14 @@
return -1;
}
- QStringList templates = KGlobal::dirs()->findAllResources( "data", \
"kappfinder/apps/*.desktop", KStandardDirs::Recursive ); + const QStringList \
templates = KGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", \
KStandardDirs::Recursive );
QString dir = QString( argv[ 1 ] ) + '/';
QList<AppLnkCache*> appCache;
QStringList::const_iterator it;
- for ( it = templates.begin(); it != templates.end(); ++it )
+ for ( it = templates.constBegin(); it != templates.constEnd(); ++it )
scanDesktopFile( appCache, *it, dir );
createDesktopFiles( appCache, added );
--- trunk/KDE/kdebase/apps/kdepasswd/kcm/chfacedlg.cpp #883018:883019
@@ -80,15 +80,15 @@
QDir facesDir( picsdir );
if ( facesDir.exists() )
{
- QStringList picslist = facesDir.entryList( QDir::Files );
- for ( QStringList::const_iterator it = picslist.begin(); it != picslist.end(); \
++it ) + const QStringList picslist = facesDir.entryList( QDir::Files );
+ for ( QStringList::const_iterator it = picslist.constBegin(); it != \
picslist.constEnd(); ++it )
new QListWidgetItem( QIcon( picsdir + *it ), (*it).section(".",0,0), \
ui.m_FacesWidget ); }
facesDir.setPath( KCFGUserAccount::userFaceDir() );
if ( facesDir.exists() )
{
- QStringList picslist = facesDir.entryList( QDir::Files );
- for ( QStringList::const_iterator it = picslist.begin(); it != picslist.end(); \
++it ) + const QStringList picslist = facesDir.entryList( QDir::Files );
+ for ( QStringList::const_iterator it = picslist.constBegin(); it != \
picslist.constEnd(); ++it ) new QListWidgetItem( QIcon( \
KCFGUserAccount::userFaceDir() + *it ),
'/'+(*it) == KCFGUserAccount::customFaceFile() ?
i18n("(Custom)") : (*it).section(".",0,0),
--- trunk/KDE/kdebase/apps/kinfocenter/usbview/usbdevices.cpp #883018:883019
@@ -96,9 +96,9 @@
QDir dir(dname);
dir.setNameFilters(QStringList() << QString("%1-*").arg(bus));
dir.setFilter(QDir::Dirs);
- QStringList list = dir.entryList();
+ const QStringList list = dir.entryList();
- for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it) {
+ for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); \
++it) { if ((*it).contains(':'))
continue;
@@ -206,9 +206,9 @@
r += i18n("<tr><td><i>Power Consumption</i></td><td>self powered</td></tr>");
r += i18n("<tr><td><i>Attached Devicenodes</i></td><td>%1</td></tr>", \
_devnodes.at(0)); if ( _devnodes.count() > 1 ) {
- QStringList::const_iterator it = _devnodes.begin();
+ QStringList::const_iterator it = _devnodes.constBegin();
++it;
- for (; it != _devnodes.end(); ++it )
+ for (; it != _devnodes.constEnd(); ++it )
r += "<tr><td></td><td>" + *it + "</td></tr>";
}
#else
@@ -274,9 +274,9 @@
bool USBDevice::parseSys(const QString &dname) {
QDir d(dname);
d.setNameFilters(QStringList() << "usb*");
- QStringList list = d.entryList();
+ const QStringList list = d.entryList();
- for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it) {
+ for (QStringList::const_iterator it = list.constBegin(); it != list.constEnd(); \
++it) { USBDevice* device = new USBDevice();
int bus = 0;
--- trunk/KDE/kdebase/apps/nsplugins/kcm_nsplugins.cpp #883018:883019
@@ -40,9 +40,9 @@
QDateTime t = QFileInfo( dir ).lastModified();
if( t.isNull())
return t;
- QStringList subdirs = QDir( dir ).entryList();
- for( QStringList::ConstIterator it = subdirs.begin();
- it != subdirs.end();
+ const QStringList subdirs = QDir( dir ).entryList();
+ for( QStringList::ConstIterator it = subdirs.constBegin();
+ it != subdirs.constEnd();
++it )
{
if( *it == "." || *it == ".." )
@@ -58,9 +58,9 @@
{
QStringList currentTimestamps;
bool changed = false;
- QStringList::ConstIterator t = timestamps.begin();
- for( QStringList::ConstIterator it = paths.begin();
- it != paths.end();
+ QStringList::ConstIterator t = timestamps.constBegin();
+ for( QStringList::ConstIterator it = paths.constBegin();
+ it != paths.constEnd();
++it, ++t )
{
QDateTime current = lastChanged( *it );
--- trunk/KDE/kdebase/apps/nsplugins/plugin_part.cpp #883018:883019
@@ -222,8 +222,8 @@
// handle arguments
QStringList argn, argv;
- QStringList::const_iterator it = _args.begin();
- for ( ; it != _args.end(); ) {
+ QStringList::const_iterator it = _args.constBegin();
+ for ( ; it != _args.constEnd(); ) {
int equalPos = (*it).indexOf("=");
if (equalPos>0) {
--- trunk/KDE/kdebase/apps/nsplugins/plugin_paths.cpp #883018:883019
@@ -62,9 +62,9 @@
searchPaths = config.readPathEntry( "scanPaths", QStringList() );
// append environment variable NPX_PLUGIN_PATH
- QStringList envs = QString( qgetenv("NPX_PLUGIN_PATH") ).split(':');
+ const QStringList envs = QString( qgetenv("NPX_PLUGIN_PATH") ).split(':');
QStringList::const_iterator it;
- for (it = envs.begin(); it != envs.end(); ++it)
+ for (it = envs.constBegin(); it != envs.constEnd(); ++it)
searchPaths.append(*it);
return searchPaths;
--- trunk/KDE/kdebase/apps/nsplugins/pluginscan.cpp #883018:883019
@@ -186,7 +186,7 @@
if (!extensions.isEmpty()) {
const QStringList exts = extensions.split(",");
QStringList patterns;
- for (QStringList::const_iterator it=exts.begin(); it != exts.end(); ++it)
+ for (QStringList::const_iterator it=exts.constBegin(); it != \
exts.constEnd(); ++it) patterns.append( "*." + (*it).trimmed() );
mimeTypeWriter.setPatterns(patterns);
}
@@ -398,7 +398,7 @@
// get mime types from string
QStringList types = mimeInfo.split( ';' );
QStringList::const_iterator type;
- for ( type=types.begin(); type!=types.end(); ++type ) {
+ for ( type=types.constBegin(); type!=types.constEnd(); ++type ) {
kDebug(1433) << " - type=" << *type;
name = name.replace( ':', "%3A" );
@@ -414,10 +414,10 @@
// write into type cache
QStringList tokens = (*type).split(':', QString::KeepEmptyParts);
QStringList::const_iterator token;
- token = tokens.begin();
+ token = tokens.constBegin();
cache << (*token).toLower();
++token;
- for ( ; token!=tokens.end(); ++token )
+ for ( ; token!=tokens.constEnd(); ++token )
cache << ":" << *token;
cache << endl;
@@ -484,7 +484,7 @@
{
QStringList filtered;
const QStringList exts = extension.split( "," );
- for ( QStringList::const_iterator it=exts.begin(); it!=exts.end(); ++it ) {
+ for ( QStringList::const_iterator it=exts.constBegin(); it!=exts.constEnd(); \
++it ) { QString ext = (*it).trimmed();
if ( ext == "*" ) // some plugins have that, but we don't want to associate \
a mimetype with *.*! continue;
@@ -578,8 +578,8 @@
kDebug(1433) << "Scanning directories";
int count = searchPaths.count();
int i = 0;
- for ( QStringList::const_iterator it = searchPaths.begin();
- it != searchPaths.end(); ++it, ++i)
+ for ( QStringList::const_iterator it = searchPaths.constBegin();
+ it != searchPaths.constEnd(); ++it, ++i)
{
if ((*it).isEmpty())
continue;
@@ -609,8 +609,8 @@
// write mimetype files
kDebug(1433) << "Creating MIME type descriptions";
QStringList mimeTypes;
- for ( QStringList::const_iterator it=mimeInfoList.begin();
- it!=mimeInfoList.end(); ++it) {
+ for ( QStringList::const_iterator it=mimeInfoList.constBegin();
+ it!=mimeInfoList.constEnd(); ++it) {
kDebug(1433) << "Handling MIME type " << *it;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic