Skip to content

Commit ca95220

Browse files
authored
Merge pull request #9321 from m-kuhn/cleanup-qgsvectorlayer-geometrytype
Cleanup QgsVectorLayer::geometryType()
2 parents ac78a19 + bc6a9c5 commit ca95220

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

src/core/qgsvectorlayer.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -588,16 +588,7 @@ void QgsVectorLayer::setDiagramRenderer( QgsDiagramRenderer *r )
588588

589589
QgsWkbTypes::GeometryType QgsVectorLayer::geometryType() const
590590
{
591-
if ( mValid && mDataProvider )
592-
{
593-
return QgsWkbTypes::geometryType( mDataProvider->wkbType() );
594-
}
595-
else
596-
{
597-
QgsDebugMsgLevel( QStringLiteral( "invalid layer or pointer to mDataProvider is null" ), 3 );
598-
}
599-
QgsDebugMsgLevel( QStringLiteral( "Vector layer with unknown geometry type." ), 3 );
600-
return QgsWkbTypes::UnknownGeometry;
591+
return QgsWkbTypes::geometryType( mWkbType );
601592
}
602593

603594
QgsWkbTypes::Type QgsVectorLayer::wkbType() const

0 commit comments

Comments
 (0)