Small optimisation to data defined symbology

nyalldawson · nyalldawson · commit e5fcbc39d3a1 · 2015-05-22T21:39:36.000+10:00
diff --git a/src/core/symbology-ng/qgssymbollayerv2.cpp b/src/core/symbology-ng/qgssymbollayerv2.cpp
@@ -38,6 +38,9 @@ const QgsExpression* QgsSymbolLayerV2::dataDefinedProperty( const QString& prope
 
 QgsDataDefined *QgsSymbolLayerV2::getDataDefinedProperty( const QString &property ) const
 {
+  if ( mDataDefinedProperties.isEmpty() )
+    return 0;
+
   QMap< QString, QgsDataDefined* >::const_iterator it = mDataDefinedProperties.find( property );
   if ( it != mDataDefinedProperties.constEnd() )
   {
@@ -106,6 +109,9 @@ bool QgsSymbolLayerV2::hasDataDefinedProperties() const
 
 bool QgsSymbolLayerV2::hasDataDefinedProperty( const QString& property ) const
 {
+  if ( mDataDefinedProperties.isEmpty() )
+    return false;
+
   QgsDataDefined* dd = getDataDefinedProperty( property );
   return dd && dd->isActive();
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ const QgsExpression* QgsSymbolLayerV2::dataDefinedProperty( const QString& prope`
`38`	`38`
`39`	`39`	`QgsDataDefined *QgsSymbolLayerV2::getDataDefinedProperty( const QString &property ) const`
`40`	`40`	`{`
	`41`	`+ if ( mDataDefinedProperties.isEmpty() )`
	`42`	`+ return 0;`
	`43`	`+`
`41`	`44`	`QMap< QString, QgsDataDefined* >::const_iterator it = mDataDefinedProperties.find( property );`
`42`	`45`	`if ( it != mDataDefinedProperties.constEnd() )`
`43`	`46`	`{`
`@@ -106,6 +109,9 @@ bool QgsSymbolLayerV2::hasDataDefinedProperties() const`
`106`	`109`
`107`	`110`	`bool QgsSymbolLayerV2::hasDataDefinedProperty( const QString& property ) const`
`108`	`111`	`{`
	`112`	`+ if ( mDataDefinedProperties.isEmpty() )`
	`113`	`+ return false;`
	`114`	`+`
`109`	`115`	`QgsDataDefined* dd = getDataDefinedProperty( property );`
`110`	`116`	`return dd && dd->isActive();`
`111`	`117`	`}`