Merge lp:~unity-api-team/unity-scopes-shell/gcc-5 into lp:unity-scopes-shell

[Pete Woods]

Fix GCC 5 issues

Fix GCC 5 issues

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/356/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/13

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

review: Approve (continuous-integration)

[Matthias Klose (doko)]

package builds again, but hangs in the tests (likely needs a rebuilt location-service)

review: Approve

[dobey (dobey)]

review: Approve

[Marcus Tomlinson (marcustomlinson)]

Hey Pete, considering this MP is still floating around, I assume that it was not actually required. Can we delete this?

review: Needs Information

Unmerged revisions

239. By Pete Woods on 2015-07-29

Change move -> std::move to remove ambiguity

=== modified file 'src/scope-harness/matcher/category-list-matcher.cpp'
--- src/scope-harness/matcher/category-list-matcher.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/matcher/category-list-matcher.cpp	2015-07-29 13:31:53 +0000
@@ -118,7 +118,7 @@
 
 CategoryListMatcher& CategoryListMatcher::category(CategoryMatcher&& categoryMatcher)
 {
-    p->m_categories.emplace_back(move(categoryMatcher));
+    p->m_categories.emplace_back(std::move(categoryMatcher));
     return *this;
 }
 
 
=== modified file 'src/scope-harness/matcher/category-matcher.cpp'
--- src/scope-harness/matcher/category-matcher.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/matcher/category-matcher.cpp	2015-07-29 13:31:53 +0000
@@ -180,7 +180,7 @@
 
 CategoryMatcher::CategoryMatcher(CategoryMatcher&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 CategoryMatcher& CategoryMatcher::operator=(const CategoryMatcher& other)
@@ -199,7 +199,7 @@
 
 CategoryMatcher& CategoryMatcher::operator=(CategoryMatcher&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
@@ -253,7 +253,7 @@
 
 CategoryMatcher& CategoryMatcher::result(ResultMatcher&& resultMatcher)
 {
-    p->m_results.emplace_back(move(resultMatcher));
+    p->m_results.emplace_back(std::move(resultMatcher));
     return *this;
 }
 
 
=== modified file 'src/scope-harness/matcher/child-department-matcher.cpp'
--- src/scope-harness/matcher/child-department-matcher.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/matcher/child-department-matcher.cpp	2015-07-29 13:31:53 +0000
@@ -88,7 +88,7 @@
 
 ChildDepartmentMatcher::ChildDepartmentMatcher(ChildDepartmentMatcher&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 ChildDepartmentMatcher& ChildDepartmentMatcher::operator=(const ChildDepartmentMatcher& other)
@@ -102,7 +102,7 @@
 
 ChildDepartmentMatcher& ChildDepartmentMatcher::operator=(ChildDepartmentMatcher&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/matcher/match-result.cpp'
--- src/scope-harness/matcher/match-result.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/matcher/match-result.cpp	2015-07-29 13:31:53 +0000
@@ -43,7 +43,7 @@
 
 MatchResult::MatchResult(MatchResult&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 MatchResult::MatchResult(const MatchResult& other) :
@@ -61,7 +61,7 @@
 
 MatchResult& MatchResult::operator=(MatchResult&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/matcher/preview-column-matcher.cpp'
--- src/scope-harness/matcher/preview-column-matcher.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/matcher/preview-column-matcher.cpp	2015-07-29 13:31:53 +0000
@@ -52,7 +52,7 @@
 
 PreviewColumnMatcher::PreviewColumnMatcher(PreviewColumnMatcher&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 PreviewColumnMatcher& PreviewColumnMatcher::operator=(const PreviewColumnMatcher& other)
@@ -63,7 +63,7 @@
 
 PreviewColumnMatcher& PreviewColumnMatcher::operator=(PreviewColumnMatcher&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/matcher/preview-matcher.cpp'
--- src/scope-harness/matcher/preview-matcher.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/matcher/preview-matcher.cpp	2015-07-29 13:31:53 +0000
@@ -50,7 +50,7 @@
 
 PreviewMatcher::PreviewMatcher(PreviewMatcher&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 PreviewMatcher& PreviewMatcher::operator=(const PreviewMatcher& other)
@@ -61,7 +61,7 @@
 
 PreviewMatcher& PreviewMatcher::operator=(PreviewMatcher&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/matcher/preview-widget-matcher.cpp'
--- src/scope-harness/matcher/preview-widget-matcher.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/matcher/preview-widget-matcher.cpp	2015-07-29 13:31:53 +0000
@@ -92,7 +92,7 @@
 
 PreviewWidgetMatcher::PreviewWidgetMatcher(PreviewWidgetMatcher&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 PreviewWidgetMatcher& PreviewWidgetMatcher::operator=(const PreviewWidgetMatcher& other)
@@ -105,7 +105,7 @@
 
 PreviewWidgetMatcher& PreviewWidgetMatcher::operator=(PreviewWidgetMatcher&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
@@ -127,7 +127,7 @@
 
 PreviewWidgetMatcher& PreviewWidgetMatcher::data(sc::Variant&& data)
 {
-    p->m_data = move(data);
+    p->m_data = std::move(data);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/matcher/result-matcher.cpp'
--- src/scope-harness/matcher/result-matcher.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/matcher/result-matcher.cpp	2015-07-29 13:31:53 +0000
@@ -186,7 +186,7 @@
 
 ResultMatcher& ResultMatcher::operator=(ResultMatcher&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/matcher/scope-uri.cpp'
--- src/scope-harness/matcher/scope-uri.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/matcher/scope-uri.cpp	2015-07-29 13:31:53 +0000
@@ -81,7 +81,7 @@
 
 ScopeUri::ScopeUri(ScopeUri&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 ScopeUri& ScopeUri::operator=(const ScopeUri& other)
@@ -94,7 +94,7 @@
 
 ScopeUri& ScopeUri::operator=(ScopeUri&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/preview/preview-widget-list.cpp'
--- src/scope-harness/preview/preview-widget-list.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/preview/preview-widget-list.cpp	2015-07-29 13:31:53 +0000
@@ -48,7 +48,7 @@
 
 PreviewWidgetList::PreviewWidgetList(PreviewWidgetList&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 PreviewWidgetList::~PreviewWidgetList()
@@ -63,7 +63,7 @@
 
 PreviewWidgetList& PreviewWidgetList::operator=(PreviewWidgetList&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/preview/preview-widget.cpp'
--- src/scope-harness/preview/preview-widget.cpp	2015-04-27 11:28:36 +0000
+++ src/scope-harness/preview/preview-widget.cpp	2015-07-29 13:31:53 +0000
@@ -81,7 +81,7 @@
 
 PreviewWidget::PreviewWidget(PreviewWidget&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 PreviewWidget& PreviewWidget::operator=(const PreviewWidget& other)
@@ -97,7 +97,7 @@
 
 PreviewWidget& PreviewWidget::operator=(PreviewWidget&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/registry/custom-registry.cpp'
--- src/scope-harness/registry/custom-registry.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/registry/custom-registry.cpp	2015-07-29 13:31:53 +0000
@@ -91,7 +91,7 @@
 
 CustomRegistry::Parameters::Parameters(Parameters&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
 }
 
 CustomRegistry::Parameters& CustomRegistry::Parameters::operator=(const Parameters& other)
@@ -106,7 +106,7 @@
 
 CustomRegistry::Parameters& CustomRegistry::Parameters::operator=(Parameters&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/results/category.cpp'
--- src/scope-harness/results/category.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/results/category.cpp	2015-07-29 13:31:53 +0000
@@ -58,7 +58,7 @@
 Category::Category(Category&& other) :
         p(new _Priv)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 Category::Category(const Category& other) :
@@ -77,7 +77,7 @@
 
 Category& Category::operator=(Category&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/results/child-department.cpp'
--- src/scope-harness/results/child-department.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/results/child-department.cpp	2015-07-29 13:31:53 +0000
@@ -62,7 +62,7 @@
 
 ChildDepartment::ChildDepartment(ChildDepartment&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 ChildDepartment& ChildDepartment::operator=(const ChildDepartment& other)
@@ -74,7 +74,7 @@
 
 ChildDepartment& ChildDepartment::operator=(ChildDepartment&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/results/department.cpp'
--- src/scope-harness/results/department.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/results/department.cpp	2015-07-29 13:31:53 +0000
@@ -70,7 +70,7 @@
 
 Department::Department(Department&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 Department& Department::operator=(const Department& other)
@@ -82,7 +82,7 @@
 
 Department& Department::operator=(Department&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }
 
 
=== modified file 'src/scope-harness/results/result.cpp'
--- src/scope-harness/results/result.cpp	2015-03-10 11:23:01 +0000
+++ src/scope-harness/results/result.cpp	2015-07-29 13:31:53 +0000
@@ -237,7 +237,7 @@
 
 Result::Result(Result&& other)
 {
-    *this = move(other);
+    *this = std::move(other);
 }
 
 Result::Result(const Result& other) :
@@ -264,7 +264,7 @@
 
 Result& Result::operator=(Result&& other)
 {
-    p = move(other.p);
+    p = std::move(other.p);
     return *this;
 }