Merging with trunk

(bzr r3347.5.23)

4 files changed, 6 insertions, 6 deletions

diff --git a/panel/PanelController.cpp b/panel/PanelController.cpp
index df3cac6b4..c97e574fa 100644
--- a/panel/PanelController.cpp
+++ b/panel/PanelController.cpp
@@ -288,7 +288,7 @@ Controller::Controller(ui::EdgeBarrierController::Ptr const& edge_barriers)
 screen->changed.connect(sigc::mem_fun(this, &Controller::OnScreenChanged));
 OnScreenChanged(screen->GetPrimaryMonitor(), screen->GetMonitors());
 
- launcher_width.changed.connect([&] (int width)
+ launcher_width.changed.connect([this] (int width)
 {
 pimpl->SetLauncherWidth(width);
 });
diff --git a/panel/PanelMenuView.cpp b/panel/PanelMenuView.cpp
index e02a312fa..7417b945d 100644
--- a/panel/PanelMenuView.cpp
+++ b/panel/PanelMenuView.cpp
@@ -90,7 +90,7 @@ PanelMenuView::PanelMenuView()
 SetupWindowManagerSignals();
 SetupUBusManagerInterests();
 
- style_changed_connection_ = panel::Style::Instance().changed.connect([&] {
+ style_changed_connection_ = panel::Style::Instance().changed.connect([this] {
 window_buttons_->ComputeContentSize();
 layout_->SetLeftAndRightPadding(window_buttons_->GetContentWidth(), 0);
 
diff --git a/panel/PanelTitlebarGrabAreaView.cpp b/panel/PanelTitlebarGrabAreaView.cpp
index b072d4b05..c537a97ee 100644
--- a/panel/PanelTitlebarGrabAreaView.cpp
+++ b/panel/PanelTitlebarGrabAreaView.cpp
@@ -49,7 +49,7 @@ PanelTitlebarGrabArea::PanelTitlebarGrabArea()
 mouse_up.connect(sigc::mem_fun(this, &PanelTitlebarGrabArea::OnMouseUp));
 mouse_drag.connect(sigc::mem_fun(this, &PanelTitlebarGrabArea::OnGrabMove));
 
- mouse_double_click.connect([&] (int x, int y, unsigned long button_flags, unsigned long)
+ mouse_double_click.connect([this] (int x, int y, unsigned long button_flags, unsigned long)
 {
 if (nux::GetEventButton(button_flags) == 1)
 restore_request.emit(x, y);
@@ -102,7 +102,7 @@ void PanelTitlebarGrabArea::OnMouseDown(int x, int y, unsigned long button_flags
 mouse_down_point_.y = y;
 
 mouse_down_timer_.reset(new glib::Timeout(MOUSE_DOWN_TIMEOUT));
- mouse_down_timer_->Run([&] () {
+ mouse_down_timer_->Run([this] () {
 if (!grab_started_)
 {
 nux::Point const& mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
diff --git a/panel/PanelView.cpp b/panel/PanelView.cpp
index aeaec9d7f..69231eb3b 100644
--- a/panel/PanelView.cpp
+++ b/panel/PanelView.cpp
@@ -119,7 +119,7 @@ PanelView::PanelView(MockableBaseWindow* parent, indicator::DBusIndicators::Ptr
 
 ubus_manager_.RegisterInterest(UBUS_OVERLAY_HIDDEN, sigc::mem_fun(this, &PanelView::OnOverlayHidden));
 ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, sigc::mem_fun(this, &PanelView::OnOverlayShown));
- ubus_manager_.RegisterInterest(UBUS_DASH_SIZE_CHANGED, [&] (GVariant *data) {
+ ubus_manager_.RegisterInterest(UBUS_DASH_SIZE_CHANGED, [this] (GVariant *data) {
 int width, height;
 g_variant_get(data, "(ii)", &width, &height);
 stored_dash_width_ = width;
@@ -707,7 +707,7 @@ void PanelView::SetOpacityMaximizedToggle(bool enabled)
 if (enabled)
 {
 WindowManager& win_manager = WindowManager::Default();
- auto update_bg_lambda = [&](guint32) { ForceUpdateBackground(); };
+ auto update_bg_lambda = [this](guint32) { ForceUpdateBackground(); };
 auto conn = &maximized_opacity_toggle_connections_;
 
 conn->Add(win_manager.window_minimized.connect(update_bg_lambda));