Small optimisation to data defined symbology

qgis · May 22, 2015 · e5fcbc39d3a12bcbd51c7c5c0a507065f8084257 · e5fcbc3
1 parent b148968
commit e5fcbc39d3a12bcbd51c7c5c0a507065f8084257
Unified Split

Showing with 6 additions and 0 deletions.

+6 −0 src/core/symbology-ng/qgssymbollayerv2.cpp
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();
 }