Use Qt's undo system instead of 3rdparty/qt-undo

Avoids a dependency, at least while QtWidgets is used anyway.
mitchcurtis · Apr 5, 2018 · cde31ef · cde31ef
1 parent b9cdf97
commit cde31ef
Show file tree

Hide file tree

Showing 71 changed files with 198 additions and 251 deletions.
diff --git a/3rdparty/3rdparty.pro b/3rdparty/3rdparty.pro
@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    pickawinner \
-    qt-undo
+    pickawinner
diff --git a/3rdparty/qt-undo b/3rdparty/qt-undo
diff --git a/README.md b/README.md
@@ -32,7 +32,6 @@ See the [releases](https://github.com/mitchcurtis/slate/releases) page for the a
 ### Dependencies ###
 
 * Qt >= 5.11
-* https://github.com/mitchcurtis/qt-undo
 * https://github.com/mitchcurtis/pickawinner
 
 ### Cloning ###
@@ -41,7 +40,7 @@ See the [releases](https://github.com/mitchcurtis/slate/releases) page for the a
 
 ### Building ###
 
-qt-undo and pickawinner can be cloned and built separately, but they are also available as submodules of Slate's repo, and can therefore be built automatically when
+pickawinner can be cloned and built separately, but it is also available as a submodule of Slate's repo, and can therefore be built automatically when
 Slate is built, by first running the following commands:
 
     cd /path/to/slate-source-dir

diff --git a/app/addguidecommand.cpp b/app/addguidecommand.cpp
@@ -25,8 +25,8 @@
 
 Q_LOGGING_CATEGORY(lcAddGuideCommand, "app.undo.addGuideCommand")
 
-AddGuideCommand::AddGuideCommand(Project *project, const Guide &guide, UndoCommand *parent) :
-    UndoCommand(parent),
+AddGuideCommand::AddGuideCommand(Project *project, const Guide &guide, QUndoCommand *parent) :
+    QUndoCommand(parent),
     mProject(project),
     mGuide(guide)
 {

diff --git a/app/addguidecommand.h b/app/addguidecommand.h
@@ -21,18 +21,16 @@
 #define ADDGUIDECOMMAND_H
 
 #include <QDebug>
-#include <QtUndo/undocommand.h>
+#include <QUndoCommand>
 
 #include "guide.h"
 
 class Project;
 
-class AddGuideCommand : public UndoCommand
+class AddGuideCommand : public QUndoCommand
 {
-    Q_OBJECT
-
 public:
-    AddGuideCommand(Project *project, const Guide &guide, UndoCommand *parent = nullptr);
+    AddGuideCommand(Project *project, const Guide &guide, QUndoCommand *parent = nullptr);
 
     void undo() override;
     void redo() override;

diff --git a/app/addlayercommand.cpp b/app/addlayercommand.cpp
@@ -26,11 +26,12 @@
 
 Q_LOGGING_CATEGORY(lcAddLayerCommand, "app.undo.addLayerCommand")
 
-AddLayerCommand::AddLayerCommand(LayeredImageProject *project, ImageLayer *layer, int index, UndoCommand *parent) :
-    UndoCommand(parent),
+AddLayerCommand::AddLayerCommand(LayeredImageProject *project, ImageLayer *layer, int index, QUndoCommand *parent) :
+    QUndoCommand(parent),
     mProject(project),
     mIndex(index),
-    mLayer(layer)
+    mLayer(layer),
+    mLayerGuard(layer)
 {
     qCDebug(lcAddLayerCommand) << "constructed" << this;
 }
@@ -39,14 +40,16 @@ void AddLayerCommand::undo()
 {
     qCDebug(lcAddLayerCommand) << "undoing" << this;
     mProject->takeLayer(mIndex);
+
     // Prevent leaks.
-    mLayer->setParent(this);
+    Q_ASSERT(mLayerGuard.isNull());
+    mLayerGuard.reset(mLayer);
 }
 
 void AddLayerCommand::redo()
 {
     qCDebug(lcAddLayerCommand) << "redoing" << this;
-    mProject->addLayer(mLayer, mIndex);
+    mProject->addLayer(mLayerGuard.take(), mIndex);
 }
 
 int AddLayerCommand::id() const

diff --git a/app/addlayercommand.h b/app/addlayercommand.h
@@ -21,17 +21,16 @@
 #define ADDLAYERCOMMAND_H
 
 #include <QDebug>
-#include <QtUndo/undocommand.h>
+#include <QScopedPointer>
+#include <QUndoCommand>
 
 class ImageLayer;
 class LayeredImageProject;
 
-class AddLayerCommand : public UndoCommand
+class AddLayerCommand : public QUndoCommand
 {
-    Q_OBJECT
-
 public:
-    AddLayerCommand(LayeredImageProject *project, ImageLayer *layer, int index, UndoCommand *parent = nullptr);
+    AddLayerCommand(LayeredImageProject *project, ImageLayer *layer, int index, QUndoCommand *parent = nullptr);
 
     void undo() override;
     void redo() override;
@@ -44,6 +43,7 @@ class AddLayerCommand : public UndoCommand
     LayeredImageProject *mProject;
     int mIndex;
     ImageLayer *mLayer;
+    QScopedPointer<ImageLayer> mLayerGuard;
 };
 
 

diff --git a/app/app.pri b/app/app.pri
@@ -1,4 +1,4 @@
-QT += widgets qml quick undo
+QT += widgets qml quick
 CONFIG += c++11
 
 INCLUDEPATH += $$PWD

diff --git a/app/application.cpp b/app/application.cpp
@@ -22,6 +22,7 @@
 #include <QApplication>
 #include <QFontDatabase>
 #include <QLoggingCategory>
+#include <QUndoStack>
 
 #include "canvaspane.h"
 #include "filevalidator.h"
@@ -101,9 +102,13 @@ Application::Application(int &argc, char **argv, const QString &applicationName)
     qRegisterMetaType<ApplicationSettings*>();
     qRegisterMetaType<ImageLayer*>();
     qRegisterMetaType<Project::Type>();
+
+    // For some reason, only when debugging, I get
+    // QMetaProperty::read: Unable to handle unregistered datatype 'QUndoStack*' for property 'Project_QML_108::undoStack'
+    // if I don't do this.
+    qRegisterMetaType<QUndoStack*>();
     qRegisterMetaType<Tile*>();
     qRegisterMetaType<Tileset*>();
-    qRegisterMetaType<UndoStack*>();
 
     if (QFontDatabase::addApplicationFont(":/fonts/FontAwesome.otf") == -1) {
         qWarning() << "Failed to load FontAwesome font";

diff --git a/app/applygreedypixelfillcommand.cpp b/app/applygreedypixelfillcommand.cpp
@@ -27,8 +27,8 @@
 Q_LOGGING_CATEGORY(lcApplyGreedyPixelFillCommand, "app.undo.applyGreedyPixelFillCommand")
 
 ApplyGreedyPixelFillCommand::ApplyGreedyPixelFillCommand(ImageCanvas *canvas, int layerIndex, const QImage &previousImage,
-    const QImage &newImage, UndoCommand *parent) :
-    UndoCommand(parent),
+    const QImage &newImage, QUndoCommand *parent) :
+    QUndoCommand(parent),
     mCanvas(canvas),
     mLayerIndex(layerIndex),
     mPreviousImage(previousImage),

diff --git a/app/applygreedypixelfillcommand.h b/app/applygreedypixelfillcommand.h
@@ -22,17 +22,15 @@
 
 #include <QDebug>
 #include <QImage>
-#include <QtUndo/undocommand.h>
+#include <QUndoCommand>
 
 class ImageCanvas;
 
-class ApplyGreedyPixelFillCommand : public UndoCommand
+class ApplyGreedyPixelFillCommand : public QUndoCommand
 {
-    Q_OBJECT
-
 public:
     ApplyGreedyPixelFillCommand(ImageCanvas *canvas, int layerIndex,const QImage &previousImage,
-        const QImage &newImage, UndoCommand *parent = nullptr);
+        const QImage &newImage, QUndoCommand *parent = nullptr);
 
     void undo() override;
     void redo() override;

diff --git a/app/applylayeredimagepixelfillcommand.h b/app/applylayeredimagepixelfillcommand.h
@@ -28,8 +28,6 @@ class LayeredImageProject;
 
 class ApplyLayeredImagePixelFillCommand : public UndoCommand
 {
-    Q_OBJECT
-
 public:
     ApplyLayeredImagePixelFillCommand(LayeredImageProject *project, const QImage &previousImage,
         const QImage &newImage, UndoCommand *parent = nullptr);

diff --git a/app/applypixelerasercommand.cpp b/app/applypixelerasercommand.cpp
@@ -26,8 +26,8 @@
 Q_LOGGING_CATEGORY(lcApplyPixelEraserCommand, "app.undo.applyPixelEraserCommand")
 
 ApplyPixelEraserCommand::ApplyPixelEraserCommand(ImageCanvas *canvas, int layerIndex, const QVector<QPoint> &scenePositions,
-    const QVector<QColor> &previousColours, UndoCommand *parent) :
-    UndoCommand(parent),
+    const QVector<QColor> &previousColours, QUndoCommand *parent) :
+    QUndoCommand(parent),
     mCanvas(canvas),
     mLayerIndex(layerIndex)
 {
@@ -58,9 +58,9 @@ int ApplyPixelEraserCommand::id() const
     return ApplyPixelEraserCommandId;
 }
 
-bool ApplyPixelEraserCommand::mergeWith(const UndoCommand *other)
+bool ApplyPixelEraserCommand::mergeWith(const QUndoCommand *other)
 {
-    const ApplyPixelEraserCommand *otherCommand = qobject_cast<const ApplyPixelEraserCommand*>(other);
+    const ApplyPixelEraserCommand *otherCommand = dynamic_cast<const ApplyPixelEraserCommand*>(other);
     if (!otherCommand) {
         return false;
     }

diff --git a/app/applypixelerasercommand.h b/app/applypixelerasercommand.h
@@ -24,23 +24,21 @@
 #include <QDebug>
 #include <QPoint>
 #include <QVector>
-#include <QtUndo/undocommand.h>
+#include <QUndoCommand>
 
 #include "imagecanvas.h"
 
-class ApplyPixelEraserCommand : public UndoCommand
+class ApplyPixelEraserCommand : public QUndoCommand
 {
-    Q_OBJECT
-
 public:
     ApplyPixelEraserCommand(ImageCanvas *canvas, int layerIndex, const QVector<QPoint> &scenePositions, const QVector<QColor> &previousColours,
-        UndoCommand *parent = nullptr);
+        QUndoCommand *parent = nullptr);
 
     void undo() override;
     void redo() override;
 
     int id() const override;
-    bool mergeWith(const UndoCommand *other) override;
+    bool mergeWith(const QUndoCommand *other) override;
 
 private:
     friend QDebug operator<<(QDebug debug, const ApplyPixelEraserCommand *command);

diff --git a/app/applypixelfillcommand.cpp b/app/applypixelfillcommand.cpp
@@ -26,8 +26,8 @@
 Q_LOGGING_CATEGORY(lcApplyPixelFillCommand, "app.undo.applyPixelFillCommand")
 
 ApplyPixelFillCommand::ApplyPixelFillCommand(ImageCanvas *canvas, int layerIndex,
-    const QImage &previousImage, const QImage &newImage, UndoCommand *parent) :
-    UndoCommand(parent),
+    const QImage &previousImage, const QImage &newImage, QUndoCommand *parent) :
+    QUndoCommand(parent),
     mCanvas(canvas),
     mLayerIndex(layerIndex),
     mPreviousImage(previousImage),

diff --git a/app/applypixelfillcommand.h b/app/applypixelfillcommand.h
@@ -22,17 +22,15 @@
 
 #include <QDebug>
 #include <QImage>
-#include <QtUndo/undocommand.h>
+#include <QUndoCommand>
 
 class ImageCanvas;
 
-class ApplyPixelFillCommand : public UndoCommand
+class ApplyPixelFillCommand : public QUndoCommand
 {
-    Q_OBJECT
-
 public:
     ApplyPixelFillCommand(ImageCanvas *canvas, int layerIndex, const QImage &previousImage,
-        const QImage &newImage, UndoCommand *parent = nullptr);
+        const QImage &newImage, QUndoCommand *parent = nullptr);
 
     void undo() override;
     void redo() override;

diff --git a/app/applypixellinecommand.cpp b/app/applypixellinecommand.cpp
@@ -27,8 +27,8 @@ Q_LOGGING_CATEGORY(lcApplyPixelLineCommand, "app.undo.applyPixelLineCommand")
 
 ApplyPixelLineCommand::ApplyPixelLineCommand(ImageCanvas *canvas, int layerIndex, const QImage &imageWithLine,
     const QImage &imageWithoutLine, const QRect &lineRect,
-    const QPoint &newLastPixelPenReleaseScenePos, const QPoint &oldLastPixelPenReleaseScenePos, UndoCommand *parent) :
-    UndoCommand(parent),
+    const QPoint &newLastPixelPenReleaseScenePos, const QPoint &oldLastPixelPenReleaseScenePos, QUndoCommand *parent) :
+    QUndoCommand(parent),
     mCanvas(canvas),
     mLayerIndex(layerIndex),
     mImageWithLine(imageWithLine),
@@ -62,7 +62,7 @@ int ApplyPixelLineCommand::id() const
     return ApplyPixelLineCommandId;
 }
 
-bool ApplyPixelLineCommand::mergeWith(const UndoCommand *)
+bool ApplyPixelLineCommand::mergeWith(const QUndoCommand *)
 {
     return false;
 }

diff --git a/app/applypixellinecommand.h b/app/applypixellinecommand.h
@@ -22,25 +22,23 @@
 
 #include <QDebug>
 #include <QPointF>
-#include <QtUndo/undocommand.h>
+#include <QUndoCommand>
 
 #include "imagecanvas.h"
 
-class ApplyPixelLineCommand : public UndoCommand
+class ApplyPixelLineCommand : public QUndoCommand
 {
-    Q_OBJECT
-
 public:
     ApplyPixelLineCommand(ImageCanvas *canvas, int layerIndex, const QImage &imageWithLine,
         const QImage &imageWithoutLine, const QRect &lineRect, const QPoint &newLastPixelPenReleaseScenePos,
-        const QPoint &oldLastPixelPenReleaseScenePos, UndoCommand *parent = nullptr);
+        const QPoint &oldLastPixelPenReleaseScenePos, QUndoCommand *parent = nullptr);
     ~ApplyPixelLineCommand();
 
     void undo() override;
     void redo() override;
 
     int id() const override;
-    bool mergeWith(const UndoCommand *other) override;
+    bool mergeWith(const QUndoCommand *other) override;
 
 private:
     friend QDebug operator<<(QDebug debug, const ApplyPixelLineCommand *command);

diff --git a/app/applypixelpencommand.cpp b/app/applypixelpencommand.cpp
@@ -26,8 +26,8 @@
 Q_LOGGING_CATEGORY(lcApplyPixelPenCommand, "app.undo.applyPixelPenCommand")
 
 ApplyPixelPenCommand::ApplyPixelPenCommand(ImageCanvas *canvas, int layerIndex, const QVector<QPoint> &scenePositions,
-    const QVector<QColor> &previousColours, const QColor &colour, UndoCommand *parent) :
-    UndoCommand(parent),
+    const QVector<QColor> &previousColours, const QColor &colour, QUndoCommand *parent) :
+    QUndoCommand(parent),
     mCanvas(canvas),
     mLayerIndex(layerIndex),
     mColour(colour)
@@ -59,9 +59,9 @@ int ApplyPixelPenCommand::id() const
     return ApplyPixelPenCommandId;
 }
 
