Unity API

Merge lp:~steveire/unity-api/address-compile-warning into lp:unity-api

  1. address-compile-warning
  2. Merge into trunk
Proposed by Steveire
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 239
Merged at revision: 241
Proposed branch: lp:~steveire/unity-api/address-compile-warning
Merge into: lp:unity-api
Diff against target: 11 lines (+1/-1)
1 file modified
test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockFiltersModel.cpp (+1/-1)
To merge this branch: bzr merge lp:~steveire/unity-api/address-compile-warning
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
Review via email: mp+297947@code.launchpad.net

Commit message

Silence some gcc warnings.

Description of the change

GCC currently issues warnings for this file. Address the warning by adjusting the test.

This warning has been present since https://code.launchpad.net/~stolowski/unity-api/filters-iface/+merge/252890

To post a comment you must log in.
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Oops, thanks for clearing that up!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockFiltersModel.cpp'
2--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockFiltersModel.cpp 2015-03-26 10:27:13 +0000
3+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockFiltersModel.cpp 2016-06-20 19:47:07 +0000
4@@ -20,7 +20,7 @@
5 MockFiltersModel::MockFiltersModel(unity::shell::scopes::ScopeInterface *parent)
6 : unity::shell::scopes::FiltersInterface(parent)
7 {
8- MockOptionSelectorFilter *f = new MockOptionSelectorFilter("f1", "Filter 1", false, this);
9+ MockOptionSelectorFilter *f = new MockOptionSelectorFilter("f1", "Filter 1 title", "Filter 1 label", false, this);
10 m_filters.append(f); // owned by parent, so no need to manage it
11 }
12

Subscribers

People subscribed via source and target branches

to all changes: