From d671470cb0d04d50a98692ccd9a6708b22b61164 Mon Sep 17 00:00:00 2001
From: garakmon <garakmon@gmail.com>
Date: Mon, 3 Aug 2020 23:55:22 -0400
Subject: [PATCH] fix PaintMetatile subclass issues

---
 include/core/editcommands.h | 18 ++++++++++--------
 src/core/editcommands.cpp   | 30 ------------------------------
 2 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/include/core/editcommands.h b/include/core/editcommands.h
index 3d455295..3743c69d 100644
--- a/include/core/editcommands.h
+++ b/include/core/editcommands.h
@@ -105,10 +105,11 @@ class BucketFillMetatile : public PaintMetatile {
 public:
     BucketFillMetatile(Map *map,
         Blockdata *oldMetatiles, Blockdata *newMetatiles,
-        unsigned actionId, QUndoCommand *parent = nullptr);
-    ~BucketFillMetatile();
+        unsigned actionId, QUndoCommand *parent = nullptr)
+      : PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
+        setText("Bucket Fill Metatiles");
+    }
 
-    bool mergeWith(const QUndoCommand *) override { return false; }
     int id() const override { return CommandId::ID_BucketFillMetatile; }
 };
 
@@ -121,7 +122,7 @@ public:
     BucketFillCollision(Map *map,
         Blockdata *oldCollision, Blockdata *newCollision,
         QUndoCommand *parent = nullptr)
-    : PaintCollision(map, oldCollision, newCollision, -1, parent) {
+      : PaintCollision(map, oldCollision, newCollision, -1, parent) {
         setText("Flood Fill Collision");
     }
 
@@ -137,11 +138,12 @@ class MagicFillMetatile : public PaintMetatile {
 public:
     MagicFillMetatile(Map *map,
         Blockdata *oldMetatiles, Blockdata *newMetatiles,
-        unsigned actionId, QUndoCommand *parent = nullptr);
-    ~MagicFillMetatile();
+        unsigned actionId, QUndoCommand *parent = nullptr)
+      : PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
+        setText("Magic Fill Metatiles");
+    }
 
-    bool mergeWith(const QUndoCommand *) override { return false; }
-    int id() const override { return CommandId::ID_BucketFillMetatile; }
+    int id() const override { return CommandId::ID_MagicFillMetatile; }
 };
 
 
diff --git a/src/core/editcommands.cpp b/src/core/editcommands.cpp
index 92486316..8259e308 100644
--- a/src/core/editcommands.cpp
+++ b/src/core/editcommands.cpp
@@ -116,36 +116,6 @@ void PaintBorder::undo() {
     QUndoCommand::undo();
 }
 
-/******************************************************************************
-    ************************************************************************
- ******************************************************************************/
-
-BucketFillMetatile::BucketFillMetatile(Map *map,
-    Blockdata *oldMetatiles, Blockdata *newMetatiles,
-    unsigned actionId, QUndoCommand *parent)
-        : PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
-    setText("Bucket Fill Metatiles");
-}
-
-BucketFillMetatile::~BucketFillMetatile() {
-    PaintMetatile::~PaintMetatile();
-}
-
-/******************************************************************************
-    ************************************************************************
- ******************************************************************************/
-
-MagicFillMetatile::MagicFillMetatile(Map *map,
-    Blockdata *oldMetatiles, Blockdata *newMetatiles,
-    unsigned actionId, QUndoCommand *parent)
-        : PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
-    setText("Magic Fill Metatiles");
-}
-
-MagicFillMetatile::~MagicFillMetatile() {
-    PaintMetatile::~PaintMetatile();
-}
-
 /******************************************************************************
     ************************************************************************
  ******************************************************************************/