Merge lp:~marcustomlinson/unity-js-scopes/lp-1524542 into lp:unity-js-scopes

Proposed by Marcus Tomlinson on 2015-12-10
Status: Merged
Merged at revision: 118
Proposed branch: lp:~marcustomlinson/unity-js-scopes/lp-1524542
Merge into: lp:unity-js-scopes
Diff against target: 27 lines (+3/-3)
2 files modified
src/bindings/src/preview-widget.cc (+2/-2)
src/bindings/src/preview-widget.h (+1/-1)
To merge this branch: bzr merge lp:~marcustomlinson/unity-js-scopes/lp-1524542
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) 2015-12-10 Approve on 2015-12-14
PS Jenkins bot (community) continuous-integration Approve on 2015-12-10
Review via email: mp+280118@code.launchpad.net

Commit message

PreviewWidget::add_widget() should expect PreviewWidget not unity::scopes::PreviewWidget

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bindings/src/preview-widget.cc'
2--- src/bindings/src/preview-widget.cc 2015-10-14 16:08:57 +0000
3+++ src/bindings/src/preview-widget.cc 2015-12-10 09:45:28 +0000
4@@ -101,8 +101,8 @@
5 }
6
7 void PreviewWidget::add_widget(
8- std::shared_ptr<unity::scopes::PreviewWidget> preview_widget) {
9- preview_widget_->add_widget(*preview_widget.get());
10+ std::shared_ptr<PreviewWidget> preview_widget) {
11+ preview_widget_->add_widget(preview_widget->preview_widget());
12 }
13
14 std::string PreviewWidget::id() const {
15
16=== modified file 'src/bindings/src/preview-widget.h'
17--- src/bindings/src/preview-widget.h 2015-10-20 20:44:02 +0000
18+++ src/bindings/src/preview-widget.h 2015-12-10 09:45:28 +0000
19@@ -131,7 +131,7 @@
20
21 // v8 binding
22 void add_attribute_value(v8::FunctionCallbackInfo<v8::Value> const& args);
23- void add_widget(std::shared_ptr<unity::scopes::PreviewWidget> preview_widget);
24+ void add_widget(std::shared_ptr<PreviewWidget> preview_widget);
25 std::string id() const;
26 void add_attribute_mapping(const std::string& k, const std::string& field_name);
27 std::string widget_type() const;

Subscribers

People subscribed via source and target branches

to all changes: