GUI2/CanvasL fixup 4ed729c (use initializer list for move ctor)

wesnoth · Jul 26, 2017 · 4b17654 · 4b17654
1 parent a60739b
commit 4b17654
Showing 1 changed file with 15 additions and 14 deletions.
diff --git 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)