diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:55:29 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:55:29 +0100 |
commit | afa273865b7f2697c6e28fb1511486d2f9ce6bfe (patch) | |
tree | 0f33dd43a368f5c9bd4399eed67763b1e9e74032 /src/xmlpatterns/expr/qtemplateparameterreference_p.h | |
parent | fabf557bb8390a94ff4b5d8688a91ffe4abd17ec (diff) | |
parent | 82c5cc6532ac5d0323ecda94b6767e1fdaef2639 (diff) | |
download | qtxmlpatterns-afa273865b7f2697c6e28fb1511486d2f9ce6bfe.tar.gz |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1e57330ccf8e964fa41637849b4958dea64360fd
Diffstat (limited to 'src/xmlpatterns/expr/qtemplateparameterreference_p.h')
-rw-r--r-- | src/xmlpatterns/expr/qtemplateparameterreference_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h index 61707b0..d9e1722 100644 --- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h +++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h @@ -67,7 +67,7 @@ namespace QPatternist class TemplateParameterReference : public EmptyContainer { public: - TemplateParameterReference(const VariableDeclaration::Ptr &varDecl); + TemplateParameterReference(const VariableDeclaration *varDecl); virtual bool evaluateEBV(const DynamicContext::Ptr &context) const; virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; @@ -78,10 +78,10 @@ namespace QPatternist virtual Properties properties() const; inline const Expression::Ptr &sourceExpression() const; - inline const VariableDeclaration::Ptr &variableDeclaration() const; + inline const VariableDeclaration *variableDeclaration() const; private: - const VariableDeclaration::Ptr m_varDecl; + const VariableDeclaration *m_varDecl; }; inline const Expression::Ptr &TemplateParameterReference::sourceExpression() const @@ -89,7 +89,7 @@ namespace QPatternist return m_varDecl->expression(); } - inline const VariableDeclaration::Ptr &TemplateParameterReference::variableDeclaration() const + inline const VariableDeclaration *TemplateParameterReference::variableDeclaration() const { return m_varDecl; } |