Merge lp:~marcustomlinson/qtcreator-plugin-ubuntu/lp-1508418 into lp:qtcreator-plugin-ubuntu

[Marcus Tomlinson]

Fixed scopes templates:
* OpenWeatherMap now requires an APPID key for all requests.
* Fixed "'cerr' was not declared in this scope" error in query.cpp.
* Fixed import in test-scope.py.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~marcustomlinson/qtcreator-plugin-ubuntu/lp-1508418]

417. By Marcus Tomlinson on 2015-10-21

Fixed import in test-scope.py

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Benjamin Zeller (zeller-benjamin)]

OK

review: Approve

=== 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-06-11 10:03:53 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/api/client.cpp	2015-10-21 16:02:48 +0000
@@ -289,14 +289,13 @@
     // Build a URI and get the contents.
     // The fist parameter forms the path part of the URI.
     // The second parameter forms the CGI parameters.
-    get(
-        { "data", "2.5", "weather" },
-        { { "q", query }, { "units", "metric" }
+    get( { "data", "2.5", "weather" },
+         { { "q", query }, { "units", "metric" }
+         , { "APPID", "2b12bf09b4e0ab0c1aa5e32a9a3f0cdc" }
 @if "%ContentType%" == "network-netcpp-qxml"
-        , { "mode", "xml" }
+         , { "mode", "xml" }
 @endif
-        },
-        root);
+         }, root);
     // e.g. http://api.openweathermap.org/data/2.5/weather?q=QUERY&units=metric
 
     Current result;
@@ -385,12 +384,13 @@
     // Build a URI and get the contents
     // The fist parameter forms the path part of the URI.
     // The second parameter forms the CGI parameters.
-    get( { "data", "2.5", "forecast", "daily" }, { { "q", query }, { "units",
-            "metric" }, { "cnt", to_string(cnt) }
+    get( { "data", "2.5", "forecast", "daily" },
+         { { "q", query }, { "units", "metric" }, { "cnt", to_string(cnt) }
+         , { "APPID", "2b12bf09b4e0ab0c1aa5e32a9a3f0cdc" }
 @if "%ContentType%" == "network-netcpp-qxml"
-            , { "mode", "xml" }
+         , { "mode", "xml" }
 @endif
-        }, root);
+         }, root);
     // e.g. http://api.openweathermap.org/data/2.5/forecast/daily/?q=QUERY&units=metric&cnt=7
 
     Forecast result;

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/query.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/query.cpp	2015-06-11 10:03:53 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope-14.10/src/scope/query.cpp	2015-10-21 16:02:48 +0000
@@ -10,6 +10,7 @@
 #include <unity/scopes/SearchReply.h>
 
 #include <iomanip>
+#include <iostream>
 #include <sstream>
 
 namespace sc = unity::scopes;

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/src/client.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/client.cpp	2015-05-13 07:23:03 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/client.cpp	2015-10-21 16:02:48 +0000
@@ -288,14 +288,13 @@
     // Build a URI and get the contents.
     // The fist parameter forms the path part of the URI.
     // The second parameter forms the CGI parameters.
-    get(
-        { "data", "2.5", "weather" },
-        { { "q", query }, { "units", "metric" }
+    get( { "data", "2.5", "weather" },
+         { { "q", query }, { "units", "metric" }
+         , { "APPID", "2b12bf09b4e0ab0c1aa5e32a9a3f0cdc" }
 @if "%ContentType%" == "network-netcpp-qxml"
-        , { "mode", "xml" }
+         , { "mode", "xml" }
 @endif
-        },
-        root);
+         }, root);
     // e.g. http://api.openweathermap.org/data/2.5/weather?q=QUERY&units=metric
 
     Current result;
@@ -384,12 +383,13 @@
     // Build a URI and get the contents
     // The fist parameter forms the path part of the URI.
     // The second parameter forms the CGI parameters.
-    get( { "data", "2.5", "forecast", "daily" }, { { "q", query }, { "units",
-            "metric" }, { "cnt", to_string(cnt) }
+    get( { "data", "2.5", "forecast", "daily" },
+         { { "q", query }, { "units", "metric" }, { "cnt", to_string(cnt) }
+         , { "APPID", "2b12bf09b4e0ab0c1aa5e32a9a3f0cdc" }
 @if "%ContentType%" == "network-netcpp-qxml"
-            , { "mode", "xml" }
+         , { "mode", "xml" }
 @endif
-        }, root);
+         }, root);
     // e.g. http://api.openweathermap.org/data/2.5/forecast/daily/?q=QUERY&units=metric&cnt=7
 
     Forecast result;

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/test-scope.py'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/test-scope.py	2015-05-14 07:41:37 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/test-scope.py	2015-10-21 16:02:48 +0000
@@ -1,6 +1,9 @@
 #!/usr/bin/env python3
 
-from scope_harness import *
+from scope_harness import (
+    CategoryListMatcher, CategoryListMatcherMode, CategoryMatcher,
+    Parameters, ResultMatcher, ScopeHarness
+)
 from scope_harness.testing import *
 import unittest, sys, os
 from subprocess import Popen, PIPE