Merge lp:~marcustomlinson/qtcreator-plugin-ubuntu/fix-xml-scope-templates into lp:qtcreator-plugin-ubuntu

[Marcus Tomlinson]

Fix mistake in XML scope templates where only odd numbered XML nodes where being read, causing a blank top level "City, Country" title (second node in XML)

[Benjamin Zeller (zeller-benjamin)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:420
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/569/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/569/rebuild

review: Approve (continuous-integration)

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/api/client.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/api/client.cpp	2015-10-21 11:14:10 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/api/client.cpp	2015-11-13 11:40:32 +0000
@@ -353,9 +353,7 @@
 
         /* If token is StartElement, we'll see if we can read it.*/
         if (token == QXmlStreamReader::StartElement) {
-            if (root.name() == "current") {
-                root.readNext();
-            } else if (root.name() == "city") {
+            if (root.name() == "city") {
                 parseCity(result.city, root);
             } else if (root.name() == "weather") {
                 parseWeather(result.weather, root);
@@ -464,9 +462,7 @@
 
         /* If token is StartElement, we'll see if we can read it.*/
         if (token == QXmlStreamReader::StartElement) {
-            if (root.name() == "weatherdata") {
-                root.readNext();
-            } else if (root.name() == "location") {
+            if (root.name() == "location") {
                 parseLocation(result.city, root);
             } else if (root.name() == "forecast") {
                 parseForecast(result.weather, root);
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/src/client.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/client.cpp	2015-10-21 11:14:10 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/client.cpp	2015-11-13 11:40:32 +0000
@@ -352,9 +352,7 @@
 
         /* If token is StartElement, we'll see if we can read it.*/
         if (token == QXmlStreamReader::StartElement) {
-            if (root.name() == "current") {
-                root.readNext();
-            } else if (root.name() == "city") {
+            if (root.name() == "city") {
                 parseCity(result.city, root);
             } else if (root.name() == "weather") {
                 parseWeather(result.weather, root);
@@ -463,9 +461,7 @@
 
         /* If token is StartElement, we'll see if we can read it.*/
         if (token == QXmlStreamReader::StartElement) {
-            if (root.name() == "weatherdata") {
-                root.readNext();
-            } else if (root.name() == "location") {
+            if (root.name() == "location") {
                 parseLocation(result.city, root);
             } else if (root.name() == "forecast") {
                 parseForecast(result.weather, root);