Merge lp:~marcustomlinson/unity-scopes-api/switch-to-net-cpp into lp:unity-scopes-api

[Marcus Tomlinson]

Switch from QNetwork to net-cpp

Switch from QNetwork to net-cpp

This change has been on our backlog for some time now (Bug #1326816), but due to a recent issue we started experiencing with QNetwork (Bug #1409995) we are taking the opportunity now to make the switch over to net-cpp.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:183
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/514/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/39

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/514/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

Looks good, thanks!

A few minor quibbles:

Please don't use uint anywhere. It's not a C++ type, and whether it works or not depends on whether some random header happens to drag in sys/types.h. Use unsigned int instead. (uint also causes warnings from doxygen when building the developer doc because it ends up not being able to match the signature in some cases.)

And, as an aside, try to not use unsigneds at all. They are evil. (See John Lakos for a really good explanation.)

76 + explicit HttpClientNetCpp(uint no_reply_timeout);
86 + void cancel_get(uint session_id) override;
88 + uint no_reply_timeout;
416 + std::pair<uint, std::shared_ptr<Cancelable>> add()
424 + uint add(const std::shared_ptr<Cancelable>& cancelable)
428 + uint result{++request_id};
435 + void cancel_and_remove_for_id(uint id)
448 + uint request_id{0};
450 + std::unordered_map<uint, std::shared_ptr<Cancelable>> store;
454 +HttpClientNetCpp::HttpClientNetCpp(uint no_reply_timeout)
529 +void HttpClientNetCpp::cancel_get(uint id)
923 HttpClientTest(uint no_reply_timeout = 20000)

It would be good to ditch the static library for smartscopes, I don't think we need it anymore.

While you are working on this anyway, would you mind making the lineData lambda thread-safe? At the moment, it appends to the string from a different thread without a lock.

Also, the lineData param should be called line_data instead.

Minor style issue here:

506 + } else
507 + {

And here (missing curlies):

465 + if (worker.joinable())
466 + worker.join();

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:188
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/521/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/46

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/521/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

Thanks for that!

One request (please forgive me for being anal):

10 +find_library(ZMQPPLIB zmqpp)
11 +if(NOT ZMQPPLIB)
12 + message(FATAL_ERROR "Zmqpp lib not found.")
13 +endif()

I think this is nice. Without this, cmake says:

CMake Error at CMakeLists.txt:122 (message):
   Capnp compiler not found.

But it would be a *lot* nicer if it actually told me the package name instead of "Zmqpp lib not found".

I can't count the number of times where some sort of install script told me that command "foo" or library "libxyz" couldn't be found, and then I have to spend five minutes trying to figure out which package bloody "foo" or "libxyz" can be found in.

So, I'd change the error messages to actually spell out the package name "package capnproto not found". That way, I can just copy and paste: "apt-get install capnproto" and Bob's my uncle :-)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/523/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/48/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/523/rebuild

