From 4b17654be5d25caac50b321a00a45a050a9a28ad Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Mon, 24 Jul 2017 17:57:32 +1100 Subject: [PATCH] GUI2/CanvasL fixup 4ed729cf9c (use initializer list for move ctor) --- src/gui/core/canvas.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/gui/core/canvas.cpp b/src/gui/core/canvas.cpp index 0ad918481c03e..3eebd1d2b543e 100644 --- a/src/gui/core/canvas.cpp +++ b/src/gui/core/canvas.cpp @@ -1379,24 +1379,25 @@ canvas::canvas() { } -canvas::~canvas() +canvas::canvas(canvas&& c) + : shapes_(std::move(c.shapes_)) + , draw_func_(c.draw_func_) + , blur_depth_(c.blur_depth_) + , w_(c.w_) + , h_(c.h_) + , texture_(std::move(c.texture_)) + , renderer_(c.renderer_) + , variables_(c.variables_) + , functions_(c.functions_) + , is_dirty_(c.is_dirty_) + , size_changed_(c.size_changed_) { - SDL_SetRenderTarget(renderer_, nullptr); + c.renderer_ = nullptr; } -canvas::canvas(canvas&& c) +canvas::~canvas() { - shapes_ = std::move(c.shapes_); - draw_func_ = c.draw_func_; - blur_depth_ = c.blur_depth_; - w_ = c.w_; - h_ = c.h_; - texture_ = std::move(c.texture_); - renderer_ = c.renderer_; c.renderer_ = nullptr; - variables_ = c.variables_; - functions_ = c.functions_; - is_dirty_ = c.is_dirty_; - size_changed_ = c.size_changed_; + SDL_SetRenderTarget(renderer_, nullptr); } void canvas::draw(const bool force)