Use Q_FOREACH macro with scales

SebDieBln · SebDieBln · commit 44fae1af071e · 2015-12-12T00:26:46.000+01:00
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -687,11 +687,10 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
   if ( !myPaths.isEmpty() )
   {
     QStringList myScalesList = myPaths.split( ',' );
-    QStringList::const_iterator scaleIt = myScalesList.constBegin();
-    for ( ; scaleIt != myScalesList.constEnd(); ++scaleIt )
+    Q_FOREACH ( const QString& scale, myScalesList )
     {
       QListWidgetItem* newItem = new QListWidgetItem( mListGlobalScales );
-      newItem->setText( *scaleIt );
+      newItem->setText( scale );
       newItem->setFlags( Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
       mListGlobalScales->addItem( newItem );
     }
@@ -1943,11 +1942,10 @@ void QgsOptions::on_pbnDefaultScaleValues_clicked()
   mListGlobalScales->clear();
 
   QStringList myScalesList = PROJECT_SCALES.split( ',' );
-  QStringList::const_iterator scaleIt = myScalesList.constBegin();
-  for ( ; scaleIt != myScalesList.constEnd(); ++scaleIt )
+  Q_FOREACH ( const QString& scale, myScalesList )
   {
     QListWidgetItem* newItem = new QListWidgetItem( mListGlobalScales );
-    newItem->setText( *scaleIt );
+    newItem->setText( scale );
     newItem->setFlags( Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
     mListGlobalScales->addItem( newItem );
   }
@@ -1969,11 +1967,10 @@ void QgsOptions::on_pbnImportScales_clicked()
     QgsDebugMsg( msg );
   }
 
-  QStringList::const_iterator scaleIt = myScales.constBegin();
-  for ( ; scaleIt != myScales.constEnd(); ++scaleIt )
+  Q_FOREACH ( const QString& scale, myScales )
   {
     QListWidgetItem* newItem = new QListWidgetItem( mListGlobalScales );
-    newItem->setText( *scaleIt );
+    newItem->setText( scale );
     newItem->setFlags( Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
     mListGlobalScales->addItem( newItem );
   }

Original file line number	Diff line number	Diff line change
`@@ -687,11 +687,10 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :`
`687`	`687`	`if ( !myPaths.isEmpty() )`
`688`	`688`	`{`
`689`	`689`	`QStringList myScalesList = myPaths.split( ',' );`
`690`		`- QStringList::const_iterator scaleIt = myScalesList.constBegin();`
`691`		`- for ( ; scaleIt != myScalesList.constEnd(); ++scaleIt )`
	`690`	`+ Q_FOREACH ( const QString& scale, myScalesList )`
`692`	`691`	`{`
`693`	`692`	`QListWidgetItem* newItem = new QListWidgetItem( mListGlobalScales );`
`694`		`- newItem->setText( *scaleIt );`
	`693`	`+ newItem->setText( scale );`
`695`	`694`	`newItem->setFlags( Qt::ItemIsEditable \| Qt::ItemIsEnabled \| Qt::ItemIsSelectable );`
`696`	`695`	`mListGlobalScales->addItem( newItem );`
`697`	`696`	`}`
`@@ -1943,11 +1942,10 @@ void QgsOptions::on_pbnDefaultScaleValues_clicked()`
`1943`	`1942`	`mListGlobalScales->clear();`
`1944`	`1943`
`1945`	`1944`	`QStringList myScalesList = PROJECT_SCALES.split( ',' );`
`1946`		`- QStringList::const_iterator scaleIt = myScalesList.constBegin();`
`1947`		`- for ( ; scaleIt != myScalesList.constEnd(); ++scaleIt )`
	`1945`	`+ Q_FOREACH ( const QString& scale, myScalesList )`
`1948`	`1946`	`{`
`1949`	`1947`	`QListWidgetItem* newItem = new QListWidgetItem( mListGlobalScales );`
`1950`		`- newItem->setText( *scaleIt );`
	`1948`	`+ newItem->setText( scale );`
`1951`	`1949`	`newItem->setFlags( Qt::ItemIsEditable \| Qt::ItemIsEnabled \| Qt::ItemIsSelectable );`
`1952`	`1950`	`mListGlobalScales->addItem( newItem );`
`1953`	`1951`	`}`
`@@ -1969,11 +1967,10 @@ void QgsOptions::on_pbnImportScales_clicked()`
`1969`	`1967`	`QgsDebugMsg( msg );`
`1970`	`1968`	`}`
`1971`	`1969`
`1972`		`- QStringList::const_iterator scaleIt = myScales.constBegin();`
`1973`		`- for ( ; scaleIt != myScales.constEnd(); ++scaleIt )`
	`1970`	`+ Q_FOREACH ( const QString& scale, myScales )`
`1974`	`1971`	`{`
`1975`	`1972`	`QListWidgetItem* newItem = new QListWidgetItem( mListGlobalScales );`
`1976`		`- newItem->setText( *scaleIt );`
	`1973`	`+ newItem->setText( scale );`
`1977`	`1974`	`newItem->setFlags( Qt::ItemIsEditable \| Qt::ItemIsEnabled \| Qt::ItemIsSelectable );`
`1978`	`1975`	`mListGlobalScales->addItem( newItem );`
`1979`	`1976`	`}`