diff -r bb94eec7c8f3 -r 0e1aeb21cb78 mapeditor.h --- a/mapeditor.h Thu Sep 21 13:48:05 2006 +0000 +++ b/mapeditor.h Mon Oct 16 12:42:54 2006 +0000 @@ -2,18 +2,7 @@ #define MAPEDITOR_H #include -//#include -//#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "mapcenterobj.h" #include "file.h" @@ -29,10 +18,10 @@ Q_OBJECT public: - MapEditor(QWidget* parent=0, bool interactive=false, const char* name=0, Qt::WFlags f=0); + MapEditor(QWidget* parent=0, const char* name=0, Qt::WFlags f=0); ~MapEditor(); - QColor color(); - QColor backgroundColor(); + QColor getColor(); + QColor getBackgroundColor(); MapCenterObj* getMapCenter(); Q3Canvas* getCanvas(); void adjustCanvasSize();// adjust canvas size to map and scrollview @@ -45,7 +34,6 @@ void saveStateComplete (const QString &); void saveStatePart (LinkableMapObj *, const QString &); void saveStateConstSelection (const QString &, const QString &, const QString &); - void saveStateComData (LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &, LinkableMapObj *); void saveState(LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &); void saveState(const QString &, const QString &, const QString &, const QString &, const QString &); void saveState(const SaveMode&, const QString &, const QString &, const QString &, const QString &, const QString &, LinkableMapObj *); @@ -90,7 +78,9 @@ void clear(); // clear map void copy(); // copy branch to clipboard void redo(); // redo last action + bool isRedoAvailable(); void undo(); // undo last action + bool isUndoAvailable(); void gotoStep (int);// goto a step in history private: void undoXML(const QString &, const QString &); @@ -247,7 +237,6 @@ QString destPath; // path to .vym file (needed for vymlinks) QString mapName; // fileName without ".vym" - bool isInteractive; // non interactive don't need tmpdirs QString tmpMapDir; // tmp directory with undo history QString histPath; // Path to history file int stepsTotal; // total number of steps (undos+redos)