-bool ApplyPixelPenCommand::mergeWith(const UndoCommand *other)
+bool ApplyPixelPenCommand::mergeWith(const QUndoCommand *other)
 {
-    const ApplyPixelPenCommand *otherCommand = qobject_cast<const ApplyPixelPenCommand*>(other);
+    const ApplyPixelPenCommand *otherCommand = dynamic_cast<const ApplyPixelPenCommand*>(other);
     if (!otherCommand) {
         return false;
     }

diff --git a/app/applypixelpencommand.h b/app/applypixelpencommand.h
@@ -24,23 +24,21 @@
 #include <QDebug>
 #include <QPoint>
 #include <QVector>
-#include <QtUndo/undocommand.h>
+#include <QUndoCommand>
 
 #include "imagecanvas.h"
 
-class ApplyPixelPenCommand : public UndoCommand
+class ApplyPixelPenCommand : public QUndoCommand
 {
-    Q_OBJECT
-
 public:
     ApplyPixelPenCommand(ImageCanvas *canvas, int layerIndex, const QVector<QPoint> &scenePositions, const QVector<QColor> &previousColours,
-        const QColor &colour, UndoCommand *parent = nullptr);
+        const QColor &colour, QUndoCommand *parent = nullptr);
 
     void undo() override;
     void redo() override;
 
     int id() const override;
-    bool mergeWith(const UndoCommand *other) override;
+    bool mergeWith(const QUndoCommand *other) override;
 
 private:
     friend QDebug operator<<(QDebug debug, const ApplyPixelPenCommand *command);

diff --git a/app/applytilecanvaspixelfillcommand.cpp b/app/applytilecanvaspixelfillcommand.cpp
@@ -27,8 +27,8 @@
 Q_LOGGING_CATEGORY(lcApplyTileCanvasPixelFillCommand, "app.undo.applyTileCanvasPixelFillCommand")
 
 ApplyTileCanvasPixelFillCommand::ApplyTileCanvasPixelFillCommand(TileCanvas *canvas, const QVector<QPoint> &scenePositions,
-    const QColor &previousColour, const QColor &colour, UndoCommand *parent) :
-    UndoCommand(parent),
+    const QColor &previousColour, const QColor &colour, QUndoCommand *parent) :
+    QUndoCommand(parent),
     mCanvas(canvas),
     mColour(colour)
 {