From e0a017ae029a8173cefb1a319e4b194539deb1c4 Mon Sep 17 00:00:00 2001 From: David Capello Date: Wed, 30 Nov 2016 12:33:05 -0300 Subject: [PATCH] Remove some unnecessary destructors --- src/app/ui/editor/moving_cel_state.cpp | 4 ---- src/app/ui/editor/moving_cel_state.h | 3 +-- src/app/ui/editor/moving_symmetry_state.cpp | 6 +----- src/app/ui/editor/moving_symmetry_state.h | 1 - src/app/ui/editor/scrolling_state.cpp | 6 +----- src/app/ui/editor/scrolling_state.h | 3 +-- src/app/ui/editor/zooming_state.cpp | 6 +----- src/app/ui/editor/zooming_state.h | 3 +-- 8 files changed, 6 insertions(+), 26 deletions(-) diff --git a/src/app/ui/editor/moving_cel_state.cpp b/src/app/ui/editor/moving_cel_state.cpp index ad77ecbf3..3a0c2abd1 100644 --- a/src/app/ui/editor/moving_cel_state.cpp +++ b/src/app/ui/editor/moving_cel_state.cpp @@ -71,10 +71,6 @@ MovingCelState::MovingCelState(Editor* editor, MouseMessage* msg) } } -MovingCelState::~MovingCelState() -{ -} - bool MovingCelState::onMouseUp(Editor* editor, MouseMessage* msg) { Document* document = editor->document(); diff --git a/src/app/ui/editor/moving_cel_state.h b/src/app/ui/editor/moving_cel_state.h index cbb54be68..2a8b3940a 100644 --- a/src/app/ui/editor/moving_cel_state.h +++ b/src/app/ui/editor/moving_cel_state.h @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -25,7 +25,6 @@ namespace app { class MovingCelState : public StandbyState { public: MovingCelState(Editor* editor, ui::MouseMessage* msg); - virtual ~MovingCelState(); virtual bool onMouseUp(Editor* editor, ui::MouseMessage* msg) override; virtual bool onMouseMove(Editor* editor, ui::MouseMessage* msg) override; diff --git a/src/app/ui/editor/moving_symmetry_state.cpp b/src/app/ui/editor/moving_symmetry_state.cpp index fe7f37ff1..d8834c871 100644 --- a/src/app/ui/editor/moving_symmetry_state.cpp +++ b/src/app/ui/editor/moving_symmetry_state.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2015 David Capello +// Copyright (C) 2015-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -29,10 +29,6 @@ MovingSymmetryState::MovingSymmetryState(Editor* editor, MouseMessage* msg, editor->captureMouse(); } -MovingSymmetryState::~MovingSymmetryState() -{ -} - bool MovingSymmetryState::onMouseUp(Editor* editor, MouseMessage* msg) { editor->backToPreviousState(); diff --git a/src/app/ui/editor/moving_symmetry_state.h b/src/app/ui/editor/moving_symmetry_state.h index c9866c23c..3cfc7bb98 100644 --- a/src/app/ui/editor/moving_symmetry_state.h +++ b/src/app/ui/editor/moving_symmetry_state.h @@ -19,7 +19,6 @@ namespace app { MovingSymmetryState(Editor* editor, ui::MouseMessage* msg, app::gen::SymmetryMode mode, Option& symmetryAxis); - virtual ~MovingSymmetryState(); virtual bool onMouseUp(Editor* editor, ui::MouseMessage* msg) override; virtual bool onMouseMove(Editor* editor, ui::MouseMessage* msg) override; diff --git a/src/app/ui/editor/scrolling_state.cpp b/src/app/ui/editor/scrolling_state.cpp index 306f7ae68..15eed6db3 100644 --- a/src/app/ui/editor/scrolling_state.cpp +++ b/src/app/ui/editor/scrolling_state.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -27,10 +27,6 @@ ScrollingState::ScrollingState() { } -ScrollingState::~ScrollingState() -{ -} - bool ScrollingState::onMouseDown(Editor* editor, MouseMessage* msg) { m_oldPos = msg->position(); diff --git a/src/app/ui/editor/scrolling_state.h b/src/app/ui/editor/scrolling_state.h index 38e13b1c6..73a3f7565 100644 --- a/src/app/ui/editor/scrolling_state.h +++ b/src/app/ui/editor/scrolling_state.h @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -16,7 +16,6 @@ namespace app { class ScrollingState : public EditorState { public: ScrollingState(); - virtual ~ScrollingState(); virtual bool isTemporalState() const override { return true; } virtual bool onMouseDown(Editor* editor, ui::MouseMessage* msg) override; virtual bool onMouseUp(Editor* editor, ui::MouseMessage* msg) override; diff --git a/src/app/ui/editor/zooming_state.cpp b/src/app/ui/editor/zooming_state.cpp index c72ea7c55..c8a3ffdc1 100644 --- a/src/app/ui/editor/zooming_state.cpp +++ b/src/app/ui/editor/zooming_state.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -34,10 +34,6 @@ ZoomingState::ZoomingState() { } -ZoomingState::~ZoomingState() -{ -} - bool ZoomingState::onMouseDown(Editor* editor, MouseMessage* msg) { m_startPos = msg->position(); diff --git a/src/app/ui/editor/zooming_state.h b/src/app/ui/editor/zooming_state.h index d5ddd7758..900ce6ea4 100644 --- a/src/app/ui/editor/zooming_state.h +++ b/src/app/ui/editor/zooming_state.h @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -17,7 +17,6 @@ namespace app { class ZoomingState : public EditorState { public: ZoomingState(); - virtual ~ZoomingState(); virtual bool isTemporalState() const override { return true; } virtual bool onMouseDown(Editor* editor, ui::MouseMessage* msg) override; virtual bool onMouseUp(Editor* editor, ui::MouseMessage* msg) override;