Merge lp:~dobey/unity-scope-click/merge-trunk into lp:unity-scope-click/devel

[dobey]

Remove unused method to fix failure building under gcc 4.9.

[Alejandro J. Cura (alecu)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:288
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/82

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/108/rebuild

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/merge-trunk]

288. By dobey on 2014-06-12

Remove unused method to fix failure building under gcc 4.9.

Approved by PS Jenkins bot, Alejandro J. Cura.

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-20 14:57:40 +0000
+++ debian/changelog	2014-06-12 14:26:55 +0000
@@ -1,3 +1,22 @@
+unity-scope-click (0.1+14.10.20140611-0ubuntu1) utopic; urgency=low
+
+  [ Rodney Dawes ]
+  * Remove unused method to fix failure building under gcc 4.9.
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 11 Jun 2014 16:50:57 +0000
+
+unity-scope-click (0.1+14.10.20140523-0ubuntu1) utopic; urgency=low
+
+  [ Rodney Dawes ]
+  * Handle some languages differently when submitting reviews. (LP:
+    #1321154). Add runtime dependency on ubuntu-sdk-libs for the
+    frameworks list. (LP: #1320975). Support hal+json in the search
+    request. Fix issues in autopilot tests. Port autopilot tests to
+    python3. Add README and HACKING files. (LP: #1226111). Translations
+    updates. . (LP: #1321154, #1226111, #1320975)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 23 May 2014 15:00:36 +0000
+
 unity-scope-click (0.1+14.10.20140520-0ubuntu1) utopic; urgency=low
 
   [ Rodney Dawes ]

=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2014-05-28 07:42:24 +0000
+++ scope/clickapps/apps-scope.cpp	2014-06-12 14:26:55 +0000
@@ -42,15 +42,6 @@
 #include "apps-scope.h"
 #include "apps-query.h"
 
-namespace
-{
-click::Interface& clickInterfaceInstance()
-{
-    static QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    static click::Interface iface(keyFileLocator);
-    return iface;
-}
-}
 
 click::Scope::Scope()
 {

=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2014-06-03 13:52:16 +0000
+++ scope/clickstore/store-scope.cpp	2014-06-12 14:26:55 +0000
@@ -43,16 +43,6 @@
 #include <logging.h>
 
 
-namespace
-{
-click::Interface& clickInterfaceInstance()
-{
-    static QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    static click::Interface iface(keyFileLocator);  
-    return iface;
-}
-}
-
 click::Scope::Scope()
 {
     nam.reset(new click::network::AccessManager());