From kde-commits  Wed Dec 31 08:49:50 2008
From: Laurent Montel <montel () kde ! org>
Date: Wed, 31 Dec 2008 08:49:50 +0000
To: kde-commits
Subject: KDE/kdenetwork/kppp
Message-Id: <1230713390.396808.20757.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=123071905506343

SVN commit 903655 by mlaurent:

Fix iterator


 M  +3 -3      acctselect.cpp  
 M  +2 -2      logview/log.cpp  
 M  +6 -6      pppdata.cpp  
 M  +2 -2      ppplog.cpp  
 M  +2 -2      providerdb.cpp  


--- trunk/KDE/kdenetwork/kppp/acctselect.cpp #903654:903655
@@ -269,9 +269,9 @@
   tl->setRootIsDecorated(true);
 
   // look in ~/.kde/share/apps/kppp/Rules and $KDEDIR/share/apps/kppp/Rules
-  QStringList dirs = KGlobal::dirs()->resourceDirs("appdata");
-  for (QStringList::ConstIterator it = dirs.begin();
-       it != dirs.end(); it++) {
+  const QStringList dirs = KGlobal::dirs()->resourceDirs("appdata");
+  for (QStringList::ConstIterator it = dirs.constBegin();
+       it != dirs.constEnd(); it++) {
     insertDir(QDir((*it) + "Rules"), 0);
   }
 
--- trunk/KDE/kdenetwork/kppp/logview/log.cpp #903654:903655
@@ -44,8 +44,8 @@
   
   // get log file size
   QFileInfoList list = logdir.entryInfoList();
-  QFileInfoList::const_iterator it = list.begin();
-  QFileInfoList::const_iterator itEnd = list.end();
+  QFileInfoList::const_iterator it = list.constBegin();
+  QFileInfoList::const_iterator itEnd = list.constEnd();
   QFileInfo fi;
 
   while (it != itEnd) {
--- trunk/KDE/kdenetwork/kppp/pppdata.cpp #903654:903655
@@ -97,11 +97,11 @@
 	KConfigGroup cg( config , "Modem");
 
     QMap <QString, QString> map = config->entryMap("Modem");
-    QMap <QString, QString>::ConstIterator it = map.begin();
+    QMap <QString, QString>::ConstIterator it = map.constBegin();
 
     newmodem();
 
-    while (it != map.end()) {
+    while (it != map.constEnd()) {
 	  KConfigGroup cg2( config , cmodemgroup);
       cg2.writeEntry(it.key(), *it);
       it++;
@@ -492,13 +492,13 @@
   setModemByIndex(i);
 
   QMap <QString, QString> map = group.entryMap();
-  QMap <QString, QString>::ConstIterator it = map.begin();
+  QMap <QString, QString>::ConstIterator it = map.constBegin();
 
   QString newname = i18n("%1_copy", modname());
 
   newmodem();
 
-  while (it != map.end()) {
+  while (it != map.constEnd()) {
 	group = config->group(cmodemgroup);
     group.writeEntry(it.key(), *it);
     it++;
@@ -1019,13 +1019,13 @@
   setAccountByIndex(i);
 
   QMap <QString, QString> map = config->entryMap(caccountgroup);
-  QMap <QString, QString>::ConstIterator it = map.begin();
+  QMap <QString, QString>::ConstIterator it = map.constBegin();
 
   QString newname = i18n("%1_copy", accname());
 
   newaccount();
 
-  while (it != map.end()) {
+  while (it != map.constEnd()) {
 	KConfigGroup cg2 ( config, caccountgroup);
     cg2.writeEntry(it.key(), *it);
     it++;
--- trunk/KDE/kdenetwork/kppp/ppplog.cpp #903654:903655
@@ -202,8 +202,8 @@
   bool foundLCP = gpppdata.getPPPDebug();
   QString lcp = QLatin1String("[LCP");
   QString conn = QLatin1String("Connect:");
-  QStringList::ConstIterator it = sl.begin();
-  for( ; it != sl.end(); it++) {
+  QStringList::ConstIterator it = sl.constBegin();
+  for( ; it != sl.constEnd(); it++) {
     if((*it).indexOf(lcp) >= 0) {
       foundLCP = true;
       break;
--- trunk/KDE/kdenetwork/kppp/providerdb.cpp #903654:903655
@@ -248,8 +248,8 @@
       }
     }
     // insert sorted entries into list box and string list
-    QMap<QString, QString>::const_iterator mit = countries.begin();
-    QMap<QString, QString>::const_iterator mend = countries.end();
+    QMap<QString, QString>::const_iterator mit = countries.constBegin();
+    QMap<QString, QString>::const_iterator mend = countries.constEnd();
     while(mit != mend) {
         lb->insertItem(mit.key());
         list->append(*mit);