diff -r 5d0cbeb02bf3 -r 8f04006214dc mapeditor.h
--- a/mapeditor.h	Wed Mar 29 09:11:09 2006 +0000
+++ b/mapeditor.h	Mon May 15 07:32:11 2006 +0000
@@ -12,6 +12,7 @@
 #include "mapcenterobj.h"
 #include "file.h"
 #include "misc.h"
+#include "showtextdialog.h"
 
 class QNetworkOperation;
 class QUrlOperator;
@@ -30,24 +31,26 @@
 	bool isRepositionBlocked(); // block while load or undo
 	
 private:
+	QString getName(LinkableMapObj*);	// Get e.g. heading or filename
 	void makeTmpDirs();		// create temporary directories
     QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
-    void saveState();		// save actual state to backup
-    void saveState(LinkableMapObj *);
-    void saveState(const QString &, const QString &);
-    void saveState(const QString &, LinkableMapObj *);
-    void saveState(const SaveMode&, const QString &, LinkableMapObj *, const QString &, LinkableMapObj *);
+    void saveState(const QString &);	// save actual state to backup
+    void saveState(LinkableMapObj *, const QString &);
+    void saveState(const QString &, const QString &, const QString &);
+    void saveState(const QString &, LinkableMapObj *, const QString &);
+    void saveState(const SaveMode&, const QString &, LinkableMapObj *, const QString &, LinkableMapObj *, const QString &);
     void parseAtom(const QString &);	
 
     void addFloatImage(const QPixmap &img);
 
   private slots:
-    void finishedLineEditNoSave();
+    void finishedLineEdit();
     void fetchImage(const QString &img);
     void imageDataFetched(const QByteArray &, QNetworkOperation *);
     void imageDataFinished(QNetworkOperation *);
 
 public:
+	void toggleHistoryWindow();
 	bool isDefault();		// false, if map was changed once
     bool isUnsaved();		// save necessary
     bool hasChanged();		// undo possible
@@ -131,11 +134,8 @@
 	void editVymLink();						// edit link to another map
 	void deleteVymLink();					// delete link to another map
 	QString getVymLink();					// return path to map
-	void setHideExport();					// toggle the export flag
-protected:	
 	void toggleHideExport();				// toggle the export flag
-public:	
-	void removeBranchHere();				// remove but keep childs
+	void removeBranchKeepChilds();			// remove but keep childs
 	void removeChilds();					// remove childs
 	void editMapInfo();						// dialog to enter author, ...
 	void updateActions();					// update e.g. format buttons
@@ -250,6 +250,8 @@
   QDataStream *imageData;
   QBuffer *imageBuffer;
 
+	ShowTextDialog *historyWindow;
+
 };
 #endif