Add QgsExpressionContextGenerator inheritances in sip

arnaud-morvan · arnaud-morvan · commit a8d9dea1fb6e · 2016-11-06T17:58:54.000+01:00
diff --git a/python/core/composer/qgscomposerobject.sip b/python/core/composer/qgscomposerobject.sip
@@ -1,7 +1,7 @@
 /** \ingroup core
  * A base class for objects which belong to a map composition.
  */
-class QgsComposerObject : QObject
+class QgsComposerObject : QObject, QgsExpressionContextGenerator
 {
 %TypeHeaderCode
 #include <qgscomposerobject.h>
diff --git a/python/core/composer/qgscomposition.sip b/python/core/composer/qgscomposition.sip
@@ -4,7 +4,7 @@
  * them in a list in ascending z-Order. This list can be changed to lower/raise items one position
  * or to bring them to front/back.
  * */
-class QgsComposition : QGraphicsScene
+class QgsComposition : QGraphicsScene, QgsExpressionContextGenerator
 {
 %TypeHeaderCode
 #include <qgscomposition.h>
diff --git a/python/core/qgsproject.sip b/python/core/qgsproject.sip
@@ -13,7 +13,7 @@
   properties.
 
 */
-class QgsProject : QObject
+class QgsProject : QObject, QgsExpressionContextGenerator
 {
 %TypeHeaderCode
 #include <qgsproject.h>
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -316,7 +316,7 @@ struct QgsVectorJoinInfo
  */
 
 
-class QgsVectorLayer : QgsMapLayer
+class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator
 {
 %TypeHeaderCode
 #include "qgsvectorlayer.h"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/** \ingroup core`
`2`	`2`	`* A base class for objects which belong to a map composition.`
`3`	`3`	`*/`
`4`		`-class QgsComposerObject : QObject`
	`4`	`+class QgsComposerObject : QObject, QgsExpressionContextGenerator`
`5`	`5`	`{`
`6`	`6`	`%TypeHeaderCode`
`7`	`7`	`#include <qgscomposerobject.h>`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* them in a list in ascending z-Order. This list can be changed to lower/raise items one position`
`5`	`5`	`* or to bring them to front/back.`
`6`	`6`	`* */`
`7`		`-class QgsComposition : QGraphicsScene`
	`7`	`+class QgsComposition : QGraphicsScene, QgsExpressionContextGenerator`
`8`	`8`	`{`
`9`	`9`	`%TypeHeaderCode`
`10`	`10`	`#include <qgscomposition.h>`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`properties.`
`14`	`14`
`15`	`15`	`*/`
`16`		`-class QgsProject : QObject`
	`16`	`+class QgsProject : QObject, QgsExpressionContextGenerator`
`17`	`17`	`{`
`18`	`18`	`%TypeHeaderCode`
`19`	`19`	`#include <qgsproject.h>`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ struct QgsVectorJoinInfo`
`316`	`316`	`*/`
`317`	`317`
`318`	`318`
`319`		`-class QgsVectorLayer : QgsMapLayer`
	`319`	`+class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator`
`320`	`320`	`{`
`321`	`321`	`%TypeHeaderCode`
`322`	`322`	`#include "qgsvectorlayer.h"`