SANKORE-300 / SANKORE-332 fix crash while processing undo commands with types...

SANKORE-300 / SANKORE-332 fix crash while processing undo commands with types not equal GraphicsItem

src/board/UBBoardController.cpp

@@ -66,6 +66,7 @@
 #include "UBBoardPaletteManager.h"
 
 #include "core/memcheck.h"
+//#include <typeinfo>
 
 UBBoardController::UBBoardController(UBMainWindow* mainWindow)
     : QObject(mainWindow->centralWidget())
@@ -1176,11 +1177,16 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy,
 void UBBoardController::ClearUndoStack()
 {
     QSet<QGraphicsItem*> uniqueItems;
-    QUndoStack *stack = UBApplication::undoStack;
     // go through all stack command
-    for(int i = 0; i < stack->count(); i++)
+    int count = UBApplication::undoStack->count();
+    for(int i = 0; i < UBApplication::undoStack->count(); i++)
     {
-        UBGraphicsItemUndoCommand *cmd = (UBGraphicsItemUndoCommand*)stack->command(i);
+
+        UBAbstractUndoCommand *abstractCmd = (UBAbstractUndoCommand*)UBApplication::undoStack->command(i);
+        if(abstractCmd->getType() != UBAbstractUndoCommand::undotype_GRAPHICITEM)
+            continue;
+
+        UBGraphicsItemUndoCommand *cmd = (UBGraphicsItemUndoCommand*)UBApplication::undoStack->command(i);
 
         // go through all added and removed objects, for create list of unique objects
         QSetIterator<QGraphicsItem*> itAdded(cmd->GetAddedList());
@@ -1201,7 +1207,8 @@ void UBBoardController::ClearUndoStack()
     }
 
     // clear stack, and command list
-    stack->clear();
+    UBApplication::undoStack->clear();
+    count = UBApplication::undoStack->count();
 
     // go through all unique items, and check, ot on scene, or not.
     // if not on scene, than item can be deleted

src/domain/UBAbstractUndoCommand.cpp

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "UBAbstractUndoCommand.h"
+
+UBAbstractUndoCommand::UBAbstractUndoCommand()
+{
+    // NOOP
+}
+
+UBAbstractUndoCommand::~UBAbstractUndoCommand()
+{
+    // NOOP
+}
+
+
+void UBAbstractUndoCommand::undo()
+{
+    // NOOP
+}
+
+void UBAbstractUndoCommand::redo()
+{
+    // NOOP
+}
+
+//void UBAbstractUndoCommand::UndoType getType(UndoType type);
+

src/domain/UBAbstractUndoCommand.h

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBABSTRACTUNDOCOMMAND_H_
+#define UBABSTRACTUNDOCOMMAND_H_
+
+#include <QtGui>
+
+class UBAbstractUndoCommand : public QUndoCommand
+{
+    public:
+
+        UBAbstractUndoCommand();
+        ~UBAbstractUndoCommand();
+
+        enum UndoType : int
+        {
+            undotype_UNKNOWN               = 0,
+            undotype_DOCUMENT              = 1,
+            undotype_GRAPHICITEMTRANSFORM  = 2,
+            undotype_GRAPHICITEM           = 3,
+            undotype_GRAPHICTEXTITEM       = 4,
+            undotype_PAGESIZE              = 5,
+        };
+
+        virtual UndoType getType() { return undotype_UNKNOWN; };
+
+    protected:
+        virtual void undo();
+        virtual void redo();
+
+};
+
+#endif /* UBABSTRACTUNDOCOMMAND_H_ */

src/domain/UBDocumentUndoCommand.h

@@ -17,18 +17,20 @@
 #define UBDOCUMENTUNDOCOMMAND_H_
 
 #include <QtGui>
+#include "UBAbstractUndoCommand.h"
 
 class UBDocumentProxy;
 class UBGraphicsScene;
 
-
-class UBDocumentUndoCommand: public QUndoCommand
+class UBDocumentUndoCommand: public UBAbstractUndoCommand
 {
     public:
         UBDocumentUndoCommand(UBDocumentProxy* pDocument, const QList<UBGraphicsScene*>& pOldScenes,
                 const QList<UBGraphicsScene*>& pNewScenes, const int& pActiveSceneIndex);
         virtual ~UBDocumentUndoCommand();
 
+        virtual UndoType getType() { return undotype_DOCUMENT; };
+
     protected:
 
         virtual void undo();

src/domain/UBGraphicsItemTransformUndoCommand.h

@@ -19,9 +19,10 @@
 #include <QtGui>
 
 #include "UBResizableGraphicsItem.h"
+#include "UBAbstractUndoCommand.h"
 
 
-class UBGraphicsItemTransformUndoCommand : public QUndoCommand
+class UBGraphicsItemTransformUndoCommand : public UBAbstractUndoCommand
 {
     public:
         UBGraphicsItemTransformUndoCommand(QGraphicsItem* pItem,
@@ -31,6 +32,8 @@ class UBGraphicsItemTransformUndoCommand : public QUndoCommand
                                                 const QSizeF& prevSize = QSizeF());
         virtual ~UBGraphicsItemTransformUndoCommand();
 
+        virtual UndoType getType() { return undotype_GRAPHICITEMTRANSFORM; };
+
     protected:
         virtual void undo();
         virtual void redo();

src/domain/UBGraphicsItemUndoCommand.h

@@ -17,11 +17,13 @@
 #define UBGRAPHICSITEMUNDOCOMMAND_H_
 
 #include <QtGui>
+#include "UBAbstractUndoCommand.h"
+
 
 class UBGraphicsScene;
 
 
-class UBGraphicsItemUndoCommand : public QUndoCommand
+class UBGraphicsItemUndoCommand : public UBAbstractUndoCommand
 {
     public:
         UBGraphicsItemUndoCommand(UBGraphicsScene* pScene, const QSet<QGraphicsItem*>& pRemovedItems,
@@ -35,6 +37,8 @@ class UBGraphicsItemUndoCommand : public QUndoCommand
         QSet<QGraphicsItem*> GetAddedList() { return mAddedItems; };
         QSet<QGraphicsItem*> GetRemovedList() { return mRemovedItems; };
 
+        virtual UndoType getType() { return undotype_GRAPHICITEM; };
+
     protected:
         virtual void undo();
         virtual void redo();

src/domain/UBGraphicsTextItemUndoCommand.h

@@ -17,16 +17,19 @@
 #define UBGRAPHICSTEXTITEMUNDOCOMMAND_H_
 
 #include <QtGui>
+#include "UBAbstractUndoCommand.h"
 
 #include "UBGraphicsTextItem.h"
 
 
-class UBGraphicsTextItemUndoCommand: public QUndoCommand
+class UBGraphicsTextItemUndoCommand : public UBAbstractUndoCommand
 {
     public:
         UBGraphicsTextItemUndoCommand(UBGraphicsTextItem *textItem);
         virtual ~UBGraphicsTextItemUndoCommand();
 
+        virtual UndoType getType() { return undotype_GRAPHICTEXTITEM; };
+
     protected:
         virtual void undo();
         virtual void redo();

src/domain/UBPageSizeUndoCommand.h

@@ -17,16 +17,19 @@
 #define UBPageSizeUndoCommand_H_
 
 #include <QtGui>
+#include "UBAbstractUndoCommand.h"
 
 class UBGraphicsScene;
 
 
-class UBPageSizeUndoCommand : public QUndoCommand
+class UBPageSizeUndoCommand : public UBAbstractUndoCommand
 {
     public:
         UBPageSizeUndoCommand(UBGraphicsScene* pScene, const QSize& previousSize, const QSize& newSize);
         virtual ~UBPageSizeUndoCommand();
 
+        virtual UndoType getType() { return undotype_PAGESIZE; };
+
     protected:
         virtual void undo();
         virtual void redo();