Begin refactoring Blockdata to simply inherit QVector<Block>

include/core/block.h

@@ -12,12 +12,12 @@ public:
     Block(uint16_t tile, uint16_t collision, uint16_t elevation);
     Block(const Block &);
     Block &operator=(const Block &);
-    bool operator ==(Block);
-    bool operator !=(Block);
+    bool operator ==(Block) const;
+    bool operator !=(Block) const;
     uint16_t tile:10;
     uint16_t collision:2;
     uint16_t elevation:4;
-    uint16_t rawValue();
+    uint16_t rawValue() const;
 };
 
 #endif // BLOCK_H

include/core/blockdata.h

@@ -4,31 +4,13 @@
 
 #include "block.h"
 
-#include <QObject>
 #include <QByteArray>
 #include <QVector>
 
-class Blockdata : public QObject
+class Blockdata : public QVector<Block>
 {
-    Q_OBJECT
 public:
-    explicit Blockdata(QObject *parent = nullptr);
-    ~Blockdata() {
-        if (blocks) delete blocks;
-    }
-
-public:
-    QVector<Block> *blocks = nullptr;
-    void addBlock(uint16_t);
-    void addBlock(Block);
     QByteArray serialize();
-    void copyFrom(Blockdata*);
-    Blockdata* copy();
-    bool equals(Blockdata *);
-
-signals:
-
-public slots:
 };
 
 #endif // BLOCKDATA_H

include/core/editcommands.h

@@ -2,6 +2,8 @@
 #ifndef EDITCOMMANDS_H
 #define EDITCOMMANDS_H
 
+#include "blockdata.h"
+
 #include <QUndoCommand>
 #include <QList>
 
