unity-scopes-shell

Merge lp:~aacid/unity-scopes-shell/misc_fixes into lp:unity-scopes-shell

  1. misc_fixes
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 356
Merged at revision: 356
Proposed branch: lp:~aacid/unity-scopes-shell/misc_fixes
Merge into: lp:unity-scopes-shell
Diff against target: 89 lines (+5/-8)
7 files modified
src/Unity/optionselectoroptions.h (+1/-1)
src/Unity/overviewscope.cpp (+1/-1)
src/Unity/settingsmodel.cpp (+0/-1)
src/scope-harness/preview/preview-widget.h (+1/-1)
tests/data/mock-scope-departments/mock-scope-departments.cpp (+1/-1)
tests/data/mock-scope/mock-scope.cpp (+1/-1)
tests/resultstest.cpp (+0/-2)
To merge this branch: bzr merge lp:~aacid/unity-scopes-shell/misc_fixes
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+313826@code.launchpad.net

Commit message

Misc fixes

preview-widget.h
optionselectoroptions.h
     Forward declare as struct as it is really a struct when defined

overviewscope.cpp
     Save creating a list with all the values since foreach knows how to properly iterate a map/hash

settingsmodel.cpp
resultstest.cpp
     Don't create an object we never use

mock-scope-departments.cpp
mock-scope.cpp
     Mark function as override

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:356
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/9/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1299
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1306
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1085
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1085/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1085
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1085/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1085
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1085/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1085
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1085/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1085
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1085/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1085
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1085/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/9/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Unity/optionselectoroptions.h'
2--- src/Unity/optionselectoroptions.h 2016-02-29 11:08:36 +0000
3+++ src/Unity/optionselectoroptions.h 2016-12-23 10:27:35 +0000
4@@ -33,7 +33,7 @@
5 {
6
7 class OptionSelectorFilter;
8-class OptionSelectorOption;
9+struct OptionSelectorOption;
10
11 class Q_DECL_EXPORT OptionSelectorOptions :
12 public ModelUpdate<unity::shell::scopes::OptionSelectorOptionsInterface,
13
14=== modified file 'src/Unity/overviewscope.cpp'
15--- src/Unity/overviewscope.cpp 2016-06-10 10:49:13 +0000
16+++ src/Unity/overviewscope.cpp 2016-12-23 10:27:35 +0000
17@@ -116,7 +116,7 @@
18 }
19
20 QList<ScopeInfo> scopes;
21- Q_FOREACH(scopes::ScopeMetadata::SPtr const& metadata, allMetadata.values()) {
22+ Q_FOREACH(scopes::ScopeMetadata::SPtr const& metadata, allMetadata) {
23 if (metadata->invisible())
24 continue;
25 scopes.append(ScopeInfo(metadata));
26
27=== modified file 'src/Unity/settingsmodel.cpp'
28--- src/Unity/settingsmodel.cpp 2016-10-04 08:07:03 +0000
29+++ src/Unity/settingsmodel.cpp 2016-12-23 10:27:35 +0000
30@@ -370,7 +370,6 @@
31 int role)
32 {
33 int row = index.row();
34- QVariant result;
35
36 if (row < m_data.size())
37 {
38
39=== modified file 'src/scope-harness/preview/preview-widget.h'
40--- src/scope-harness/preview/preview-widget.h 2015-03-10 11:23:01 +0000
41+++ src/scope-harness/preview/preview-widget.h 2016-12-23 10:27:35 +0000
42@@ -30,7 +30,7 @@
43 {
44 namespace internal
45 {
46-class PreviewWidgetArguments;
47+struct PreviewWidgetArguments;
48 }
49 namespace view
50 {
51
52=== modified file 'tests/data/mock-scope-departments/mock-scope-departments.cpp'
53--- tests/data/mock-scope-departments/mock-scope-departments.cpp 2015-04-01 13:49:01 +0000
54+++ tests/data/mock-scope-departments/mock-scope-departments.cpp 2016-12-23 10:27:35 +0000
55@@ -170,7 +170,7 @@
56 return nullptr;
57 }
58
59- virtual ChildScopeList find_child_scopes() const
60+ virtual ChildScopeList find_child_scopes() const override
61 {
62 ChildScopeList list;
63 list.push_back({"mock-scope-double-nav", registry()->get_metadata("mock-scope-double-nav"), true});
64
65=== modified file 'tests/data/mock-scope/mock-scope.cpp'
66--- tests/data/mock-scope/mock-scope.cpp 2016-06-08 09:19:48 +0000
67+++ tests/data/mock-scope/mock-scope.cpp 2016-12-23 10:27:35 +0000
68@@ -756,7 +756,7 @@
69 return query;
70 }
71
72- virtual ActivationQueryBase::UPtr perform_action(Result const& result, ActionMetadata const& meta, std::string const& widget_id, std::string const& action_id)
73+ virtual ActivationQueryBase::UPtr perform_action(Result const& result, ActionMetadata const& meta, std::string const& widget_id, std::string const& action_id) override
74 {
75 cout << "scope-A: called perform_action: " << widget_id << ", " << action_id << endl;
76 if (widget_id == "actions" && action_id == "hide")
77
78=== modified file 'tests/resultstest.cpp'
79--- tests/resultstest.cpp 2016-05-05 09:40:46 +0000
80+++ tests/resultstest.cpp 2016-12-23 10:27:35 +0000
81@@ -457,8 +457,6 @@
82 resultsView->setActiveScope("mock-scope-ttl");
83 resultsView->setQuery("query text");
84
85- const QString query("query text");
86-
87 QVERIFY_MATCHRESULT(
88 shm::CategoryListMatcher()
89 .category(shm::CategoryMatcher("cat1")

Subscribers

People subscribed via source and target branches

to all changes: