From 3bcff891b5113e52a018aa4c74e02605401ae195 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 22 Jul 2014 09:21:30 +1000 Subject: [PATCH] Fix build errors --- python/core/composer/qgscomposerhtml.sip | 2 +- src/core/composer/qgscomposerhtml.cpp | 2 +- src/core/composer/qgscomposerhtml.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/core/composer/qgscomposerhtml.sip b/python/core/composer/qgscomposerhtml.sip index fbf7ff0be9a..beb1dfba770 100644 --- a/python/core/composer/qgscomposerhtml.sip +++ b/python/core/composer/qgscomposerhtml.sip @@ -155,6 +155,6 @@ class QgsComposerHtml: QgsComposerMultiFrame void refreshExpressionContext(); - virtual void refreshDataDefinedProperty( QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties ); + virtual void refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties ); }; diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp index 22c0daf0193..295a35fff65 100644 --- a/src/core/composer/qgscomposerhtml.cpp +++ b/src/core/composer/qgscomposerhtml.cpp @@ -484,7 +484,7 @@ void QgsComposerHtml::refreshExpressionContext() loadHtml(); } -void QgsComposerHtml::refreshDataDefinedProperty( QgsComposerObject::DataDefinedProperty property ) +void QgsComposerHtml::refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property ) { //updates data defined properties and redraws item to match if ( property == QgsComposerObject::SourceUrl || property == QgsComposerObject::AllProperties ) diff --git a/src/core/composer/qgscomposerhtml.h b/src/core/composer/qgscomposerhtml.h index 2d29a8a1c1e..2e5f18da214 100644 --- a/src/core/composer/qgscomposerhtml.h +++ b/src/core/composer/qgscomposerhtml.h @@ -178,7 +178,7 @@ class CORE_EXPORT QgsComposerHtml: public QgsComposerMultiFrame void refreshExpressionContext(); - virtual void refreshDataDefinedProperty( QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties ); + virtual void refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties ); private slots: void frameLoaded( bool ok = true );