@@ -41,9 +43,8 @@ enum CommandId {
 class PaintMetatile : public QUndoCommand {
 public:
     PaintMetatile(Map *map,
-        Blockdata *oldMetatiles, Blockdata *newMetatiles,
+        const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         unsigned actionId, QUndoCommand *parent = nullptr);
-    virtual ~PaintMetatile();
 
     void undo() override;
     void redo() override;
@@ -54,8 +55,8 @@ public:
 private:
     Map *map;
 
-    Blockdata *newMetatiles;
-    Blockdata *oldMetatiles;
+    Blockdata newMetatiles;
+    Blockdata oldMetatiles;
 
     unsigned actionId;
 };
@@ -67,7 +68,7 @@ private:
 class PaintCollision : public PaintMetatile {
 public:
     PaintCollision(Map *map,
-        Blockdata *oldCollision, Blockdata *newCollision,
+        const Blockdata &oldCollision, const Blockdata &newCollision,
         unsigned actionId, QUndoCommand *parent = nullptr)
     : PaintMetatile(map, oldCollision, newCollision, actionId, parent) {
         setText("Paint Collision");
@@ -82,9 +83,8 @@ public:
 class PaintBorder : public QUndoCommand {
 public:
     PaintBorder(Map *map,
-        Blockdata *oldBorder, Blockdata *newBorder,
+        const Blockdata &oldBorder, const Blockdata &newBorder,
         unsigned actionId, QUndoCommand *parent = nullptr);
-    ~PaintBorder();
 
     void undo() override;
     void redo() override;
@@ -95,8 +95,8 @@ public:
 private:
     Map *map;
 
-    Blockdata *newBorder;
-    Blockdata *oldBorder;
+    Blockdata newBorder;
+    Blockdata oldBorder;
 
     unsigned actionId;
 };
@@ -108,7 +108,7 @@ private:
 class BucketFillMetatile : public PaintMetatile {
 public:
     BucketFillMetatile(Map *map,
-        Blockdata *oldMetatiles, Blockdata *newMetatiles,
+        const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         unsigned actionId, QUndoCommand *parent = nullptr)
       : PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
         setText("Bucket Fill Metatiles");
@@ -124,7 +124,7 @@ public:
 class BucketFillCollision : public PaintCollision {
 public:
     BucketFillCollision(Map *map,
-        Blockdata *oldCollision, Blockdata *newCollision,
+        const Blockdata &oldCollision, const Blockdata &newCollision,
         QUndoCommand *parent = nullptr)
       : PaintCollision(map, oldCollision, newCollision, -1, parent) {
         setText("Flood Fill Collision");
@@ -141,7 +141,7 @@ public:
 class MagicFillMetatile : public PaintMetatile {
 public:
     MagicFillMetatile(Map *map,
-        Blockdata *oldMetatiles, Blockdata *newMetatiles,
+        const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         unsigned actionId, QUndoCommand *parent = nullptr)
       : PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
         setText("Magic Fill Metatiles");
@@ -156,7 +156,7 @@ public:
 class MagicFillCollision : public PaintCollision {
 public:
     MagicFillCollision(Map *map,
-        Blockdata *oldCollision, Blockdata *newCollision,
+        const Blockdata &oldCollision, const Blockdata &newCollision,
         QUndoCommand *parent = nullptr)
     : PaintCollision(map, oldCollision, newCollision, -1, parent) {
         setText("Magic Fill Collision");
@@ -172,9 +172,8 @@ public:
 class ShiftMetatiles : public QUndoCommand {
 public:
     ShiftMetatiles(Map *map,
-        Blockdata *oldMetatiles, Blockdata *newMetatiles,
+        const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         unsigned actionId, QUndoCommand *parent = nullptr);
-    ~ShiftMetatiles();
 
     void undo() override;
     void redo() override;
@@ -185,8 +184,8 @@ public:
 private:
     Map *map;
 
-    Blockdata *newMetatiles;
-    Blockdata *oldMetatiles;
+    Blockdata newMetatiles;
+    Blockdata oldMetatiles;
 
     unsigned actionId;
 };
@@ -197,11 +196,10 @@ private:
 class ResizeMap : public QUndoCommand {
 public:
     ResizeMap(Map *map, QSize oldMapDimensions, QSize newMapDimensions,
-        Blockdata *oldMetatiles, Blockdata *newMetatiles,
+        const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         QSize oldBorderDimensions, QSize newBorderDimensions,
-        Blockdata *oldBorder, Blockdata *newBorder,
+        const Blockdata &oldBorder, const Blockdata &newBorder,
         QUndoCommand *parent = nullptr);
-    ~ResizeMap();
 
     void undo() override;
     void redo() override;
@@ -222,11 +220,11 @@ private:
     int newBorderWidth;
     int newBorderHeight;
 
-    Blockdata *newMetatiles;
-    Blockdata *oldMetatiles;
+    Blockdata newMetatiles;
+    Blockdata oldMetatiles;
 
-    Blockdata *newBorder;
-    Blockdata *oldBorder;
+    Blockdata newBorder;
+    Blockdata oldBorder;
 };
 
 
@@ -238,7 +236,6 @@ public:
     EventMove(QList<Event *> events,
         int deltaX, int deltaY, unsigned actionId,
         QUndoCommand *parent = nullptr);
-    ~EventMove();
 
     void undo() override;
     void redo() override;
@@ -262,7 +259,6 @@ public:
     EventShift(QList<Event *> events,
         int deltaX, int deltaY, unsigned actionId,
         QUndoCommand *parent = nullptr);
-    ~EventShift();
     int id() const override;
 private:
     QList<Event *> events;
@@ -276,7 +272,6 @@ class EventCreate : public QUndoCommand {
 public:
     EventCreate(Editor *editor, Map *map, Event *event,
         QUndoCommand *parent = nullptr);
-    ~EventCreate();
 
     void undo() override;
     void redo() override;
@@ -299,7 +294,6 @@ public:
     EventDelete(Editor *editor, Map *map,
         QList<Event *> selectedEvents, Event *nextSelectedEvent,
         QUndoCommand *parent = nullptr);
-    ~EventDelete();
 
     void undo() override;
     void redo() override;
@@ -321,7 +315,6 @@ class EventDuplicate : public QUndoCommand {
 public:
     EventDuplicate(Editor *editor, Map *map, QList<Event *> selectedEvents,
         QUndoCommand *parent = nullptr);
-    ~EventDuplicate();
 
     void undo() override;
     void redo() override;
@@ -343,9 +336,8 @@ class ScriptEditMap : public QUndoCommand {
 public:
     ScriptEditMap(Map *map,
         QSize oldMapDimensions, QSize newMapDimensions,
-        Blockdata *oldMetatiles, Blockdata *newMetatiles,
+        const Blockdata &oldMetatiles, const Blockdata &newMetatiles,
         QUndoCommand *parent = nullptr);
-    ~ScriptEditMap();
 
     void undo() override;
     void redo() override;
@@ -356,8 +348,8 @@ public:
 private:
     Map *map;
 
-    Blockdata *newMetatiles;
-    Blockdata *oldMetatiles;
+    Blockdata newMetatiles;
+    Blockdata oldMetatiles;
 
     int oldMapWidth;
     int oldMapHeight;