Merge with trunk

(bzr r3506.6.16)

4 files changed, 15 insertions, 15 deletions

diff --git a/hud/HudButton.cpp b/hud/HudButton.cpp
index bc709d041..ace27e0d1 100644
--- a/hud/HudButton.cpp
+++ b/hud/HudButton.cpp
@@ -64,28 +64,28 @@ HudButton::HudButton(NUX_FILE_LINE_DECL)
 
 InitTheme();
 
- key_nav_focus_change.connect([&](nux::Area*, bool, nux::KeyNavDirection)
+ key_nav_focus_change.connect([this](nux::Area*, bool, nux::KeyNavDirection)
 {
 QueueDraw();
 });
 
- fake_focused.changed.connect([&](bool)
+ fake_focused.changed.connect([this](bool)
 {
 QueueDraw();
 });
 
- mouse_move.connect([&](int x, int y, int dx, int dy, unsigned int button, unsigned int key)
+ mouse_move.connect([this](int x, int y, int dx, int dy, unsigned int button, unsigned int key)
 {
 if (!fake_focused)
 fake_focused = true;
 });
 
- mouse_enter.connect([&](int x, int y, unsigned int button, unsigned int key)
+ mouse_enter.connect([this](int x, int y, unsigned int button, unsigned int key)
 {
 fake_focused = true;
 });
 
- mouse_leave.connect([&](int x, int y, unsigned int button, unsigned int key)
+ mouse_leave.connect([this](int x, int y, unsigned int button, unsigned int key)
 {
 fake_focused = false;
 });
@@ -93,7 +93,7 @@ HudButton::HudButton(NUX_FILE_LINE_DECL)
 
 void HudButton::InitTheme()
 {
- is_rounded.changed.connect([&](bool)
+ is_rounded.changed.connect([this](bool)
 {
 nux::Geometry const& geo = GetGeometry();
 prelight_->Invalidate(geo);
diff --git a/hud/HudIconTextureSource.h b/hud/HudIconTextureSource.h
index 8f24ef1b1..19f4593e9 100644
--- a/hud/HudIconTextureSource.h
+++ b/hud/HudIconTextureSource.h
@@ -32,7 +32,7 @@ class HudIconTextureSource : public unity::ui::IconTextureSource
 {
 public:
 HudIconTextureSource(nux::ObjectPtr<nux::BaseTexture> texture);
- ~HudIconTextureSource();
+ virtual ~HudIconTextureSource();
 
 virtual nux::Color BackgroundColor() const;
 virtual nux::BaseTexture* TextureForSize(int size);
diff --git a/hud/HudView.cpp b/hud/HudView.cpp
index caf449073..e7a78ce1c 100644
--- a/hud/HudView.cpp
+++ b/hud/HudView.cpp
@@ -82,7 +82,7 @@ View::View()
 search_bar_->text_entry()->SetLoseKeyFocusOnKeyNavDirectionUp(false);
 search_bar_->text_entry()->SetLoseKeyFocusOnKeyNavDirectionDown(false);
 
- search_bar_->text_entry()->key_nav_focus_change.connect([&](nux::Area *area, bool receiving, nux::KeyNavDirection direction)
+ search_bar_->text_entry()->key_nav_focus_change.connect([this](nux::Area *area, bool receiving, nux::KeyNavDirection direction)
 {
 // We get here when the Hud closes.
 // The TextEntry should always have the keyboard focus as long as the hud is open.
@@ -238,7 +238,7 @@ void View::SetQueries(Hud::Queries queries)
 
 button_views_->AddView(button.GetPointer(), 0, nux::MINOR_POSITION_START);
 
- button->click.connect([&](nux::View* view) {
+ button->click.connect([this](nux::View* view) {
 query_activated.emit(dynamic_cast<HudButton*>(view)->GetQuery());
 });
 
@@ -389,7 +389,7 @@ void View::SetupViews()
 content_layout_->AddLayout(button_views_.GetPointer(), 1, nux::MINOR_POSITION_START);
 }
 
- content_layout_->geometry_changed.connect([&](nux::Area*, nux::Geometry& geo)
+ content_layout_->geometry_changed.connect([this](nux::Area*, nux::Geometry& geo)
 {
 if (!timeline_animating_)
 {
diff --git a/hud/StandaloneHud.cpp b/hud/StandaloneHud.cpp
index 33fbe1063..1c4c24434 100644
--- a/hud/StandaloneHud.cpp
+++ b/hud/StandaloneHud.cpp
@@ -72,7 +72,7 @@ void TestRunner::Init ()
 nux::GetWindowThread()->SetLayout (layout);
 
 // things the controller normally does
- hud_service_.queries_updated.connect([&] (unity::hud::Hud::Queries queries) {
+ hud_service_.queries_updated.connect([this] (unity::hud::Hud::Queries queries) {
 hud_view_->SetQueries(queries);
 std::string icon_name = "";
 for (auto query = queries.begin(); query != queries.end(); query++)
@@ -89,19 +89,19 @@ void TestRunner::Init ()
 
 });
 
- hud_view_->query_activated.connect([&] (unity::hud::Query::Ptr query) {
+ hud_view_->query_activated.connect([this] (unity::hud::Query::Ptr query) {
 hud_service_.ExecuteQuery(query, 0);
 }); 
 
- hud_view_->query_selected.connect([&] (unity::hud::Query::Ptr query) {
+ hud_view_->query_selected.connect([this] (unity::hud::Query::Ptr query) {
 hud_view_->SetIcon(query->icon_name, 42, 52, 0);
 });
 
- hud_view_->search_changed.connect([&] (std::string search_string) {
+ hud_view_->search_changed.connect([this] (std::string search_string) {
 hud_service_.RequestQuery(search_string);
 });
 
- hud_view_->search_activated.connect([&] (std::string search_string) {
+ hud_view_->search_activated.connect([this] (std::string search_string) {
 hud_service_.ExecuteQueryBySearch(search_string, 0);
 });