diff -r 1cc73bd7ee1f -r e95081c21da2 mainwindow.h
--- a/mainwindow.h	Tue Sep 05 09:47:13 2006 +0000
+++ b/mainwindow.h	Tue Sep 05 09:47:14 2006 +0000
@@ -1,16 +1,16 @@
 #ifndef MAINWINDOW_H 
 #define MAINWINDOW_H
 
-#include <qpopupmenu.h>
-#include <qmainwindow.h>
-#include <qtextedit.h>
-#include <qintdict.h>
-#include <qcanvas.h>
-#include <qlineedit.h>
-#include <qaction.h>
-#include <qcursor.h>
-#include <qtabwidget.h>
-#include <qmap.h>
+#include <QAction>
+#include <QCursor>
+#include <QMainWindow>
+#include <QProcess>
+#include <QToolBar>
+#include <QTabWidget>
+//Added by qt3to4:
+#include <QCloseEvent>
+#include <QShowEvent>
+#include <QHideEvent>
 
 #include "file.h"
 #include "findwindow.h"
@@ -23,7 +23,7 @@
     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 &);
@@ -60,7 +60,7 @@
     ErrorCode fileLoad(QString ,const LoadMode &);
     void fileLoad(const LoadMode &);
     void fileLoad();
-	void fileLoadLast(int);
+	void fileLoadLast(QAction *);
     void fileSave(const SaveMode & );
     void fileSave();
     void fileSaveAs(const SaveMode &);
@@ -71,7 +71,7 @@
     void fileImportDir();
     void fileExportXML();
     void fileExportXHTML();
-    void fileExportImage(int);
+    void fileExportImage();
     void fileExportASCII();
     void fileExportLaTeX();
     void fileExportKDEBookmarks();
@@ -89,16 +89,22 @@
     void editOpenFindWindow();
 	void editFind(QString);
 	void editFindChanged();
+private:
+	void openTabs(QStringList);
 public slots:
 	void editOpenURL();
 	void editOpenURLTab();
 private slots:
+	void editOpenMultipleURLTabs();
 	void editURL();
 	void editHeading2URL();
 	void editBugzilla2URL();
 	void editFATE2URL();
+	void openVymLinks(const QStringList &);
 	void editVymLink();
+	void editOpenMultipleVymLinks();
 public slots:
+    void editHeading();
 	void editOpenVymLink();
 private slots:
 	void editDeleteVymLink();
@@ -108,7 +114,6 @@
     void editMoveDown();	
     void editToggleScroll();
     void editUnScrollAll();
-    void editHeading();
     void editNewBranch();
     void editNewBranchHere();
     void editNewBranchAbove();
@@ -126,9 +131,9 @@
     void editFirstBranch();
     void editLastBranch();
     void editLoadImage();
-    void editSaveImage(int);
-    void editFollowXLink (int);
-    void editEditXLink (int);
+    void editSaveImage();
+    void editFollowXLink (QAction *);
+    void editEditXLink (QAction *);
 
     void formatSelectColor();
     void formatPickColor();
@@ -179,13 +184,17 @@
     void helpAboutQT();
 
 private:
-// not needed?    QCanvas* canvas;
 	QTabWidget *tabWidget;
 	FindWindow *findWindow;
 	QStringList lastMaps;
 	int maxLastMaps;
-	QString lastFileDir;
 	QProcess *procBrowser;
+
+	QStringList imageTypes;
+
+	QLineEdit *lineedit;	// to enter headings of branches
+	QString editSel;
+	
 };