[Marble-commits] KDE/kdeedu/marble/src/lib/geodata/scene

[Jens-Michael Hoffmann]

SVN commit 994291 by jmhoffmann:

Remove redundant assignments for iterator start position.


 M  +9 -9      GeoSceneSettings.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneSettings.cpp #994290:994291
@@ -61,7 +61,7 @@
 bool GeoSceneSettings::propertyAvailable( const QString& name, bool& available )
 {
     QVector<GeoSceneProperty*>::const_iterator it = d->m_properties.constBegin();
-    for (it = d->m_properties.constBegin(); it != d->m_properties.constEnd(); ++it) {
+    for (; it != d->m_properties.constEnd(); ++it) {
         if ( (*it)->name() == name ) {
             available = (*it)->available();
             return true;
@@ -69,7 +69,7 @@
     }
 
     QVector<GeoSceneGroup*>::const_iterator itGroup = d->m_groups.constBegin();
-    for (itGroup = d->m_groups.constBegin(); itGroup != d->m_groups.constEnd(); ++itGroup) {
+    for (; itGroup != d->m_groups.constEnd(); ++itGroup) {
         bool success = (*itGroup)->propertyAvailable( name, available );
         if ( success ) {
             return true;
@@ -86,7 +86,7 @@
     qDebug() << "GeoSceneSettings: Property " << name << "to" << value; 
     
     QVector<GeoSceneProperty*>::const_iterator it = d->m_properties.constBegin();
-    for (it = d->m_properties.constBegin(); it != d->m_properties.constEnd(); ++it) {
+    for (; it != d->m_properties.constEnd(); ++it) {
         if ( (*it)->name() == name ) {
             (*it)->setValue( value );
             return true;
@@ -94,7 +94,7 @@
     }
 
     QVector<GeoSceneGroup*>::const_iterator itGroup = d->m_groups.constBegin();
-    for (itGroup = d->m_groups.constBegin(); itGroup != d->m_groups.constEnd(); ++itGroup) {
+    for (; itGroup != d->m_groups.constEnd(); ++itGroup) {
         bool success = (*itGroup)->setPropertyValue( name, value );
         if ( success ) {
             return true;
@@ -107,7 +107,7 @@
 bool GeoSceneSettings::propertyValue( const QString& name, bool& value )
 {
     QVector<GeoSceneProperty*>::const_iterator it = d->m_properties.constBegin();
-    for (it = d->m_properties.constBegin(); it != d->m_properties.constEnd(); ++it) {
+    for (; it != d->m_properties.constEnd(); ++it) {
         if ( (*it)->name() == name ) {
             value = (*it)->value();
             return true;
@@ -115,7 +115,7 @@
     }
 
     QVector<GeoSceneGroup*>::const_iterator itGroup = d->m_groups.constBegin();
-    for (itGroup = d->m_groups.constBegin(); itGroup != d->m_groups.constEnd(); ++itGroup) {
+    for (; itGroup != d->m_groups.constEnd(); ++itGroup) {
         bool success = (*itGroup)->propertyValue( name, value );
         if ( success ) {
             return true;
@@ -132,7 +132,7 @@
     QVector<GeoSceneProperty*> allProperties;
 
     QVector<GeoSceneGroup*>::const_iterator itGroup = d->m_groups.constBegin();
-    for (itGroup = d->m_groups.constBegin(); itGroup != d->m_groups.constEnd(); ++itGroup) {
+    for (; itGroup != d->m_groups.constEnd(); ++itGroup) {
         allProperties << (*itGroup)->properties();
     }
 
@@ -170,7 +170,7 @@
     GeoSceneGroup* group = 0;
 
     QVector<GeoSceneGroup*>::const_iterator it = d->m_groups.constBegin();
-    for (it = d->m_groups.constBegin(); it != d->m_groups.constEnd(); ++it) {
+    for (; it != d->m_groups.constEnd(); ++it) {
         if ( (*it)->name() == name )
             group = *it;
     }
@@ -213,7 +213,7 @@
     GeoSceneProperty* property = 0;
 
     QVector<GeoSceneProperty*>::const_iterator it = d->m_properties.constBegin();
-    for (it = d->m_properties.constBegin(); it != d->m_properties.constEnd(); ++it) {
+    for (; it != d->m_properties.constEnd(); ++it) {
         if ( (*it)->name() == name )
             property = *it;
     }