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

[Marcus Tomlinson]

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

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

+1

review: Approve

=== modified file 'src/bindings/src/preview-widget.cc'
--- src/bindings/src/preview-widget.cc	2015-10-14 16:08:57 +0000
+++ src/bindings/src/preview-widget.cc	2015-12-10 09:45:28 +0000
@@ -101,8 +101,8 @@
 }
 
 void PreviewWidget::add_widget(
-      std::shared_ptr<unity::scopes::PreviewWidget> preview_widget) {
-  preview_widget_->add_widget(*preview_widget.get());
+      std::shared_ptr<PreviewWidget> preview_widget) {
+  preview_widget_->add_widget(preview_widget->preview_widget());
 }
 
 std::string PreviewWidget::id() const {

=== modified file 'src/bindings/src/preview-widget.h'
--- src/bindings/src/preview-widget.h	2015-10-20 20:44:02 +0000
+++ src/bindings/src/preview-widget.h	2015-12-10 09:45:28 +0000
@@ -131,7 +131,7 @@
 
   // v8 binding
   void add_attribute_value(v8::FunctionCallbackInfo<v8::Value> const& args);
-  void add_widget(std::shared_ptr<unity::scopes::PreviewWidget> preview_widget);
+  void add_widget(std::shared_ptr<PreviewWidget> preview_widget);
   std::string id() const;
   void add_attribute_mapping(const std::string& k, const std::string& field_name);
   std::string widget_type() const;