[QGIS Commit] r15616 - in trunk/qgis/src: core providers/delimitedtext

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-27 08:43:17 -0700 (Sun, 27 Mar 2011)
New Revision: 15616

Modified:
   trunk/qgis/src/core/qgis.cpp
   trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h
Log:
man, 2 commits - 2 missed files

Modified: trunk/qgis/src/core/qgis.cpp
===================================================================
--- trunk/qgis/src/core/qgis.cpp	2011-03-27 15:41:31 UTC (rev 15615)
+++ trunk/qgis/src/core/qgis.cpp	2011-03-27 15:43:17 UTC (rev 15616)
@@ -43,6 +43,8 @@
   "Point",
   "Line",
   "Polygon"
+  "Unknown geometry",
+  "No geometry",
 };
 
 // description strings for feature types

Modified: trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h
===================================================================
--- trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h	2011-03-27 15:41:31 UTC (rev 15615)
+++ trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h	2011-03-27 15:43:17 UTC (rev 15616)
@@ -189,7 +189,6 @@
     QRegExp mDelimiterRegexp;
     QString mDelimiterType;
 
-    bool mHasWktField;
     int mFieldCount;  // Note: this includes field count for wkt field
     int mXFieldIndex;
     int mYFieldIndex;