diff -r 7c3ee77f4449 -r 53efc2562a7d mainwindow.h
--- a/mainwindow.h	Mon Nov 20 12:12:00 2006 +0000
+++ b/mainwindow.h	Mon Nov 20 12:12:02 2006 +0000
@@ -5,6 +5,7 @@
 
 #include "file.h"
 #include "findwindow.h"
+#include "historywindow.h"
 #include "mapeditor.h"
 #include "texteditor.h"
 #include "xml.h"
@@ -47,7 +48,6 @@
 	MapEditor* currentMapEditor() const;
     
 private slots:
-    void newView();
 	void editorChanged(QWidget*);
 
     ErrorCode fileLoad(QString ,const LoadMode &);
@@ -75,8 +75,11 @@
     void filePrint();
     void fileExitVYM();
 
+public slots:
     void editUndo();	
     void editRedo();	
+	void gotoHistoryStep (int);
+private slots:	
     void editCopy();	
     void editPaste();	
     void editCut();	
@@ -159,6 +162,7 @@
 
 	void windowToggleNoteEditor();
 	void windowToggleHistory();
+	void updateHistory(SimpleSettings &);
 	void updateNoteFlag();
 	void updateActions();
 	ModMode getModMode();
@@ -191,6 +195,8 @@
 	QLineEdit *lineedit;	// to enter headings of branches
 	QString prevSelection;
 
+	HistoryWindow *historyWindow;
+
 	Q3PtrList <QAction> actionListBranches;
 
 	QColor currentColor;