Merge remote-tracking branch 'origin/5.7' into dev

Change-Id: I6b681aee6f87beca37f532daea8380580098c3e9

3 files changed, 12 insertions, 4 deletions

diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
index 8973739..079bc2c 100644
--- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
@@ -70,8 +70,8 @@ ASTItem *DebugExpressionFactory::buildASTTree(const QPatternist::Expression::Ptr
     const QPatternist::ExpressionVisitorResult::Ptr exprInfo(expr->accept(namer));
     Q_ASSERT(exprInfo);
     const ExpressionInfo *const constExprInfo = static_cast<const ExpressionInfo *>(exprInfo.data());
-    const QString name(constExprInfo->first);
-    const QString details(constExprInfo->second);
+    const QString name(constExprInfo->name());
+    const QString details(constExprInfo->details());
     const QString rType(reqType ? reqType->displayName(Global::namePool()) : QLatin1String("Not specified"));
 
     /* ---------- Handle its staticType() -------- */
diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.cpp b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
index 35a1128..2aed6d9 100644
--- a/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
@@ -33,7 +33,9 @@
 using namespace QPatternistSDK;
 
 ExpressionInfo::ExpressionInfo(const QString &name,
-                               const QString &details) : QPair<QString, QString>(name, details)
+                               const QString &details)
+    : m_name(name)
+    , m_details(details)
 {
 }
 
diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.h b/tests/auto/xmlpatternssdk/ExpressionInfo.h
index 5eb5b66..3705529 100644
--- a/tests/auto/xmlpatternssdk/ExpressionInfo.h
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.h
@@ -50,10 +50,16 @@ namespace QPatternistSDK
      * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_PATTERNISTSDK_EXPORT ExpressionInfo : public QPatternist::ExpressionVisitorResult
-                                                , public QPair<QString, QString>
     {
     public:
         ExpressionInfo(const QString &name, const QString &details);
+
+        QString name() const { return m_name; }
+        QString details() const { return m_details; }
+
+    private:
+        QString m_name;
+        QString m_details;
     };
 }