Merge pull request #9321 from m-kuhn/cleanup-qgsvectorlayer-geometrytype

Cleanup QgsVectorLayer::geometryType()
qgis · Mar 2, 2019 · ca95220fff3bc635cc344c0e79134c874316c3ed · ca95220
2 parents ac78a19 + bc6a9c5
commit ca95220fff3bc635cc344c0e79134c874316c3ed
Unified Split

Showing with 1 addition and 10 deletions.

+1 −10 src/core/qgsvectorlayer.cpp
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -588,16 +588,7 @@ void QgsVectorLayer::setDiagramRenderer( QgsDiagramRenderer *r )
 
 QgsWkbTypes::GeometryType QgsVectorLayer::geometryType() const
 {
-  if ( mValid && mDataProvider )
-  {
-    return QgsWkbTypes::geometryType( mDataProvider->wkbType() );
-  }
-  else
-  {
-    QgsDebugMsgLevel( QStringLiteral( "invalid layer or pointer to mDataProvider is null" ), 3 );
-  }
-  QgsDebugMsgLevel( QStringLiteral( "Vector layer with unknown geometry type." ), 3 );
-  return QgsWkbTypes::UnknownGeometry;
+  return QgsWkbTypes::geometryType( mWkbType );
 }
 
 QgsWkbTypes::Type QgsVectorLayer::wkbType() const