Merge with trunk

(bzr r3506.6.16)

23 files changed, 46 insertions, 35 deletions

diff --git a/dash/previews/ActionButton.cpp b/dash/previews/ActionButton.cpp
index 508e65974..2bd21bcb8 100644
--- a/dash/previews/ActionButton.cpp
+++ b/dash/previews/ActionButton.cpp
@@ -75,7 +75,7 @@ void ActionButton::Init()
 {
 InitTheme();
 
- key_nav_focus_activate.connect([&](nux::Area*)
+ key_nav_focus_activate.connect([this](nux::Area*)
 {
 if (GetInputEventSensitivity())
 activate.emit(this, action_hint_);
diff --git a/dash/previews/ActionLink.cpp b/dash/previews/ActionLink.cpp
index 9f1438ee9..6c34b937d 100644
--- a/dash/previews/ActionLink.cpp
+++ b/dash/previews/ActionLink.cpp
@@ -80,12 +80,12 @@ void ActionLink::Init()
 font_hint.SetSetterFunction(sigc::mem_fun(this, &ActionLink::set_font_hint));
 font_hint.SetGetterFunction(sigc::mem_fun(this, &ActionLink::get_font_hint));
 
- key_nav_focus_change.connect([&] (nux::Area*, bool, nux::KeyNavDirection)
+ key_nav_focus_change.connect([this] (nux::Area*, bool, nux::KeyNavDirection)
 {
 QueueDraw();
 });
 
- key_nav_focus_activate.connect([&](nux::Area*)
+ key_nav_focus_activate.connect([this](nux::Area*)
 {
 if (GetInputEventSensitivity())
 activate.emit(this, action_hint_);
diff --git a/dash/previews/ApplicationPreview.cpp b/dash/previews/ApplicationPreview.cpp
index 076ec8afe..6d8c6ecbe 100644
--- a/dash/previews/ApplicationPreview.cpp
+++ b/dash/previews/ApplicationPreview.cpp
@@ -119,7 +119,7 @@ void ApplicationPreview::SetupViews()
 
 previews::Style& style = dash::previews::Style::Instance();
 
- auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
+ auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
 
 nux::HLayout* image_data_layout = new nux::HLayout();
 image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
diff --git a/dash/previews/DBusTestRunner.h b/dash/previews/DBusTestRunner.h
index 54b856151..95b1b9416 100644
--- a/dash/previews/DBusTestRunner.h
+++ b/dash/previews/DBusTestRunner.h
@@ -50,6 +50,7 @@ public:
 proxy_->connected.connect(sigc::mem_fun(this, &DBusTestRunner::OnProxyConnectionChanged));
 proxy_->disconnected.connect(sigc::mem_fun(this, &DBusTestRunner::OnProxyDisconnected));
 }
+ virtual ~DBusTestRunner() {}
 
 virtual void OnProxyConnectionChanged()
 {
diff --git a/dash/previews/GenericPreview.cpp b/dash/previews/GenericPreview.cpp
index ecb1b73da..1b83d6ded 100644
--- a/dash/previews/GenericPreview.cpp
+++ b/dash/previews/GenericPreview.cpp
@@ -111,7 +111,7 @@ void GenericPreview::SetupViews()
 }
 previews::Style& style = dash::previews::Style::Instance();
 
- auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
+ auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
 
 nux::HLayout* image_data_layout = new nux::HLayout();
 image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
diff --git a/dash/previews/LensDBusTestRunner.h b/dash/previews/LensDBusTestRunner.h
index 657b006fb..6468726f1 100644
--- a/dash/previews/LensDBusTestRunner.h
+++ b/dash/previews/LensDBusTestRunner.h
@@ -46,6 +46,8 @@ public:
 results_->end_transaction.connect(sigc::mem_fun(this, &ScopeDBusTestRunner::ResultsModelUpdated));
 }
 
+ virtual ~ScopeDBusTestRunner() {}
+
 void OnProxyConnectionChanged()
 {
 DBusTestRunner::OnProxyConnectionChanged();
@@ -258,4 +260,4 @@ protected:
 } // namespace dash
 } // namespace unity
 
-#endif // LENSDBUSTESTRUNNER_H \ No newline at end of file
+#endif // LENSDBUSTESTRUNNER_H
diff --git a/dash/previews/MoviePreview.cpp b/dash/previews/MoviePreview.cpp
index d17f779ea..4aa30069e 100644
--- a/dash/previews/MoviePreview.cpp
+++ b/dash/previews/MoviePreview.cpp
@@ -121,7 +121,7 @@ void MoviePreview::SetupViews()
 }
 previews::Style& style = dash::previews::Style::Instance();
 
- auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
+ auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
 
 nux::HLayout* image_data_layout = new nux::HLayout();
 image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
diff --git a/dash/previews/MusicPreview.cpp b/dash/previews/MusicPreview.cpp
index 9fe6a1f36..135aeb7fc 100644
--- a/dash/previews/MusicPreview.cpp
+++ b/dash/previews/MusicPreview.cpp
@@ -128,7 +128,7 @@ void MusicPreview::SetupViews()
 }
 previews::Style& style = dash::previews::Style::Instance();
 
- auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
+ auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
 
 nux::HLayout* image_data_layout = new nux::HLayout();
 image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
diff --git a/dash/previews/Preview.cpp b/dash/previews/Preview.cpp
index f0b95f29e..49d5fbd4c 100644
--- a/dash/previews/Preview.cpp
+++ b/dash/previews/Preview.cpp
@@ -200,7 +200,7 @@ void Preview::UpdateCoverArtImage(CoverArt* cover_art)
 
 previews::Style& style = dash::previews::Style::Instance();
 
- auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
+ auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
 
 std::string image_hint;
 if (preview_model_->image.Get())
diff --git a/dash/previews/PreviewContainer.cpp b/dash/previews/PreviewContainer.cpp
index e9564eb71..9f27702a2 100644
--- a/dash/previews/PreviewContainer.cpp
+++ b/dash/previews/PreviewContainer.cpp
@@ -68,7 +68,7 @@ public:
 , nav_complete_(0)
 , relative_nav_index_(0)
 {
- geometry_changed.connect([&](nux::Area*, nux::Geometry& geo)
+ geometry_changed.connect([this](nux::Area*, nux::Geometry& geo)
 {
 // Need to update the preview geometries when updating the container geo.
 UpdateAnimationProgress(progress_, curve_progress_);
@@ -229,7 +229,7 @@ public:
 
 void StartPreviewWait()
 {
- preview_wait_timer_.reset(new glib::Timeout(PREVIEW_SPINNER_WAIT, [&] () {
+ preview_wait_timer_.reset(new glib::Timeout(PREVIEW_SPINNER_WAIT, [this] () {
 
 if (waiting_preview_)
 return false;
@@ -469,7 +469,7 @@ void PreviewContainer::SetupViews()
 AddChild(nav_left_);
 nav_left_->SetMinimumWidth(style.GetNavigatorWidth());
 nav_left_->SetMaximumWidth(style.GetNavigatorWidth());
- nav_left_->activated.connect([&]() { navigate_left.emit(); });
+ nav_left_->activated.connect([this]() { navigate_left.emit(); });
 layout_content_->AddView(nav_left_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 
 preview_layout_ = new PreviewContent(this);
@@ -481,13 +481,13 @@ void PreviewContainer::SetupViews()
 AddChild(nav_right_);
 nav_right_->SetMinimumWidth(style.GetNavigatorWidth());
 nav_right_->SetMaximumWidth(style.GetNavigatorWidth());
- nav_right_->activated.connect([&]() { navigate_right.emit(); });
+ nav_right_->activated.connect([this]() { navigate_right.emit(); });
 layout_content_->AddView(nav_right_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 layout_content_->AddSpace(0, 1);
 
 layout->AddSpace(0, 1);
 
- preview_layout_->start_navigation.connect([&]()
+ preview_layout_->start_navigation.connect([this]()
 {
 // reset animation clock.
 if (navigation_count_ == 0)
@@ -500,19 +500,19 @@ void PreviewContainer::SetupViews()
 QueueAnimation();
 });
 
- preview_layout_->continue_navigation.connect([&]()
+ preview_layout_->continue_navigation.connect([this]()
 {
 QueueAnimation(); 
 });
 
- preview_layout_->end_navigation.connect([&]()
+ preview_layout_->end_navigation.connect([this]()
 {
 navigation_count_ = 0;
 navigation_progress_speed_ = 0;
 });
 
- navigate_right.connect( [&]() { preview_layout_->StartPreviewWait(); } );
- navigate_left.connect( [&]() { preview_layout_->StartPreviewWait(); } );
+ navigate_right.connect( [this]() { preview_layout_->StartPreviewWait(); } );
+ navigate_left.connect( [this]() { preview_layout_->StartPreviewWait(); } );
 }
 
 void PreviewContainer::Draw(nux::GraphicsEngine& gfx_engine, bool force_draw)
diff --git a/dash/previews/PreviewInfoHintWidget.cpp b/dash/previews/PreviewInfoHintWidget.cpp
index a1aa3cd92..69844b412 100644
--- a/dash/previews/PreviewInfoHintWidget.cpp
+++ b/dash/previews/PreviewInfoHintWidget.cpp
@@ -148,7 +148,7 @@ void PreviewInfoHintWidget::SetupViews()
 
 previews::Style& style = previews::Style::Instance();
 
- auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
+ auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
 
 nux::VLayout* layout = new nux::VLayout();
 layout->SetSpaceBetweenChildren(6);
diff --git a/dash/previews/PreviewNavigator.cpp b/dash/previews/PreviewNavigator.cpp
index 289fd2b8a..b73da08e6 100644
--- a/dash/previews/PreviewNavigator.cpp
+++ b/dash/previews/PreviewNavigator.cpp
@@ -140,7 +140,7 @@ void PreviewNavigator::SetupViews()
 AddChild(texture_);
 layout_->AddView(texture_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL); 
 
- texture_->mouse_click.connect([&](int, int, unsigned long, unsigned long) { activated.emit(); });
+ texture_->mouse_click.connect([this](int, int, unsigned long, unsigned long) { activated.emit(); });
 texture_->mouse_enter.connect(sigc::mem_fun(this, &PreviewNavigator::TexRecvMouseEnter));
 texture_->mouse_leave.connect(sigc::mem_fun(this, &PreviewNavigator::TexRecvMouseLeave));
 }
diff --git a/dash/previews/PreviewRatingsWidget.cpp b/dash/previews/PreviewRatingsWidget.cpp
index 53a72ef35..1b36853e8 100644
--- a/dash/previews/PreviewRatingsWidget.cpp
+++ b/dash/previews/PreviewRatingsWidget.cpp
@@ -48,7 +48,7 @@ PreviewRatingsWidget::PreviewRatingsWidget(NUX_FILE_LINE_DECL)
 
 previews::Style& style = previews::Style::Instance();
 
- auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
+ auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
 
 ratings_ = new RatingsButton(18,2);
 ratings_->SetEditable(false);
diff --git a/dash/previews/SocialPreview.cpp b/dash/previews/SocialPreview.cpp
index 1990d6669..d70538890 100644
--- a/dash/previews/SocialPreview.cpp
+++ b/dash/previews/SocialPreview.cpp
@@ -120,7 +120,7 @@ void SocialPreview::SetupViews()
 
 previews::Style& style = dash::previews::Style::Instance();
 
- auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
+ auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_->OnMouseDown(x, y, button_flags, key_flags); };
 
 nux::HLayout* image_data_layout = new nux::HLayout();
 image_data_layout->SetSpaceBetweenChildren(style.GetPanelSplitWidth());
diff --git a/dash/previews/SocialPreviewComments.cpp b/dash/previews/SocialPreviewComments.cpp
index 65e6f3e1c..2c096ffa4 100644
--- a/dash/previews/SocialPreviewComments.cpp
+++ b/dash/previews/SocialPreviewComments.cpp
@@ -128,7 +128,7 @@ void SocialPreviewComments::SetupViews()
 
 previews::Style& style = previews::Style::Instance();
 
- auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
+ auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
 
 nux::VLayout* layout = new nux::VLayout();
 layout->SetSpaceBetweenChildren(6);
diff --git a/dash/previews/SocialPreviewContent.cpp b/dash/previews/SocialPreviewContent.cpp
index 3b9f37264..b11c321a2 100644
--- a/dash/previews/SocialPreviewContent.cpp
+++ b/dash/previews/SocialPreviewContent.cpp
@@ -130,7 +130,7 @@ void SocialPreviewContent::SetupViews()
 {
 dash::previews::Style const& style = dash::previews::Style::Instance();
 
- auto on_mouse_down = [&](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
+ auto on_mouse_down = [this](int x, int y, unsigned long button_flags, unsigned long key_flags) { this->preview_container_.OnMouseDown(x, y, button_flags, key_flags); };
 
 text_ = new StaticCairoText("", false, NUX_TRACKER_LOCATION);
 text_->SetLines(-8);
diff --git a/dash/previews/StandaloneApplicationPreview.cpp b/dash/previews/StandaloneApplicationPreview.cpp
index 409785ecf..7cbd9fa7c 100644
--- a/dash/previews/StandaloneApplicationPreview.cpp
+++ b/dash/previews/StandaloneApplicationPreview.cpp
@@ -65,6 +65,7 @@ public:
 layout->AddView(view, 1, nux::MINOR_POSITION_CENTER);
 SetLayout(layout);
 }
+ virtual ~DummyView() {}
 
 // Keyboard navigation
 bool AcceptKeyNavFocus()
@@ -144,7 +145,7 @@ void TestRunner::Init ()
 container_ = new previews::PreviewContainer(NUX_TRACKER_LOCATION);
 container_->navigate_right.connect(sigc::mem_fun(this, &TestRunner::NavRight));
 container_->navigate_left.connect(sigc::mem_fun(this, &TestRunner::NavLeft));
- container_->request_close.connect([&]() { exit(0); });
+ container_->request_close.connect([this]() { exit(0); });
 
 DummyView* dummyView = new DummyView(container_.GetPointer());
 layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
@@ -243,7 +244,7 @@ The service allows users to communicate with peers by voice, video, and instant
 
 void TestRunner::NavLeft()
 {
- preview_wait_timer_.reset(new glib::Timeout(2000, [&] () {
+ preview_wait_timer_.reset(new glib::Timeout(2000, [this] () {
 
 
 std::stringstream app_name;
diff --git a/dash/previews/StandaloneErrorPreview.cpp b/dash/previews/StandaloneErrorPreview.cpp
index 5d778ab6e..911a2ff2f 100644
--- a/dash/previews/StandaloneErrorPreview.cpp
+++ b/dash/previews/StandaloneErrorPreview.cpp
@@ -71,6 +71,7 @@ public:
 layout->AddView(view, 1, nux::MINOR_POSITION_CENTER);
 SetLayout(layout);
 }
+ virtual ~DummyView() {}
 
 // Keyboard navigation
 bool AcceptKeyNavFocus()
@@ -147,7 +148,7 @@ TestRunner::~TestRunner ()
 void TestRunner::Init ()
 {
 container_ = new previews::PreviewContainer(NUX_TRACKER_LOCATION);
- container_->request_close.connect([&]() { exit(0); });
+ container_->request_close.connect([this]() { exit(0); });
 container_->DisableNavButton(previews::Navigation::BOTH);
 
 DummyView* dummyView = new DummyView(container_.GetPointer());
diff --git a/dash/previews/StandaloneMoviePreview.cpp b/dash/previews/StandaloneMoviePreview.cpp
index 6289b6607..0cfc969ba 100644
--- a/dash/previews/StandaloneMoviePreview.cpp
+++ b/dash/previews/StandaloneMoviePreview.cpp
@@ -65,6 +65,7 @@ public:
 layout->AddView(view, 1, nux::MINOR_POSITION_CENTER);
 SetLayout(layout);
 }
+ virtual ~DummyView() {}
 
 // Keyboard navigation
 bool AcceptKeyNavFocus()
@@ -143,7 +144,7 @@ void TestRunner::Init ()
 container_ = new previews::PreviewContainer(NUX_TRACKER_LOCATION);
 container_->navigate_right.connect(sigc::mem_fun(this, &TestRunner::NavRight));
 container_->navigate_left.connect(sigc::mem_fun(this, &TestRunner::NavLeft));
- container_->request_close.connect([&]() { exit(0); });
+ container_->request_close.connect([this]() { exit(0); });
 
 DummyView* dummyView = new DummyView(container_.GetPointer());
 layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
diff --git a/dash/previews/StandaloneMusicPaymentPreview.cpp b/dash/previews/StandaloneMusicPaymentPreview.cpp
index 9ba2a7da9..4f21b093a 100644
--- a/dash/previews/StandaloneMusicPaymentPreview.cpp
+++ b/dash/previews/StandaloneMusicPaymentPreview.cpp
@@ -70,6 +70,7 @@ public:
 layout->AddView(view, 1, nux::MINOR_POSITION_CENTER);
 SetLayout(layout);
 }
+ virtual ~DummyView() {}
 
 // Keyboard navigation
 bool AcceptKeyNavFocus()
@@ -146,7 +147,7 @@ TestRunner::~TestRunner ()
 void TestRunner::Init ()
 {
 container_ = new previews::PreviewContainer(NUX_TRACKER_LOCATION);
- container_->request_close.connect([&]() { exit(0); });
+ container_->request_close.connect([this]() { exit(0); });
 container_->DisableNavButton(previews::Navigation::BOTH);
 
 DummyView* dummyView = new DummyView(container_.GetPointer());
diff --git a/dash/previews/StandaloneMusicPreview.cpp b/dash/previews/StandaloneMusicPreview.cpp
index c4680e587..b3c95fff1 100644
--- a/dash/previews/StandaloneMusicPreview.cpp
+++ b/dash/previews/StandaloneMusicPreview.cpp
@@ -68,6 +68,7 @@ public:
 layout->AddView(view, 1, nux::MINOR_POSITION_CENTER);
 SetLayout(layout);
 }
+ virtual ~DummyView() {}
 
 // Keyboard navigation
 bool AcceptKeyNavFocus()
@@ -143,14 +144,14 @@ TestRunner::TestRunner (std::string const& search_string)
 nav_iter = 0;
 nav_direction_ = previews::Navigation::RIGHT;
 
- connected.connect([&](bool connected) {
+ connected.connect([this](bool connected) {
 if (connected)
 {
 Search(search_string_);
 } 
 });
 
- results_->result_added.connect([&](Result const& result)
+ results_->result_added.connect([this](Result const& result)
 {
 previews::Navigation navDisabled = previews::Navigation::BOTH;
 if (nav_iter < results_->count.Get() - 1)
@@ -177,7 +178,7 @@ void TestRunner::Init ()
 container_ = new previews::PreviewContainer(NUX_TRACKER_LOCATION);
 container_->navigate_right.connect(sigc::mem_fun(this, &TestRunner::NavRight));
 container_->navigate_left.connect(sigc::mem_fun(this, &TestRunner::NavLeft));
- container_->request_close.connect([&]() { exit(0); });
+ container_->request_close.connect([this]() { exit(0); });
 
 DummyView* dummyView = new DummyView(container_.GetPointer());
 layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
@@ -186,7 +187,7 @@ void TestRunner::Init ()
 
 container_->DisableNavButton(previews::Navigation::BOTH);
 
- preview_ready.connect([&](std::string const& uri, dash::Preview::Ptr preview_model)
+ preview_ready.connect([this](std::string const& uri, dash::Preview::Ptr preview_model)
 {
 container_->Preview(preview_model, nav_direction_);
 });
diff --git a/dash/previews/StandaloneSocialPreview.cpp b/dash/previews/StandaloneSocialPreview.cpp
index 9280305e9..cb1736f14 100644
--- a/dash/previews/StandaloneSocialPreview.cpp
+++ b/dash/previews/StandaloneSocialPreview.cpp
@@ -65,6 +65,7 @@ public:
 layout->AddView(view, 1, nux::MINOR_POSITION_CENTER);
 SetLayout(layout);
 }
+ virtual ~DummyView() {}
 
 // Keyboard navigation
 bool AcceptKeyNavFocus()
@@ -144,7 +145,7 @@ void TestRunner::Init ()
 container_ = new previews::PreviewContainer(NUX_TRACKER_LOCATION);
 container_->navigate_right.connect(sigc::mem_fun(this, &TestRunner::NavRight));
 container_->navigate_left.connect(sigc::mem_fun(this, &TestRunner::NavLeft));
- container_->request_close.connect([&]() { exit(0); });
+ container_->request_close.connect([this]() { exit(0); });
 
 DummyView* dummyView = new DummyView(container_.GetPointer());
 layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
diff --git a/dash/previews/Track.cpp b/dash/previews/Track.cpp
index 36d32aa34..bdaca0c7a 100644
--- a/dash/previews/Track.cpp
+++ b/dash/previews/Track.cpp
@@ -41,6 +41,7 @@ class TmpView : public nux::View
 {
 public:
 TmpView(NUX_FILE_LINE_PROTO): View(NUX_FILE_LINE_PARAM) {}
+ virtual ~TmpView() {}
 
 virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw) {}
 virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw)
@@ -72,6 +73,7 @@ public:
 , write_alpha_(write_alpha)
 , rop_(ROP)
 {}
+ virtual ~TrackProgressLayer() {}
 
 virtual void Renderlayer(nux::GraphicsEngine& graphics_engine)
 {
@@ -269,7 +271,7 @@ void Track::SetupViews()
 
 mouse_enter.connect(sigc::mem_fun(this, &Track::OnTrackControlMouseEnter));
 mouse_leave.connect(sigc::mem_fun(this, &Track::OnTrackControlMouseLeave));
- mouse_click.connect([&](int, int, unsigned long, unsigned long)
+ mouse_click.connect([this](int, int, unsigned long, unsigned long)
 {
 switch (play_state_)
 {