review: Needs Fixing (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

> Thanks for that!
>
> One request (please forgive me for being anal):
>
> 10 +find_library(ZMQPPLIB zmqpp)
> 11 +if(NOT ZMQPPLIB)
> 12 + message(FATAL_ERROR "Zmqpp lib not found.")
> 13 +endif()
>
> I think this is nice. Without this, cmake says:
>
> CMake Error at CMakeLists.txt:122 (message):
> Capnp compiler not found.
>
> But it would be a *lot* nicer if it actually told me the package name instead
> of "Zmqpp lib not found".
>
> I can't count the number of times where some sort of install script told me
> that command "foo" or library "libxyz" couldn't be found, and then I have to
> spend five minutes trying to figure out which package bloody "foo" or "libxyz"
> can be found in.
>
> So, I'd change the error messages to actually spell out the package name
> "package capnproto not found". That way, I can just copy and paste: "apt-get
> install capnproto" and Bob's my uncle :-)

k, done

[Michi Henning (michihenning)]

Thanks for that, and thanks for your diligence!

review: Approve

[Michi Henning (michihenning)]

Not sure what was broken with Jenkins last time around. Top-approving to see what happens.

[Marcus Tomlinson (marcustomlinson)]

Fixed some small stupid mistakes (191 and 192), top approving again

[lp:~marcustomlinson/unity-scopes-api/switch-to-net-cpp]

195. By Marcus Tomlinson on 2015-01-20

Fixed formatting in control

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:195
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/537/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/64/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/62

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/537/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:195
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/544/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/69/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/70

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/544/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-01-19 08:08:55 +0000
+++ CMakeLists.txt	2015-01-20 09:11:18 +0000
@@ -67,9 +67,30 @@
 pkg_check_modules(LTTNG_UST lttng-ust REQUIRED)
 pkg_check_modules(LIBURCU_BP liburcu-bp REQUIRED)
 pkg_check_modules(JSONCPP jsoncpp REQUIRED)
-pkg_check_modules(LIBACCOUNTS REQUIRED libaccounts-glib)
-pkg_check_modules(LIBSIGNON REQUIRED libsignon-glib)
+pkg_check_modules(LIBACCOUNTS libaccounts-glib REQUIRED)
+pkg_check_modules(LIBSIGNON libsignon-glib REQUIRED)
 pkg_check_modules(ZMQLIB libzmq REQUIRED)
+pkg_check_modules(NET_CPP net-cpp REQUIRED)
+
+find_library(ZMQPPLIB zmqpp)
+if(NOT ZMQPPLIB)
+  message(FATAL_ERROR "libzmqpp-dev not found.")
+endif()
+
+find_library(CAPNPLIB capnp)
+if(NOT CAPNPLIB)
+  message(FATAL_ERROR "libcapnp-dev not found.")
+endif()
+
+find_library(KJLIB kj)
+if(NOT KJLIB)
+  message(FATAL_ERROR "capnproto not found.")
+endif()
+
+find_library(DLLIB dl)
+if(NOT DLLIB)
+  message(FATAL_ERROR "dl lib not found.")
+endif()
 
 find_program(LTTNG_EXECUTABLE lttng)
 if (NOT LTTNG_EXECUTABLE)
@@ -118,8 +139,10 @@
 
 set(OTHER_INCLUDE_DIRS ${OTHER_INCLUDE_DIRS} ${UNITY_API_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
                        ${JSONCPP_INCLUDE_DIRS} ${PROCESS_CPP_INCLUDE_DIRS} ${APPARMOR_INCLUDE_DIRS}
-                       ${LIBACCOUNTS_INCLUDE_DIRS} ${LIBSIGNON_INCLUDE_DIRS})
-set(OTHER_LIBS ${OTHER_LIBS} ${UNITY_API_LDFLAGS} ${APPARMOR_LDFLAGS} ${LIBACCOUNTS_LIBRARIES} ${LIBSIGNON_LIBRARIES})
+                       ${LIBACCOUNTS_INCLUDE_DIRS} ${LIBSIGNON_INCLUDE_DIRS} ${NET_CPP_INCLUDE_DIRS})
+set(OTHER_LIBS ${OTHER_LIBS} ${UNITY_API_LDFLAGS} ${APPARMOR_LDFLAGS} ${LIBACCOUNTS_LIBRARIES}
+               ${LIBSIGNON_LIBRARIES} ${Boost_LIBRARIES} ${JSONCPP_LDFLAGS} ${PROCESS_CPP_LDFLAGS}
+               ${ZMQPPLIB} ${ZMQLIB_LDFLAGS} ${CAPNPLIB} ${KJLIB} ${DLLIB} ${NET_CPP_LDFLAGS} pthread)
 
 # Standard install paths
 include(GNUInstallDirs)
@@ -207,49 +230,6 @@
 # Version for testing, with all symbols visible
 set(UNITY_SCOPES_TEST_LIB ${UNITY_SCOPES_LIB}-test)
 
-find_library(ZMQPPLIB zmqpp)
-if(NOT ZMQPPLIB)
-  message(FATAL_ERROR "Zmqpp lib not found.")
-endif()
-
-find_library(CAPNPLIB capnp)
-if(NOT CAPNPLIB)
-  message(FATAL_ERROR "Cap'n Proto lib not found.")
-endif()
-
-find_library(KJLIB kj)
-if(NOT KJLIB)
-  message(FATAL_ERROR "Kj lib not found.")
-endif()
-
-find_library(DLLIB dl)
-if(NOT DLLIB)
-  message(FATAL_ERROR "Dl lib not found.")
-endif()
-
-
-# Stop complaints during the generation phase about executables depending
-# on Qt5::Core and Qt5::Network. They are bogus because only
-# only smartscopes uses these.
-if(POLICY CMP0028)
-    cmake_policy(SET CMP0028 OLD)
-endif()
-
-# Other libraries we depend on
-set(OTHER_LIBS
-    ${OTHER_LIBS}
-    ${Boost_LIBRARIES}
-    ${JSONCPP_LDFLAGS}
-    ${PROCESS_CPP_LDFLAGS}
-    ${ZMQPPLIB}
-    ${ZMQLIB_LDFLAGS}
-    ${CAPNPLIB}
-    ${KJLIB}
-    ${DLLIB}
-    pthread
-    smartscopes
-)
-
 # All the libraries we need to link a normal executable that uses Unity scopes
 set(LIBS ${UNITY_SCOPES_LIB})
 

=== modified file 'debian/control'
--- debian/control	2015-01-20 09:11:18 +0000
+++ debian/control	2015-01-20 09:11:18 +0000
@@ -25,6 +25,7 @@
                libdbustest1-dev,
                libjsoncpp-dev,
                liblttng-ust-dev,
+               libnet-cpp-dev,
                libprocess-cpp-dev (>= 1.0.1),
                libsignon-glib-dev,
                libunity-api-dev (>= 7.80.7~),
@@ -33,7 +34,6 @@
                lttng-tools,
                pkg-config,
                python3:any,
-               qtbase5-dev,
                valgrind,
 Standards-Version: 3.9.5
 XS-Testsuite: autopkgtest

=== modified file 'include/unity/scopes/OnlineAccountClient.h'
--- include/unity/scopes/OnlineAccountClient.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/OnlineAccountClient.h	2015-01-20 09:11:18 +0000
@@ -59,7 +59,7 @@
     */
     struct ServiceStatus
     {
-        uint account_id;            ///< A unique ID of the online account parenting this service.
+        unsigned int account_id;    ///< A unique ID of the online account parenting this service.
         bool service_enabled;       ///< True if this service is enabled.
         bool service_authenticated; ///< True if this service is authenticated.
         std::string client_id;      ///< "ConsumerKey" / "ClientId" OAuth (1 / 2) parameter.

=== modified file 'include/unity/scopes/internal/smartscopes/HttpClientInterface.h'
--- include/unity/scopes/internal/smartscopes/HttpClientInterface.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/internal/smartscopes/HttpClientInterface.h	2015-01-20 09:11:18 +0000
@@ -53,7 +53,7 @@
     virtual ~HttpClientInterface() = default;
 
     virtual std::shared_ptr<HttpResponseHandle> get(std::string const& request_url,
-            std::function<void(std::string const&)> const& lineData = [](std::string const&) {},
+            std::function<void(std::string const&)> const& line_data = [](std::string const&) {},
             HttpHeaders const& headers = HttpHeaders()) = 0;
 
     virtual std::string to_percent_encoding(std::string const& string) = 0;

=== added file 'include/unity/scopes/internal/smartscopes/HttpClientNetCpp.h'
--- include/unity/scopes/internal/smartscopes/HttpClientNetCpp.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/internal/smartscopes/HttpClientNetCpp.h	2015-01-20 09:11:18 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#ifndef UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTNETCPP_H
+#define UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTNETCPP_H
+
+#include <unity/scopes/internal/smartscopes/HttpClientInterface.h>
+
+#include <memory>
+#include <thread>
+
+namespace core
+{
+namespace net
+{
+namespace http
+{
+class Client;
+}
+}
+}
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+namespace smartscopes
+{
+
+class HttpClientNetCpp : public HttpClientInterface
+{
+public:
+    explicit HttpClientNetCpp(unsigned int no_reply_timeout);
+    ~HttpClientNetCpp();
+
+    HttpResponseHandle::SPtr get(std::string const& request_url,
+                                 std::function<void(std::string const&)> const& line_data = [](std::string const&) {},
+                                 HttpHeaders const& headers = HttpHeaders()) override;
+
+    std::string to_percent_encoding(std::string const& string) override;
+
+private:
+    void cancel_get(unsigned int session_id) override;
+
+    unsigned int no_reply_timeout;
+    std::shared_ptr<core::net::http::Client> client;
+    std::thread worker;
+};
+
+}  // namespace smartscopes
+
+}  // namespace internal
+
+}  // namespace scopes
+
+}  // namespace unity
+
+#endif  // UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTNETCPP_H

