From e4abf2c6e3de158d3a6eb3c46b5158f741136c9d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 21 Mar 2018 12:26:47 +0100 Subject: Fix developer build with new GCC Avoid casting to a possibly null QXmlNodeModelIndex as that now can cause -Wunitialized warnings. Change-Id: Id53d213f90e9845f6e4b4e9ada5945726750ec86 Reviewed-by: Oswald Buddenhagen --- src/xmlpatterns/functions/qgenerateidfn.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/xmlpatterns/functions/qgenerateidfn.cpp b/src/xmlpatterns/functions/qgenerateidfn.cpp index b4264ae0..f85381ef 100644 --- a/src/xmlpatterns/functions/qgenerateidfn.cpp +++ b/src/xmlpatterns/functions/qgenerateidfn.cpp @@ -47,11 +47,12 @@ using namespace QPatternist; Item GenerateIDFN::evaluateSingleton(const DynamicContext::Ptr &context) const { - const QXmlNodeModelIndex &node = m_operands.first()->evaluateSingleton(context).asNode(); - - if(node.isNull()) + const Item item = m_operands.first()->evaluateSingleton(context); + if (item.isNull()) return AtomicString::fromValue(QString()); + const QXmlNodeModelIndex &node = item.asNode(); + return AtomicString::fromValue(QLatin1Char('T') + QString::number(qptrdiff(node.model())) + QString::number(qptrdiff(node.internalPointer())) -- cgit v1.2.3