From ee56885f52b63132bffafad1ccc8830a65d129fa Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Thu, 5 Nov 2015 13:42:02 +0100
Subject: Test suite: Streamline code in
 QPatternistSDK::DebugExpressionFactory.

Fix release mode compiler warnings:

In member function 'virtual void QPatternistSDK::DebugExpressionFactory::processTemplateRule(const Ptr&, const Ptr&, const QXmlName&, QPatternist::ExpressionFactory::TemplateCompilationStage)':
warning: 'title' may be used uninitialized in this function [-Wmaybe-uninitialized]
In member function 'virtual void QPatternistSDK::DebugExpressionFactory::processNamedTemplate(const QXmlName&, const Ptr&, QPatternist::ExpressionFactory::TemplateCompilationStage)':
warning: 'title' may be used uninitialized in this function [-Wmaybe-uninitialized]

by rewriting the code to directly add to a QString.

Change-Id: I23781b624e6b3fbc385d8b041a1923d49c291f51
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
---
 .../auto/xmlpatternssdk/DebugExpressionFactory.cpp | 82 +++++++++-------------
 1 file changed, 32 insertions(+), 50 deletions(-)

diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
index 830b25f..92c4a6a 100644
--- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
@@ -179,35 +179,25 @@ void DebugExpressionFactory::processTemplateRule(const Expression::Ptr &body,
                                                  const QXmlName &mode,
                                                  const TemplateCompilationStage stage)
 {
-    const char * title;
-
-    switch(stage)
-    {
-        case TemplateInitial:
-        {
-            title = "Initial Build";
-            break;
-        }
-        case TemplateTypeCheck:
-        {
-            title = "Type Check";
-            break;
-        }
-        case TemplateCompress:
-        {
-            title = "Compression";
-            break;
-        }
+    QString title = QLatin1String("T-Rule ");
+
+    switch (stage) {
+    case TemplateInitial:
+        title += QLatin1String("Initial Build");
+        break;
+    case TemplateTypeCheck:
+        title += QLatin1String("Type Check");
+        break;
+    case TemplateCompress:
+        title += QLatin1String("Compression");
+        break;
     }
+    title += QLatin1String(" mode: ")
+        + Global::namePool()->displayName(mode)
+        + QLatin1String(" priority: ")
+        + QString::number(pattern->priority());
 
-    const QString modeName(Global::namePool()->displayName(mode));
-    Q_ASSERT(title);
-    ASTItem *const newChild = new ASTItem(m_ast, QLatin1String("T-Rule ")
-                                                 + QLatin1String(title)
-                                                 + QLatin1String(" mode: ")
-                                                 + modeName
-                                                 + QLatin1String(" priority: ")
-                                                 + QString::number(pattern->priority()));
+    ASTItem *const newChild = new ASTItem(m_ast, title);
     m_ast->appendChild(newChild);
 
     newChild->appendChild(buildASTTree(pattern->matchPattern(), newChild, QPatternist::SequenceType::Ptr()));
@@ -218,31 +208,23 @@ void DebugExpressionFactory::processNamedTemplate(const QXmlName &name,
                                                   const Expression::Ptr &body,
                                                   const TemplateCompilationStage stage)
 {
-    const char * title;
-
-    switch(stage)
-    {
-        case TemplateInitial:
-        {
-            title = "Named Template Initial Build";
-            break;
-        }
-        case TemplateTypeCheck:
-        {
-            title = "Named Template Type Check";
-            break;
-        }
-        case TemplateCompress:
-        {
-            title = "Named Template Compression";
-            break;
-        }
+    QString title;
+
+    switch (stage) {
+    case TemplateInitial:
+        title += QLatin1String("Named Template Initial Build");
+        break;
+    case TemplateTypeCheck:
+        title += QLatin1String("Named Template Type Check");
+        break;
+    case TemplateCompress:
+        title += QLatin1String("Named Template Compression");
+        break;
     }
 
-    Q_ASSERT(title);
-    ASTItem *const newChild = new ASTItem(m_ast, QLatin1String(title)
-                                                 + QLatin1String(": ")
-                                                 + Global::namePool()->displayName(name));
+    title += QLatin1String(": ") + Global::namePool()->displayName(name);
+
+    ASTItem *const newChild = new ASTItem(m_ast, title);
 
     m_ast->appendChild(newChild);
     newChild->appendChild(buildASTTree(body, newChild, QPatternist::SequenceType::Ptr()));
-- 
cgit v1.2.1