=== removed file 'include/unity/scopes/internal/smartscopes/HttpClientQt.h'
--- include/unity/scopes/internal/smartscopes/HttpClientQt.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/internal/smartscopes/HttpClientQt.h	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Marcus Tomlinson <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/scopes/internal/smartscopes/HttpClientInterface.h>
-#include <map>
-
-class QCoreApplication;
-
-namespace unity
-{
-
-namespace scopes
-{
-
-namespace internal
-{
-
-namespace smartscopes
-{
-
-class HttpClientQtThread;
-
-class HttpClientQt : public HttpClientInterface
-{
-public:
-    explicit HttpClientQt(unsigned int no_reply_timeout);
-    ~HttpClientQt();
-
-    HttpResponseHandle::SPtr get(std::string const& request_url, std::function<void(std::string const&)> const& lineData = [](std::string const&) {},
-            HttpHeaders const& headers = HttpHeaders()) override;
-
-    std::string to_percent_encoding(std::string const& string) override;
-
-private:
-    void cancel_get(unsigned int session_id) override;
-
-private:
-    class HttpSession
-    {
-    public:
-        HttpSession(std::string const& request_url, unsigned int timeout, std::function<void(std::string const&)> const& lineData, HttpHeaders const& headers =
-                HttpHeaders());
-        ~HttpSession();
-
-        std::future<void> get_future();
-
-        void cancel_session();
-        void wait_for_session();
-
-    private:
-        std::promise<void> promise_;
-        std::thread get_thread_;
-        std::unique_ptr<HttpClientQtThread> qt_thread_;
-        std::mutex qt_thread_mutex_;
-        std::promise<void> qt_thread_ready_;
-    };
-
-private:
-    unsigned int session_index_;
-    std::map<unsigned int, std::shared_ptr<HttpSession>> sessions_;
-    std::mutex sessions_mutex_;
-
-    unsigned int const no_reply_timeout_;
-
-    std::unique_ptr<QCoreApplication> app_;
-};
-
-}  // namespace smartscopes
-
-}  // namespace internal
-
-}  // namespace scopes
-
-}  // namespace unity

=== removed file 'include/unity/scopes/internal/smartscopes/HttpClientQtThread.h'
--- include/unity/scopes/internal/smartscopes/HttpClientQtThread.h	2014-11-03 05:31:30 +0000
+++ include/unity/scopes/internal/smartscopes/HttpClientQtThread.h	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Marcus Tomlinson <[e-mail]>
- */
-
-#pragma once
-
-// This hack allows unity-scopes-api to be built with
-// clang-3.4+ and versions of Qt before v5.1.1.
-#if QT_VERSION < 0x050101
-    #define register
-
-    #include <QThread>
-
-    #define qHash(x,y) qHash(const QUrl &url, unsigned int seed)
-    #include <QUrl>
-    #undef qHash
-
-    #undef register
-#else
-    #include <QThread>
-    #include <QUrl>
-#endif
-
-#include <unity/scopes/internal/smartscopes/HttpClientInterface.h>
-#include <unity/util/NonCopyable.h>
-
-#include <mutex>
-
-class QNetworkReply;
-class QNetworkAccessManager;
-
-namespace unity
-{
-
-namespace scopes
-{
-
-namespace internal
-{
-
-namespace smartscopes
-{
-
-class Q_DECL_EXPORT HttpClientQtThread : public QThread
-{
-    Q_OBJECT
-
-public:
-    NONCOPYABLE(HttpClientQtThread);
-
-    HttpClientQtThread(const QUrl& url, unsigned int timeout, std::function<void(std::string const&)> const& lineData, const HttpHeaders& headers =
-            HttpHeaders());
-    ~HttpClientQtThread();
-
-    bool get_reply(std::string& reply);
-
-private:
-    void run();
-
-public Q_SLOTS:
-    void cancel();
-    void timeout();
-    void got_reply(QNetworkReply* reply);
-    void dataReady();
-
-Q_SIGNALS:
-    void abort();
-
-private:
-    QUrl url_;
-    const std::function<void(std::string const&)> lineDataCallback_;
-    HttpHeaders headers_;
-    unsigned int timeout_;
-    std::mutex reply_mutex_;
-
-    bool success_;
-    std::string reply_;
-};
-
-} // namespace smartscopes
-
-} // namespace internal
-
-} // namespace scopes
-
-} // namespace unity

=== modified file 'src/scopes/internal/JsonCppNode.cpp'
--- src/scopes/internal/JsonCppNode.cpp	2015-01-13 09:12:06 +0000
+++ src/scopes/internal/JsonCppNode.cpp	2015-01-20 09:11:18 +0000
@@ -117,7 +117,7 @@
             return Variant(value.asString());
         case Json::ValueType::intValue:
         case Json::ValueType::uintValue:
