issue warning to message log when active iterator is closed when replaced

jef-n · jef-n · commit ec07a0c2583a · 2013-03-23T19:50:38.000+01:00
diff --git a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
@@ -17,6 +17,7 @@
 #include "qgsdelimitedtextprovider.h"
 
 #include "qgsgeometry.h"
+#include "qgsmessagelog.h"
 
 #include <QTextStream>
 
@@ -25,7 +26,10 @@ QgsDelimitedTextFeatureIterator::QgsDelimitedTextFeatureIterator( QgsDelimitedTe
 {
   // make sure that only one iterator is active
   if ( P->mActiveIterator )
+  {
+    QgsMessageLog::logMessage( QObject::tr( "Already active iterator on this provider was closed." ), QObject::tr( "Delimited text" ) );
     P->mActiveIterator->close();
+  }
   P->mActiveIterator = this;
 
   rewind();
diff --git a/src/providers/gpx/qgsgpxfeatureiterator.cpp b/src/providers/gpx/qgsgpxfeatureiterator.cpp
@@ -19,6 +19,7 @@
 #include "qgsapplication.h"
 #include "qgsgeometry.h"
 #include "qgslogger.h"
+#include "qgsmessagelog.h"
 
 #include <limits>
 #include <cstring>
@@ -29,7 +30,10 @@ QgsGPXFeatureIterator::QgsGPXFeatureIterator( QgsGPXProvider* p, const QgsFeatur
 {
   // make sure that only one iterator is active
   if ( P->mActiveIterator )
+  {
+    QgsMessageLog::logMessage( QObject::tr( "Already active iterator on this provider was closed." ), QObject::tr( "GPX" ) );
     P->mActiveIterator->close();
+  }
   P->mActiveIterator = this;
 
   rewind();
diff --git a/src/providers/grass/qgsgrassfeatureiterator.cpp b/src/providers/grass/qgsgrassfeatureiterator.cpp
@@ -37,7 +37,10 @@ QgsGrassFeatureIterator::QgsGrassFeatureIterator( QgsGrassProvider* p, const Qgs
 {
   // make sure that only one iterator is active
   if ( P->mActiveIterator )
+  {
+    QgsMessageLog::logMessage( tr( "Already active iterator on this provider was closed." ), tr( "GRASS" ) );
     P->mActiveIterator->close();
+  }
   P->mActiveIterator = this;
 
   // check if outdated and update if necessary
diff --git a/src/providers/memory/qgsmemoryfeatureiterator.cpp b/src/providers/memory/qgsmemoryfeatureiterator.cpp
@@ -18,14 +18,18 @@
 #include "qgsgeometry.h"
 #include "qgslogger.h"
 #include "qgsspatialindex.h"
+#include "qgsmessagelog.h"
 
 
 QgsMemoryFeatureIterator::QgsMemoryFeatureIterator( QgsMemoryProvider* p, const QgsFeatureRequest& request )
     : QgsAbstractFeatureIterator( request ), P( p ), mSelectRectGeom( NULL )
 {
   // make sure that only one iterator is active
   if ( P->mActiveIterator )
+  {
+    QgsMessageLog::logMessage( QObject::tr( "Already active iterator on this provider was closed." ), QObject::tr( "Memory provider" ) );
     P->mActiveIterator->close();
+  }
   P->mActiveIterator = this;
 
   if ( mRequest.filterType() == QgsFeatureRequest::FilterRect && mRequest.flags() & QgsFeatureRequest::ExactIntersect )
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -17,8 +17,9 @@
 #include "qgsogrprovider.h"
 
 #include "qgsapplication.h"
-#include "qgslogger.h"
 #include "qgsgeometry.h"
+#include "qgslogger.h"
+#include "qgsmessagelog.h"
 
 #include <QTextCodec>
 
@@ -35,7 +36,10 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrProvider* p, const QgsFeatur
 {
   // make sure that only one iterator is active
   if ( P->mActiveIterator )
+  {
+    QgsMessageLog::logMessage( QObject::tr( "Already active iterator on this provider was closed." ), QObject::tr( "OGR" ) );
     P->mActiveIterator->close();
+  }
   P->mActiveIterator = this;
 
   mFeatureFetched = false;
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -49,7 +49,10 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresProvider* p,
 {
   // make sure that only one iterator is active
   if ( P->mActiveIterator )
+  {
+    QgsMessageLog::logMessage( QObject::tr( "Already active iterator on this provider was closed." ), QObject::tr( "PostgreSQL" ) );
     P->mActiveIterator->close();
+  }
 
   mCursorName = QString( "qgisf%1" ).arg( P->mProviderId );
 
diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
@@ -44,7 +44,10 @@ QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator( QgsSpatiaLiteProvide
 {
   // make sure that only one iterator is active
   if ( P->mActiveIterator )
+  {
+    QgsMessageLog::logMessage( QObject::tr( "Already active iterator on this provider was closed." ), QObject::tr( "SpatiaLite" ) );
     P->mActiveIterator->close();
+  }
   P->mActiveIterator = this;
 
   QString whereClause;
diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp
@@ -15,6 +15,7 @@
 #include "qgswfsfeatureiterator.h"
 #include "qgsspatialindex.h"
 #include "qgswfsprovider.h"
+#include "qgsmessagelog.h"
 
 QgsWFSFeatureIterator::QgsWFSFeatureIterator( QgsWFSProvider* provider, const QgsFeatureRequest& request ):
     QgsAbstractFeatureIterator( request ), mProvider( provider )
@@ -28,6 +29,7 @@ QgsWFSFeatureIterator::QgsWFSFeatureIterator( QgsWFSProvider* provider, const Qg
 
   if ( mProvider->mActiveIterator )
   {
+    QgsMessageLog::logMessage( QObject::tr( "Already active iterator on this provider was closed." ), QObject::tr( "WFS" ) );
     mProvider->mActiveIterator->close();
   }
   mProvider->mActiveIterator = this;

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,10 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresProvider* p,`
`49`	`49`	`{`
`50`	`50`	`// make sure that only one iterator is active`
`51`	`51`	`if ( P->mActiveIterator )`
	`52`	`+ {`
	`53`	`+ QgsMessageLog::logMessage( QObject::tr( "Already active iterator on this provider was closed." ), QObject::tr( "PostgreSQL" ) );`
`52`	`54`	`P->mActiveIterator->close();`
	`55`	`+ }`
`53`	`56`
`54`	`57`	`mCursorName = QString( "qgisf%1" ).arg( P->mProviderId );`
`55`	`58`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include "qgswfsfeatureiterator.h"`
`16`	`16`	`#include "qgsspatialindex.h"`
`17`	`17`	`#include "qgswfsprovider.h"`
	`18`	`+#include "qgsmessagelog.h"`
`18`	`19`
`19`	`20`	`QgsWFSFeatureIterator::QgsWFSFeatureIterator( QgsWFSProvider* provider, const QgsFeatureRequest& request ):`
`20`	`21`	`QgsAbstractFeatureIterator( request ), mProvider( provider )`
`@@ -28,6 +29,7 @@ QgsWFSFeatureIterator::QgsWFSFeatureIterator( QgsWFSProvider* provider, const Qg`
`28`	`29`
`29`	`30`	`if ( mProvider->mActiveIterator )`
`30`	`31`	`{`
	`32`	`+ QgsMessageLog::logMessage( QObject::tr( "Already active iterator on this provider was closed." ), QObject::tr( "WFS" ) );`
`31`	`33`	`mProvider->mActiveIterator->close();`
`32`	`34`	`}`
`33`	`35`	`mProvider->mActiveIterator = this;`