Switched to ref handling for undo / red pages

src/undo/GroupUndoAction.cpp

@@ -26,18 +26,23 @@ void GroupUndoAction::addAction(UndoAction* action)
 	actions.push_back(action);
 }
 
-vector<XojPage*> GroupUndoAction::getPages()
+vector<PageRef> GroupUndoAction::getPages()
 {
 	XOJ_CHECK_TYPE(GroupUndoAction);
 
-	vector<XojPage*> pages;
+	vector<PageRef> pages;
 
 	for (UndoAction* a : actions)
 	{
-		for (XojPage* addPage : a->getPages())
+		for (PageRef addPage : a->getPages())
 		{
+			if (!addPage.isValid())
+			{
+				continue;
+			}
+
 			bool pageAlreadyInTheList = false;
-			for (XojPage* p : pages)
+			for (PageRef p : pages)
 			{
 				if (addPage == p)
 				{

src/undo/GroupUndoAction.h

@@ -14,9 +14,6 @@
 #include "UndoAction.h"
 #include <XournalType.h>
 
-#include <vector>
-using std::vector;
-
 class GroupUndoAction : public UndoAction
 {
 public:
@@ -29,7 +26,7 @@ public:
 	/**
 	 * Get the affected pages
 	 */
-	virtual vector<XojPage*> getPages();
+	virtual vector<PageRef> getPages();
 
 	virtual bool undo(Control* control);
 	virtual bool redo(Control* control);

src/undo/MoveUndoAction.cpp

@@ -117,11 +117,11 @@ void MoveUndoAction::repaint()
 	}
 }
 
-vector<XojPage*> MoveUndoAction::getPages()
+vector<PageRef> MoveUndoAction::getPages()
 {
 	XOJ_CHECK_TYPE(MoveUndoAction);
 
-	vector<XojPage*> pages;
+	vector<PageRef> pages;
 	pages.push_back(this->page);
 	pages.push_back(this->targetPage);
 	return pages;

src/undo/MoveUndoAction.h

@@ -27,7 +27,7 @@ public:
 public:
 	virtual bool undo(Control* control);
 	virtual bool redo(Control* control);
-	vector<XojPage*> getPages();
+	vector<PageRef> getPages();
 	virtual string getText();
 
 private:

src/undo/SwapUndoAction.cpp

@@ -71,11 +71,11 @@ void SwapUndoAction::swap(Control* control)
 	doc->lock();
 }
 
-vector<XojPage*> SwapUndoAction::getPages()
+vector<PageRef> SwapUndoAction::getPages()
 {
 	XOJ_CHECK_TYPE(SwapUndoAction);
 
-	vector<XojPage*> pages;
+	vector<PageRef> pages;
 	pages.push_back(this->swappedPage);
 	pages.push_back(this->otherPage);
 	return pages;

src/undo/SwapUndoAction.h

@@ -26,7 +26,7 @@ public:
 public:
 	virtual bool undo(Control* control);
 	virtual bool redo(Control* control);
-	vector<XojPage*> getPages();
+	vector<PageRef> getPages();
 	virtual string getText();
 
 private:

src/undo/UndoAction.cpp

@@ -14,11 +14,11 @@ UndoAction::~UndoAction()
 	XOJ_RELEASE_TYPE(UndoAction);
 }
 
-vector<XojPage*> UndoAction::getPages()
+vector<PageRef> UndoAction::getPages()
 {
 	XOJ_CHECK_TYPE(UndoAction);
 
-	vector<XojPage*> pages;
+	vector<PageRef> pages;
 	pages.push_back(this->page);
 	return pages;
 }

src/undo/UndoAction.h

@@ -36,7 +36,7 @@ public:
 	/**
 	 * Get the affected pages
 	 */
-	virtual vector<XojPage*> getPages();
+	virtual vector<PageRef> getPages();
 
 	const char* getClassName() const;
 

src/undo/UndoRedoHandler.cpp

@@ -295,7 +295,7 @@ string UndoRedoHandler::redoDescription()
 	return _("Redo");
 }
 
-void UndoRedoHandler::fireUpdateUndoRedoButtons(vector<XojPage*> pages)
+void UndoRedoHandler::fireUpdateUndoRedoButtons(vector<PageRef> pages)
 {
 	XOJ_CHECK_TYPE(UndoRedoHandler);
 
@@ -304,8 +304,13 @@ void UndoRedoHandler::fireUpdateUndoRedoButtons(vector<XojPage*> pages)
 		((UndoRedoListener*) l->data)->undoRedoChanged();
 	}
 
-	for (XojPage* page : pages)
+	for (PageRef page : pages)
 	{
+		if (!page.isValid())
+		{
+			continue;
+		}
+
 		for (GList* l = this->listener; l != NULL; l = l->next)
 		{
 			((UndoRedoListener*) l->data)->undoRedoPageChanged(page);

src/undo/UndoRedoHandler.h

@@ -46,7 +46,7 @@ public:
 
 	void clearContents();
 
-	void fireUpdateUndoRedoButtons(vector<XojPage*> pages);
+	void fireUpdateUndoRedoButtons(vector<PageRef> pages);
 	void addUndoRedoListener(UndoRedoListener* listener);
 
 	bool isChanged();