-            return Variant(value.asInt()); // this can throw std::runtime_error from jsoncpp if uint to int conversion is not possible
+            return Variant(value.asInt()); // this can throw std::runtime_error from jsoncpp if unsigned int to int conversion is not possible
         case Json::ValueType::realValue:
             return Variant(value.asDouble());
         case Json::ValueType::booleanValue:
@@ -220,11 +220,11 @@
     return root_.asInt();
 }
 
-uint JsonCppNode::as_uint() const
+unsigned int JsonCppNode::as_uint() const
 {
     if (!root_.isConvertibleTo(Json::uintValue))
     {
-        throw unity::LogicException("Node does not contain a uint value");
+        throw unity::LogicException("Node does not contain a unsigned int value");
     }
 
     return root_.asUInt();
@@ -281,7 +281,7 @@
     return std::make_shared<JsonCppNode>(value_node);
 }
 
-JsonNodeInterface::SPtr JsonCppNode::get_node(uint node_index) const
+JsonNodeInterface::SPtr JsonCppNode::get_node(unsigned int node_index) const
 {
     if (root_.type() != Json::arrayValue)
     {

=== modified file 'src/scopes/internal/RegistryObject.cpp'
--- src/scopes/internal/RegistryObject.cpp	2015-01-05 01:48:35 +0000
+++ src/scopes/internal/RegistryObject.cpp	2015-01-20 09:11:18 +0000
@@ -766,7 +766,7 @@
         util::ResourcePtr<wordexp_t*, decltype(&wordfree)> free_guard(&exp, wordfree);
 
         command_args.push_back(exp.we_wordv[0]);
-        for (uint i = 1; i < exp.we_wordc; ++i)
+        for (unsigned int i = 1; i < exp.we_wordc; ++i)
         {
             std::string arg = exp.we_wordv[i];
             // Replace "%R" placeholders with the runtime config

=== modified file 'src/scopes/internal/smartscopes/CMakeLists.txt'
--- src/scopes/internal/smartscopes/CMakeLists.txt	2014-08-18 08:50:39 +0000
+++ src/scopes/internal/smartscopes/CMakeLists.txt	2015-01-20 09:11:18 +0000
@@ -1,5 +1,7 @@
 set(SRC
+    ${CMAKE_CURRENT_SOURCE_DIR}/HttpClientNetCpp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SmartScope.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/SmartScopesClient.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SSConfig.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SSQueryCtrlObject.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SSQueryObject.cpp
@@ -7,34 +9,3 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/SSScopeObject.cpp
 )
 set(UNITY_SCOPES_LIB_SRC ${UNITY_SCOPES_LIB_SRC} ${SRC} PARENT_SCOPE)
-
-# -- libsmartscopes --
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-find_package(Qt5Core REQUIRED)
-include_directories(${Qt5Core_INCLUDE_DIRS})
-
-add_library(
-    smartscopes STATIC
-
-    HttpClientQt.cpp
-
-    ${CMAKE_SOURCE_DIR}/include/unity/scopes/internal/smartscopes/HttpClientQtThread.h
-    HttpClientQtThread.cpp
-
-    SmartScopesClient.cpp
-)
-
-qt5_use_modules(
-    smartscopes
-
-    Core
-    Network
-)
-
-target_link_libraries(
-    smartscopes
-    ${UNITY_API_LDFLAGS}
-)

=== added file 'src/scopes/internal/smartscopes/HttpClientNetCpp.cpp'
--- src/scopes/internal/smartscopes/HttpClientNetCpp.cpp	1970-01-01 00:00:00 +0000
+++ src/scopes/internal/smartscopes/HttpClientNetCpp.cpp	2015-01-20 09:11:18 +0000
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <unity/scopes/internal/smartscopes/HttpClientNetCpp.h>
+
+#include <unity/UnityExceptions.h>
+
+#include <core/net/http/client.h>
+#include <core/net/http/request.h>
+#include <core/net/http/response.h>
+#include <core/net/http/status.h>
+
+#include <iostream>
+#include <unordered_map>
+
+namespace net = core::net;
+namespace http = core::net::http;
+
+using namespace unity::scopes::internal::smartscopes;
+
+namespace
+{
+struct Cancelable
+{
+    Cancelable() = default;
+    Cancelable(const Cancelable&) = delete;
+    Cancelable& operator=(const Cancelable&) = delete;
+
+    void cancel()
+    {
+        cancelled.store(true);
+    }
+
+    bool is_cancelled() const
+    {
+        return cancelled.load();
+    }
+
+    std::atomic<bool> cancelled{false};
+};
+
+struct CancellationRegistry
+{
+    static CancellationRegistry& instance()
+    {
+        static CancellationRegistry cr;
+        return cr;
+    }
+
+    std::pair<unsigned int, std::shared_ptr<Cancelable>> add()
+    {
+        auto cancelable = std::make_shared<Cancelable>();
+        auto id = add(cancelable);
+
+        return std::make_pair(id, cancelable);
+    }
+
+    unsigned int add(const std::shared_ptr<Cancelable>& cancelable)
+    {
+        std::lock_guard<std::mutex> lg(guard);
+
+        unsigned int result{++request_id};
+
+        store.insert(std::make_pair(result, cancelable));
+
+        return result;
+    }
+
+    void cancel_and_remove_for_id(unsigned int id)
+    {
+        std::lock_guard<std::mutex> lg(guard);
+
+        auto it = store.find(id);
+
+        if (it != store.end())
+        {
+            it->second->cancel();
+            store.erase(it);
+        }
+    }
+
+    unsigned int request_id{0};
+    std::mutex guard;
+    std::unordered_map<unsigned int, std::shared_ptr<Cancelable>> store;
+};
+}
+
+HttpClientNetCpp::HttpClientNetCpp(unsigned int no_reply_timeout)
+    : no_reply_timeout{no_reply_timeout},
+      client{http::make_client()},
+      worker([this]() { client->run(); })
+{
+}
+
+HttpClientNetCpp::~HttpClientNetCpp()
+{
+    client->stop();
+
+    if (worker.joinable())
+    {
+        worker.join();
+    }
+}
+
+HttpResponseHandle::SPtr HttpClientNetCpp::get(std::string const& request_url,
+                                               std::function<void(std::string const&)> const& line_data,
+                                               HttpHeaders const& headers)
+{
+    auto http_config = http::Request::Configuration::from_uri_as_string(request_url);
+    http::Header http_header;
+    for (auto const& hdr: headers)
+    {
+        http_header.add(hdr.first, hdr.second);
+    }
+    http_config.header = http_header;
+
+    auto request = client->get(http_config);
+    request->set_timeout(std::chrono::milliseconds{no_reply_timeout});
+
+    auto promise = std::make_shared<std::promise<void>>();
+    std::shared_future<void> future(promise->get_future());
+
+    auto id_and_cancelable = CancellationRegistry::instance().add();
+
+    request->async_execute(
+                http::Request::Handler()
+                    .on_progress([id_and_cancelable](const http::Request::Progress&)
+                    {
+                        return id_and_cancelable.second->is_cancelled() ?
+                                    http::Request::Progress::Next::abort_operation :
+                                    http::Request::Progress::Next::continue_operation;
+                    })
+                    .on_response([line_data, promise](const http::Response& response)
+                    {
+                        if (response.status != http::Status::ok)
+                        {
+                            std::ostringstream msg;
+                            msg << "HTTP request failed with: " << response.status << std::endl << response.body;
+                            unity::ResourceException e(msg.str());
+
+                            promise->set_exception(std::make_exception_ptr(e));
+                        }
+                        else
+                        {
+                            std::istringstream in(response.body);
+                            std::string line;
+                            while (std::getline(in, line))
+                            {
+                                line_data(line);
+                            }
+                            promise->set_value();
+                        }
+                    })
+                    .on_error([promise](const net::Error& e)
+                    {
+                        unity::ResourceException re(e.what());
+                        promise->set_exception(std::make_exception_ptr(re));
+                    }));
+
+    return std::make_shared<HttpResponseHandle>(
+                shared_from_this(),
+                id_and_cancelable.first,
+                future);
+}
+
+void HttpClientNetCpp::cancel_get(unsigned int id)
+{
+    CancellationRegistry::instance().cancel_and_remove_for_id(id);
+}
+
+std::string HttpClientNetCpp::to_percent_encoding(std::string const& string)
+{
+    return client->url_escape(string);
+}

=== removed file 'src/scopes/internal/smartscopes/HttpClientQt.cpp'
--- src/scopes/internal/smartscopes/HttpClientQt.cpp	2014-12-02 02:00:57 +0000
+++ src/scopes/internal/smartscopes/HttpClientQt.cpp	1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Marcus Tomlinson <[e-mail]>
- */
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#pragma GCC diagnostic ignored "-Wswitch-default"
-
-#include <unity/scopes/internal/smartscopes/HttpClientQt.h>
-#include <unity/scopes/internal/smartscopes/HttpClientQtThread.h>
-#include <unity/UnityExceptions.h>
-
-#include <QCoreApplication>
-#include <QEventLoop>
-#include <QUrl>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-
-#pragma GCC diagnostic pop
-
-using namespace unity::scopes::internal::smartscopes;
-
-//-- HttpClientQt
-
-HttpClientQt::HttpClientQt(uint no_reply_timeout)
-    : session_index_(0)
-    , no_reply_timeout_(no_reply_timeout)
-    , app_(nullptr)
-{
-    if (!QCoreApplication::instance())
-    {
-        int argc = 0;
-        app_ = std::unique_ptr<QCoreApplication>(new QCoreApplication(argc, nullptr));
-    }
-}
-
-HttpClientQt::~HttpClientQt()
-{
-}
-
-HttpResponseHandle::SPtr HttpClientQt::get(std::string const& request_url, std::function<void(std::string const&)> const& lineData,
-        HttpHeaders const& headers)
-{
-    std::lock_guard<std::mutex> lock(sessions_mutex_);
-
-    // start new session
-    auto session = std::make_shared<HttpSession>(request_url, no_reply_timeout_, lineData, headers);
-    sessions_[session_index_] = session;
-
-    return std::make_shared<HttpResponseHandle>(shared_from_this(), session_index_++, session->get_future());
-}
-
-void HttpClientQt::cancel_get(uint session_id)
-{
-    std::lock_guard<std::mutex> lock(sessions_mutex_);
-
-    // if session_id in map, cancel it
-    auto it = sessions_.find(session_id);
-    if (it != sessions_.end())
-    {
-        it->second->cancel_session();
-        sessions_.erase(it);
-    }
-}
-
-std::string HttpClientQt::to_percent_encoding(std::string const& string)
-{
-    return QUrl::toPercentEncoding(string.c_str()).constData();
-}
-
-//-- HttpClientQt::HttpSession
-
-HttpClientQt::HttpSession::HttpSession(std::string const& request_url, uint timeout, std::function<void(std::string const&)> const& lineData,
-        HttpHeaders const& headers)
-    : qt_thread_(nullptr)
-{
-    get_thread_ =
-        std::thread([this, request_url, headers, timeout, lineData]()
-            {
-                QUrl url(request_url.c_str());
-
-                {
-                    std::lock_guard<std::mutex> lock(qt_thread_mutex_);
-                    qt_thread_ = std::unique_ptr<HttpClientQtThread>(new HttpClientQtThread(url, timeout, lineData, headers));
-                }
-
-                QEventLoop loop;
-                QObject::connect(qt_thread_.get(), &HttpClientQtThread::finished, &loop, &QEventLoop::quit);
-
-                qt_thread_->start();
-                qt_thread_ready_.set_value();
-                loop.exec();
-
-                std::string reply;
-                bool success = qt_thread_->get_reply(reply);
-
-                if (!success)
-                {
-                    unity::ResourceException e(reply);
-                    promise_.set_exception(e.self());
-                }
-                else
-                {
-                    promise_.set_value();
-                }
-            });
-
-    qt_thread_ready_.get_future().wait();
-}
-
-HttpClientQt::HttpSession::~HttpSession()
-{
-    cancel_session();
-}
-
-std::future<void> HttpClientQt::HttpSession::get_future()
-{
-    return promise_.get_future();
-}
-
-void HttpClientQt::HttpSession::cancel_session()
-{
-    {
-        std::lock_guard<std::mutex> lock(qt_thread_mutex_);
-        qt_thread_->cancel();
-    }
-
-    wait_for_session();
-}
-
-void HttpClientQt::HttpSession::wait_for_session()
-{
-    if (get_thread_.joinable())
-    {
-        get_thread_.join();
-    }
-}

=== removed file 'src/scopes/internal/smartscopes/HttpClientQtThread.cpp'
--- src/scopes/internal/smartscopes/HttpClientQtThread.cpp	2014-12-02 02:00:57 +0000
+++ src/scopes/internal/smartscopes/HttpClientQtThread.cpp	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Marcus Tomlinson <[e-mail]>
- *              Pawel Stolowski <[e-mail]>
- */
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#pragma GCC diagnostic ignored "-Wswitch-default"
-
-#include "unity/scopes/internal/smartscopes/HttpClientQtThread.h"
-
-#include <QNetworkRequest>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QTimer>
-
-#pragma GCC diagnostic pop
-
-#include <cassert>
-
-namespace unity
-{
-
-namespace scopes
-{
-
-namespace internal
-{
-
-namespace smartscopes
-{
-
-HttpClientQtThread::HttpClientQtThread(const QUrl& url, uint timeout, std::function<void(std::string const&)> const& lineData, HttpHeaders const& headers)
-    : QThread()
-    , url_(url)
-    , lineDataCallback_(lineData)
-    , headers_(headers)
-    , timeout_(timeout)
-    , success_(false)
-{
-}
-
-HttpClientQtThread::~HttpClientQtThread()
-{
-    cancel();
-
-    wait();
-}
-
-bool HttpClientQtThread::get_reply(std::string& reply)
-{
-    std::lock_guard<std::mutex> lock(reply_mutex_);
-
-    reply = reply_;
-    return success_;
-}
-
-void HttpClientQtThread::run()
-{
-    QNetworkAccessManager* manager = new QNetworkAccessManager();
-
-    QNetworkRequest request(url_);
-    for (auto const& hdr: headers_)
-    {
-        request.setRawHeader(QString::fromStdString(hdr.first).toUtf8(), QString::fromStdString(hdr.second).toUtf8());
-    }
-
-    QNetworkReply* reply = manager->get(request);
-    reply->setReadBufferSize(0); // unlimited buffer
-
-    connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(got_reply(QNetworkReply *)));
-    connect(reply, SIGNAL(readyRead()), this, SLOT(dataReady()));
-    connect(this, &HttpClientQtThread::abort, reply, &QNetworkReply::abort);
-
-    QTimer timeout;
-    timeout.singleShot(timeout_, this, SLOT(timeout()));
-    QThread::exec();  // enter event loop
-
-    reply->deleteLater();
-    manager->deleteLater();
-}
-
-void HttpClientQtThread::cancel()
-{
-    std::lock_guard<std::mutex> lock(reply_mutex_);
-
-    success_ = false;
-    reply_ = "Request cancelled: " + url_.url().toStdString();
-
-    emit HttpClientQtThread::abort();
-    quit();
-}
-
-void HttpClientQtThread::timeout()
-{
-    std::lock_guard<std::mutex> lock(reply_mutex_);
-
-    success_ = false;
-    reply_ = "Request timed out: " + url_.url().toStdString();
-
-    emit HttpClientQtThread::abort();
-    quit();
-}
-
-void HttpClientQtThread::dataReady()
-{
-    QNetworkReply* net_reply = qobject_cast<QNetworkReply*>(sender());
-    if (net_reply)
-    {
-        if (net_reply->canReadLine())
-        {
-            QByteArray data = net_reply->readLine();
-            const std::string replyLine(data.constData(), data.size());
-            lineDataCallback_(replyLine);
-        }
-    }
-}
-
-void HttpClientQtThread::got_reply(QNetworkReply* reply)
-{
-    std::lock_guard<std::mutex> lock(reply_mutex_);
-
-    if (!reply_.empty())
-    {
-        return;
-    }
-
-    if (!reply)
-    {
-        // no reply
-        success_ = false;
-        reply_ = "No reply from " + url_.url().toStdString();
-    }
-    else if (!reply->isFinished())
-    {
-        // incomplete reply
-        success_ = false;
-        reply_ = "Incomplete reply from " + url_.url().toStdString();
-    }
-    else if (reply->error() != QNetworkReply::NoError)
-    {
-        // communication error
-        success_ = false;
-        reply_ = reply->errorString().toStdString();
-    }
-    else
-    {
-        success_ = true;
-        // read any remaining lines
-        while (reply->canReadLine())
-        {
-            const QByteArray byte_array = reply->readLine();
-            lineDataCallback_(std::string(byte_array.constData(), byte_array.size()));
-        }
-        // there may be data left which is not "\n" terminated
-        if (reply->bytesAvailable())
-        {
-            const QByteArray byte_array = reply->readAll();
-            lineDataCallback_(std::string(byte_array.constData(), byte_array.size()));
-        }
-    }
-
-    quit();
-}
-
-} // namespace smartscopes
-
-} // namespace internal
-
-} // namespace scopes
-
-} // namespace unity

=== modified file 'src/scopes/internal/smartscopes/SSRegistryObject.cpp'
--- src/scopes/internal/smartscopes/SSRegistryObject.cpp	2015-01-09 03:16:51 +0000
+++ src/scopes/internal/smartscopes/SSRegistryObject.cpp	2015-01-20 09:11:18 +0000
@@ -25,7 +25,7 @@
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/ScopeImpl.h>
 #include <unity/scopes/internal/ScopeMetadataImpl.h>
-#include <unity/scopes/internal/smartscopes/HttpClientQt.h>
+#include <unity/scopes/internal/smartscopes/HttpClientNetCpp.h>
 #include <unity/scopes/internal/Utils.h>
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/UnityExceptions.h>
@@ -48,7 +48,7 @@
                                    std::string const& sss_url,
                                    bool caching_enabled)
     : ssclient_(std::make_shared<SmartScopesClient>(
-                    std::make_shared<HttpClientQt>(ss_config.http_reply_timeout() * 1000),  // need millisecs
+                    std::make_shared<HttpClientNetCpp>(ss_config.http_reply_timeout() * 1000),  // need millisecs
                     std::make_shared<JsonCppNode>(),
                     middleware->runtime(),
                     sss_url))

=== modified file 'src/scopes/internal/smartscopes/SmartScopesClient.cpp'
--- src/scopes/internal/smartscopes/SmartScopesClient.cpp	2015-01-09 03:16:51 +0000
+++ src/scopes/internal/smartscopes/SmartScopesClient.cpp	2015-01-20 09:11:18 +0000
@@ -63,7 +63,7 @@
 
 //-- SearchHandle
 
-SearchHandle::SearchHandle(uint search_id, SmartScopesClient::SPtr ssc)
+SearchHandle::SearchHandle(unsigned int search_id, SmartScopesClient::SPtr ssc)
     : search_id_(search_id)
     , ssc_(ssc)
 {
@@ -86,7 +86,7 @@
 
 //-- PreviewHandle
 
-PreviewHandle::PreviewHandle(uint preview_id, SmartScopesClient::SPtr ssc)
+PreviewHandle::PreviewHandle(unsigned int preview_id, SmartScopesClient::SPtr ssc)
     : preview_id_(preview_id)
     , ssc_(ssc)
 {
@@ -200,9 +200,13 @@
             BOOST_LOG_SEV(logger_, Logger::Error) << "SmartScopesClient.get_remote_scopes(): failed to read " << partner_file_ << ": " << e.what();
         }
 
-        HttpResponseHandle::SPtr response = http_client_->get(remote_scopes_uri.str(), [&response_str](std::string const& replyLine) {
-                response_str += replyLine; // accumulate all reply lines
+        std::mutex reponse_mutex;
+        HttpResponseHandle::SPtr response = http_client_->get(remote_scopes_uri.str(), [&response_str, &reponse_mutex](std::string const& replyLine)
+        {
+            std::lock_guard<std::mutex> lock(reponse_mutex);
+            response_str += replyLine; // accumulate all reply lines
         }, headers);
+
         response->get();
 
         BOOST_LOG_SEV(logger_, Logger::Info)
@@ -409,7 +413,7 @@
                                              std::string const& locale,
                                              LocationInfo const& location,
                                              std::string const& user_agent_hdr,
-                                             uint limit)
+                                             unsigned int limit)
 {
     std::ostringstream search_uri;
     search_uri.imbue(std::locale::classic()); // so that doubles use one standard formatting wrt decimal point
@@ -458,7 +462,7 @@
     }
 
     std::lock_guard<std::mutex> lock(query_results_mutex_);
-    uint search_id = ++query_counter_;
+    unsigned int search_id = ++query_counter_;
 
     BOOST_LOG_SEV(logger_, Logger::Info) << "SmartScopesClient.search(): GET " << search_uri.str();
 
@@ -469,15 +473,18 @@
         headers.push_back(std::make_pair("User-Agent", user_agent_hdr));
     }
 
-    query_results_[search_id] = http_client_->get(search_uri.str(), [this, handler](std::string const& lineData) {
-            try
-            {
-                parse_line(lineData, handler);
-            }
-            catch (std::exception const &e)
-            {
-                BOOST_LOG(logger_) << "SmartScopesClient.search(): Failed to parse: " << e.what();
-            }
+    auto reponse_mutex = std::make_shared<std::mutex>();
+    query_results_[search_id] = http_client_->get(search_uri.str(), [this, handler, reponse_mutex](std::string const& line_data)
+    {
+        std::lock_guard<std::mutex> lock(*reponse_mutex);
+        try
+        {
+            parse_line(line_data, handler);
+        }
+        catch (std::exception const &e)
+        {
+            BOOST_LOG_SEV(logger_, Logger::Error) << "SmartScopesClient.search(): Failed to parse: " << e.what();
+        }
     }, headers);
 
     return SearchHandle::UPtr(new SearchHandle(search_id, shared_from_this()));
@@ -488,7 +495,7 @@
                                                std::string const& result,
                                                std::string const& session_id,
                                                std::string const& platform,
-                                               const uint widgets_api_version,
+                                               const unsigned int widgets_api_version,
                                                VariantMap const& settings,
                                                std::string const& locale,
                                                std::string const& country,
@@ -530,18 +537,22 @@
     }
 
     std::lock_guard<std::mutex> lock(query_results_mutex_);
-    uint preview_id = ++query_counter_;
+    unsigned int preview_id = ++query_counter_;
 
     BOOST_LOG_SEV(logger_, Logger::Info) << "SmartScopesClient.preview(): GET " << preview_uri.str();
-    query_results_[preview_id] = http_client_->get(preview_uri.str(), [this, handler](std::string const& lineData) {
-            try
-            {
-                parse_line(lineData, handler);
-            }
-            catch (std::exception const &e)
-            {
-                BOOST_LOG(logger_) << "SmartScopesClient.preview(): Failed to parse: " << e.what();
-            }
+
+    auto reponse_mutex = std::make_shared<std::mutex>();
+    query_results_[preview_id] = http_client_->get(preview_uri.str(), [this, handler, reponse_mutex](std::string const& line_data)
+    {
+        std::lock_guard<std::mutex> lock(*reponse_mutex);
+        try
+        {
+            parse_line(line_data, handler);
+        }
+        catch (std::exception const &e)
+        {
+            BOOST_LOG_SEV(logger_, Logger::Error) << "SmartScopesClient.preview(): Failed to parse: " << e.what();
+        }
     }, headers);
 
     return PreviewHandle::UPtr(new PreviewHandle(preview_id, shared_from_this()));
@@ -675,7 +686,7 @@
     }
 }
 
-void SmartScopesClient::wait_for_search(uint search_id)
+void SmartScopesClient::wait_for_search(unsigned int search_id)
 {
     try
     {
@@ -781,7 +792,7 @@
     return FilterStateImpl::deserialize(node->to_variant().get_dict());
 }
 
-void SmartScopesClient::wait_for_preview(uint preview_id)
+void SmartScopesClient::wait_for_preview(unsigned int preview_id)
 {
     try
     {
@@ -817,7 +828,7 @@
 {
     std::vector<std::string> jsons;
 
-    uint start_pos = 0;
+    unsigned int start_pos = 0;
 
     while (start_pos < json_stream.size())
     {
@@ -835,7 +846,7 @@
     return jsons;
 }
 
-void SmartScopesClient::cancel_query(uint query_id)
+void SmartScopesClient::cancel_query(unsigned int query_id)
 {
     std::lock_guard<std::mutex> lock(query_results_mutex_);
 

=== modified file 'test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp'
--- test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp	2014-09-03 11:55:23 +0000
+++ test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp	2015-01-20 09:11:18 +0000
@@ -16,7 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#include <unity/scopes/internal/smartscopes/HttpClientQt.h>
+#include <unity/scopes/internal/smartscopes/HttpClientNetCpp.h>
 #include <unity/UnityExceptions.h>
 
 #include "../RaiiServer.h"
@@ -37,8 +37,8 @@
 class HttpClientTest : public Test
 {
 public:
-    HttpClientTest(uint no_reply_timeout = 20000)
-        : http_client_(new HttpClientQt(no_reply_timeout)),
+    HttpClientTest(unsigned int no_reply_timeout = 20000)
+        : http_client_(new HttpClientNetCpp(no_reply_timeout)),
           server_(FAKE_SERVER_PATH)
     {
         test_url_ = c_test_url + ":" + std::to_string(server_.port_);

=== modified file 'test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py'
--- test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py	2014-12-09 10:44:42 +0000
+++ test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py	2015-01-20 09:11:18 +0000
@@ -32,7 +32,10 @@
 
     if outfile != '':
         f = open(outfile, 'a')
-        f.writelines(["%s : %s\n" % (environ['PATH_INFO'], environ['HTTP_USER_AGENT'])])
+        if environ.has_key('HTTP_USER_AGENT'):
+            f.writelines(["%s : %s\n" % (environ['PATH_INFO'], environ['HTTP_USER_AGENT'])])
+        else:
+            f.writelines(["%s : \n" % (environ['PATH_INFO'])])
 
     if environ['PATH_INFO'] == '/remote-scopes' and (environ['QUERY_STRING'] == '' or environ['QUERY_STRING'] == 'locale=test_TEST'):
         return [remote_scopes_response]

=== modified file 'test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp'
--- test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp	2015-01-09 03:16:51 +0000
+++ test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp	2015-01-20 09:11:18 +0000
@@ -17,7 +17,8 @@
  */
 
 #include <unity/scopes/internal/JsonCppNode.h>
-#include <unity/scopes/internal/smartscopes/HttpClientQt.h>
+#include <unity/scopes/internal/Logger.h>
+#include <unity/scopes/internal/smartscopes/HttpClientNetCpp.h>
 #include <unity/scopes/internal/smartscopes/SmartScopesClient.h>
 #include <unity/scopes/OptionSelectorFilter.h>
 
@@ -45,7 +46,7 @@
 {
 public:
     SmartScopesClientTest()
-        : http_client_(new HttpClientQt(20000)),
+        : http_client_(new HttpClientNetCpp(20000)),
           json_node_(new JsonCppNode()),
           server_(FAKE_SSS_PATH, FAKE_SSS_LOG)
     {

=== modified file 'valgrind-suppress'
--- valgrind-suppress	2014-12-10 05:32:14 +0000
+++ valgrind-suppress	2015-01-20 09:11:18 +0000
@@ -63,52 +63,6 @@
     obj:/lib/x86_64-linux-gnu/ld-2.18.so
 }
 
-# False positives for memory leaks in Qt
-
-{
-   QNetworkConfigurationManager
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:_ZN35QNetworkConfigurationManagerPrivate20updateConfigurationsEv
-   fun:_ZN35QNetworkConfigurationManagerPrivate10initializeEv
-}
-
-{
-   QCoreApplication
-   Memcheck:Leak
-   fun:realloc
-   ...
-   fun:_ZN7QObject5eventEP6QEvent
-   fun:_ZN16QCoreApplication6notifyEP7QObjectP6QEvent
-}
-
-{
-   QNetworkAccessManager
-   Memcheck:Leak
-   ...
-   fun:_ZN21QNetworkAccessManager13createRequestENS_9OperationERK15QNetworkRequestP9QIODevice
-   fun:_ZN21QNetworkAccessManager3getERK15QNetworkRequest
-}
-
-{
-   QNetworkConfigurationManager
-   Memcheck:Leak
-   match-leak-kinds: possible
-   ...
-   fun:_ZN7QThread5startENS_8PriorityE
-   fun:_ZN35QNetworkConfigurationManagerPrivate10initializeEv
-   fun:_Z35qNetworkConfigurationManagerPrivatev
-}
-
-{
-   QFactoryLoader
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:_ZNK14QFactoryLoader8instanceEi
-}
-
 # Bogus "invalid read" reports for ::putenv and ::genenv
 
 {