[QGIS Commit] r15719 - trunk/qgis/src/providers/delimitedtext

[svn_qgis at osgeo.org]

Author: alexbruy
Date: 2011-04-16 00:06:52 -0700 (Sat, 16 Apr 2011)
New Revision: 15719

Modified:
   trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
Log:
properly clear list of the invalid lines. Also don't display invalid lines message. Addresses #3741


Modified: trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
===================================================================
--- trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp	2011-04-15 21:37:50 UTC (rev 15718)
+++ trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp	2011-04-16 07:06:52 UTC (rev 15719)
@@ -28,7 +28,6 @@
 #include <QRegExp>
 #include <QUrl>
 
-
 #include "qgsapplication.h"
 #include "qgsdataprovider.h"
 #include "qgsfeature.h"
@@ -143,7 +142,7 @@
     , mWktCrdRegexp( "(\\-?\\d+(?:\\.\\d*)?\\s+\\-?\\d+(?:\\.\\d*)?)\\s[\\s\\d\\.\\-]+" )
     , mSkipLines( 0 )
     , mFirstDataLine( 0 )
-    , mShowInvalidLines( true )
+    , mShowInvalidLines( false )
     , mCrs()
     , mWkbType( QGis::WKBUnknown )
 {
@@ -455,7 +454,7 @@
     QString line = readLine( mStream ); // Default local 8 bit encoding
     if ( line.isEmpty() )
       continue;
-
+    
     // lex the tokens from the current data line
     QStringList tokens = splitLine( line );
 
@@ -559,7 +558,6 @@
 
   // End of the file. If there are any lines that couldn't be
   // loaded, display them now.
-
   if ( mShowInvalidLines && !mInvalidLines.isEmpty() )
   {
     mShowInvalidLines = false;
@@ -577,7 +575,7 @@
     output->showMessage();
 
     // We no longer need these lines.
-    mInvalidLines.empty();
+    mInvalidLines.clear();
   }
 
   return false;