Fix for ticket #5

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5279 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 14, 2006 · 298f9ab · 298f9ab
1 parent 8d91c39
commit 298f9ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -63,7 +63,8 @@ class QGis
   {
     Point,
     Line,
-    Polygon
+    Polygon,
+    Unknown
   };
   static const char *qgisVectorGeometryType[];
 

diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -1249,6 +1249,17 @@ QGis::VectorType QgsVectorLayer::vectorType() const
 #endif
 
   }
+
+  // We shouldn't get here, and if we have, other things are likely to
+  // go wrong. Code that uses the vectorType() return value should be
+  // rewritten to cope with a value of QGis::Unknown. To make this
+  // need known, the following message is printed every time we get
+  // here.
+  std::cerr << "WARNING: This code (file " << __FILE__ << ", line "
+            << __LINE__ << ") should never be reached. "
+            << "Problems may occur...\n";
+
+  return QGis::Unknown;
 }
 
 QgsVectorLayerProperties *QgsVectorLayer::propertiesDialog()