[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdesdk/kbabel/catalogmanager
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2005-12-02 21:09:45
Message-ID: 1133557785.579143.7489.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 485095 by goutte:

Use const_iterator correctly with constBegin and constEnd
(It is a follow-up of revision 445282 and continues revision 485087)


 M  +23 -23    catalogmanagerview.cpp  


--- branches/KDE/3.5/kdesdk/kbabel/catalogmanager/catalogmanagerview.cpp \
#485094:485095 @@ -534,7 +534,7 @@
     {
 	QTextStream s( &f );
 	s << "[Markers]" << endl;
-	for( QStringList::const_iterator it = _markerList.begin(); it!=_markerList.end() ; \
++it ) +	for( QStringList::const_iterator it = _markerList.constBegin(); \
it!=_markerList.constEnd() ; ++it )  s << (*it) << endl;
 	f.close();
     }
@@ -590,7 +590,7 @@
   rx.setCaseSensitive(markPatternDialog->isCaseSensitive( ));
 
   QStringList fileList = item->allChildrenList(true);
-  for (QStringList::const_iterator it = fileList.begin( ); it != fileList.end( ); \
++it) { +  for (QStringList::const_iterator it = fileList.constBegin( ); it != \
fileList.constEnd( ); ++it) {  CatManListItem * i = _fileList[*it];
 
     QString matchName;
@@ -1302,7 +1302,7 @@
 		const QString foundItemFile = itemFile;
 
 		it++;
-		while( it != childrenList.end() )
+		while( it != childrenList.constEnd() )
 		{
         	    CatManListItem *item = _fileList[(*it)];
 
@@ -1510,7 +1510,7 @@
       const QStringList contentList = i->allChildrenList(true);
 
       QStringList::const_iterator it;
-      for( it = contentList.begin(); it != contentList.end(); ++it )
+      for( it = contentList.constBegin(); it != contentList.constEnd(); ++it )
       {
          CatManListItem* item = _fileList[(*it)];
 
@@ -1544,7 +1544,7 @@
       const QStringList contentList=i->contentsList(true);
 
       QStringList::const_iterator it;
-      for( it = contentList.begin(); it != contentList.end(); ++it )
+      for( it = contentList.constBegin(); it != contentList.constEnd(); ++it )
       {
          CatManListItem* item = _fileList[(*it)];
 
@@ -1884,7 +1884,7 @@
 
       QStringList::const_iterator it;
 
-      for (  it = entryList.begin(); it != entryList.end() && !_stop ; ++it )
+      for (  it = entryList.constBegin(); it != entryList.constEnd() && !_stop ; \
++it )  {
 	  if( _stop ) return false;
 
@@ -1913,7 +1913,7 @@
 
       entryList=dir.entryList(QDir::Dirs,QDir::Name);
 
-      for (  it = entryList.begin(); it != entryList.end() && !_stop ; ++it )
+      for (  it = entryList.constBegin(); it != entryList.constEnd() && !_stop ; \
++it )  {
           kapp->processEvents(100);
 
@@ -1985,7 +1985,7 @@
 
       QStringList::const_iterator it;
 
-      for (  it = entryList.begin(); it != entryList.end(); ++it )
+      for (  it = entryList.constBegin(); it != entryList.constEnd(); ++it )
       {
           if( _stop ) return;
 
@@ -2016,7 +2016,7 @@
 
       entryList=dir.entryList(QDir::Dirs,QDir::Name);
 
-      for (  it = entryList.begin(); it != entryList.end(); ++it )
+      for (  it = entryList.constBegin(); it != entryList.constEnd(); ++it )
       {
           kapp->processEvents(100);
 
@@ -2069,7 +2069,7 @@
       dir.setPath(poBaseDir+relDir);
       entryList=dir.entryList("*.po",QDir::Files,QDir::Name);
 
-      for (  it = entryList.begin(); it != entryList.end(); ++it )
+      for (  it = entryList.constBegin(); it != entryList.constEnd(); ++it )
       {
           havePoFiles=true;
 
@@ -2100,7 +2100,7 @@
 
       entryList=dir.entryList(QDir::Dirs,QDir::Name);
 
-      for (  it = entryList.begin(); it != entryList.end(); ++it )
+      for (  it = entryList.constBegin(); it != entryList.constEnd(); ++it )
       {
           kapp->processEvents(100);
 
@@ -2157,7 +2157,7 @@
       if(contentList.count()>0)
       {
           QStringList::const_iterator it;
-          for( it = contentList.begin(); it != contentList.end(); ++it )
+          for( it = contentList.constBegin(); it != contentList.constEnd(); ++it )
           {
              QFileInfo po(poBaseDir+(*it));
              QFileInfo pot(potBaseDir+(*it));
@@ -2354,7 +2354,7 @@
 
          CatManListItem* item;
          QStringList::const_iterator it;
-         for( it = childList.begin();it !=  childList.end(); ++it )
+         for( it = childList.constBegin();it !=  childList.constEnd(); ++it )
          {
             item=_fileList[(*it)];
             if(item)
@@ -2417,8 +2417,8 @@
 
    _dirCommandsMenu->clear();
    int counter=0;
-   for ( QStringList::const_iterator it = _settings.dirCommandNames.begin()
-                        ; it != _settings.dirCommandNames.end(); ++it )
+   for ( QStringList::const_iterator it = _settings.dirCommandNames.constBegin()
+                        ; it != _settings.dirCommandNames.constEnd(); ++it )
    {
       _dirCommandsMenu->insertItem((*it),counter);
       counter++;
@@ -2428,8 +2428,8 @@
 
    _fileCommandsMenu->clear();
    counter=0;
-   for ( QStringList::const_iterator it = _settings.fileCommandNames.begin()
-                        ; it != _settings.fileCommandNames.end(); ++it )
+   for ( QStringList::const_iterator it = _settings.fileCommandNames.constBegin()
+                        ; it != _settings.fileCommandNames.constEnd(); ++it )
    {
       _fileCommandsMenu->insertItem((*it),counter);
       counter++;
@@ -2560,7 +2560,7 @@
 	QStringList childList = thisItem->allChildrenList();
 
 	QStringList::const_iterator it;
-	for( it = childList.begin();it !=  childList.end(); ++it )
+	for( it = childList.constBegin();it !=  childList.constEnd(); ++it )
     {
 		if(!_fileList.remove((*it)))
 			_dirList.remove((*it));
@@ -2866,7 +2866,7 @@
     {
 	QStringList s = current->allChildrenList(true);
 	QStringList::const_iterator it;
-	for( it = s.begin() ; it != s.end(); ++it )
+	for( it = s.constBegin() ; it != s.constEnd(); ++it )
 	{
 	    CatManListItem *item = _fileList[(*it)];
 	    result.append( item->poFile() );
@@ -2884,7 +2884,7 @@
     QStringList result;
 
     QStringList::const_iterator it;
-    for( it = _markerList.begin() ; it != _markerList.end(); ++it )
+    for( it = _markerList.constBegin() ; it != _markerList.constEnd(); ++it )
     {
 	CatManListItem *item = _fileList[(*it)];
 	result.append( item->poFile() );
@@ -2926,7 +2926,7 @@
 void CatalogManagerView::updateFiles( const QStringList& files )
 {
   QStringList::ConstIterator it;
-  for ( it = files.begin( ); it != files.end( ); ++it ) {
+  for ( it = files.constBegin( ); it != files.constEnd( ); ++it ) {
     updateFile( *it, true );
   }
 }
@@ -2949,7 +2949,7 @@
     {
 	const QStringList s = current->allChildrenList(true);
 	QStringList::const_iterator it;
-	for( it = s.begin() ; it != s.end(); ++it )
+	for( it = s.constBegin() ; it != s.constEnd(); ++it )
 	{
 	    CatManListItem *item = _fileList[(*it)];
 	    if( item && item->hasPo() ) result.append( item->package() );
@@ -3046,7 +3046,7 @@
 {
     QStringList newMarkers;
 
-    for( QStringList::const_iterator it = _markerList.begin(); it != \
_markerList.end(); ++it ) { +    for( QStringList::const_iterator it = \
_markerList.constBegin(); it != _markerList.constEnd(); ++it ) {  if( _fileList[ \
(*it) ] )  newMarkers.append( (*it) );
     }


[prev in list] [next in list] [prev in thread] [next in thread]