diff -r 9eb7767c2dfa -r 608f976aa7bb mainwindow.h
--- a/mainwindow.h	Sun Jan 30 12:58:47 2005 +0000
+++ b/mainwindow.h	Tue Jun 06 14:58:11 2006 +0000
@@ -1,28 +1,33 @@
 #ifndef MAINWINDOW_H 
 #define MAINWINDOW_H
 
-#include <qpopupmenu.h>
-#include <qmainwindow.h>
-#include <qtextedit.h>
-#include <qintdict.h>
-#include <qcanvas.h>
+#include <q3popupmenu.h>
+#include <q3mainwindow.h>
+#include <q3textedit.h>
+#include <q3intdict.h>
+#include <q3canvas.h>
 #include <qlineedit.h>
 #include <qaction.h>
 #include <qcursor.h>
 #include <qtabwidget.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <QCloseEvent>
+#include <QShowEvent>
+#include <QHideEvent>
 
+#include "file.h"
+#include "findwindow.h"
+#include "mapeditor.h"
+#include "texteditor.h"
 #include "xml.h"
-#include "texteditor.h"
-#include "mapeditor.h"
-#include "findwindow.h"
 
-class Main : public QMainWindow 
+class Main : public Q3MainWindow 
 {
     Q_OBJECT
 
 public:
-    Main(QWidget* parent=0, const char* name=0, WFlags f=0);
+    Main(QWidget* parent=0, const char* name=0, Qt::WFlags f=0);
     ~Main();
 	void loadCmdLine();
 	void statusMessage (const QString &);
@@ -38,6 +43,7 @@
     void setupEditActions();
     void setupFormatActions();
     void setupViewActions();
+    void setupModeActions();
     void setupWindowActions();
     void setupFlagActions();
     void setupSettingsActions();
@@ -55,7 +61,7 @@
     void newView();
 	void editorChanged(QWidget*);
 
-    void fileLoad(QString ,const LoadMode &);
+    ErrorCode fileLoad(QString ,const LoadMode &);
     void fileLoad(const LoadMode &);
     void fileLoad();
 	void fileLoadLast(int);
@@ -63,12 +69,18 @@
     void fileSave();
     void fileSaveAs(const SaveMode &);
     void fileSaveAs();
+    void fileImportKDEBookmarks();
+    void fileImportFirefoxBookmarks();
+    void fileImportMM();
     void fileImportDir();
     void fileExportXML();
-    void fileExportHTML();
     void fileExportXHTML();
     void fileExportImage(int);
     void fileExportASCII();
+    void fileExportLaTeX();
+    void fileExportKDEBookmarks();
+    void fileExportTaskjuggler();
+    void fileExportOOPresentation();
     void fileCloseMap();
     void filePrint();
     void fileExitVYM();
@@ -83,15 +95,18 @@
 	void editFindChanged();
 public slots:
 	void editOpenURL();
+	void editOpenURLTab();
 private slots:
 	void editURL();
 	void editHeading2URL();
 	void editBugzilla2URL();
+	void editFATE2URL();
 	void editVymLink();
 public slots:
 	void editOpenVymLink();
 private slots:
 	void editDeleteVymLink();
+	void editToggleHideExport();
 	void editMapInfo();
     void editMoveUp();	
     void editMoveDown();	
@@ -99,11 +114,14 @@
     void editUnScrollAll();
     void editHeading();
     void editNewBranch();
+    void editNewBranchHere();
     void editNewBranchAbove();
     void editNewBranchBelow();
     void editImportAdd();
     void editImportReplace();
     void editSaveBranch();
+    void editRemoveBranchKeepChilds();
+    void editRemoveChilds();
     void editDeleteSelection();
     void editUpperBranch();
     void editLowerBranch();
@@ -113,7 +131,8 @@
     void editLastBranch();
     void editLoadImage();
     void editSaveImage(int);
-    void editToggleFloatExport();
+    void editFollowXLink (int);
+    void editEditXLink (int);
 
     void formatSelectColor();
     void formatPickColor();
@@ -129,16 +148,26 @@
     void formatToggleLinkColorHint();
 	void formatFrameNone();
 	void formatFrameRectangle();
+	void formatIncludeImagesVer();
+	void formatIncludeImagesHor();
+	void formatHideLinkUnselected();
 
     void viewZoomReset();
     void viewZoomIn();
     void viewZoomOut();
 
+	void modModeColor();
+	void modModeLink();
+
 public slots:
 	bool settingsPDF();
 	bool settingsURL();
+	void settingsToggleDelKey();
 
 	void windowToggleNoteEditor();
+	void windowToggleHistory();
+	void updateNoteFlag();
+
 private slots:
 	void windowNextEditor();
 	void windowPreviousEditor();
@@ -148,19 +177,19 @@
 	void standardFlagChanged();
 
     void testFunction();
-    void testShowClipboard();
 
     void helpDoc();
     void helpAbout();
     void helpAboutQT();
 
 private:
-    QCanvas* canvas;
+// not needed?    QCanvas* canvas;
 	QTabWidget *tabWidget;
 	FindWindow *findWindow;
 	QStringList lastMaps;
 	int maxLastMaps;
 	QString lastFileDir;
+	Q3Process *procBrowser;
 };