1.1 --- a/mainwindow.h	Tue Sep 05 09:47:13 2006 +0000
     1.2 +++ b/mainwindow.h	Tue Sep 05 09:47:14 2006 +0000
     1.3 @@ -1,16 +1,16 @@
     1.4  #ifndef MAINWINDOW_H 
     1.5  #define MAINWINDOW_H
     1.6  
     1.7 -#include <qpopupmenu.h>
     1.8 -#include <qmainwindow.h>
     1.9 -#include <qtextedit.h>
    1.10 -#include <qintdict.h>
    1.11 -#include <qcanvas.h>
    1.12 -#include <qlineedit.h>
    1.13 -#include <qaction.h>
    1.14 -#include <qcursor.h>
    1.15 -#include <qtabwidget.h>
    1.16 -#include <qmap.h>
    1.17 +#include <QAction>
    1.18 +#include <QCursor>
    1.19 +#include <QMainWindow>
    1.20 +#include <QProcess>
    1.21 +#include <QToolBar>
    1.22 +#include <QTabWidget>
    1.23 +//Added by qt3to4:
    1.24 +#include <QCloseEvent>
    1.25 +#include <QShowEvent>
    1.26 +#include <QHideEvent>
    1.27  
    1.28  #include "file.h"
    1.29  #include "findwindow.h"
    1.30 @@ -23,7 +23,7 @@
    1.31      Q_OBJECT
    1.32  
    1.33  public:
    1.34 -    Main(QWidget* parent=0, const char* name=0, WFlags f=0);
    1.35 +    Main(QWidget* parent=0, const char* name=0, Qt::WFlags f=0);
    1.36      ~Main();
    1.37  	void loadCmdLine();
    1.38  	void statusMessage (const QString &);
    1.39 @@ -60,7 +60,7 @@
    1.40      ErrorCode fileLoad(QString ,const LoadMode &);
    1.41      void fileLoad(const LoadMode &);
    1.42      void fileLoad();
    1.43 -	void fileLoadLast(int);
    1.44 +	void fileLoadLast(QAction *);
    1.45      void fileSave(const SaveMode & );
    1.46      void fileSave();
    1.47      void fileSaveAs(const SaveMode &);
    1.48 @@ -71,7 +71,7 @@
    1.49      void fileImportDir();
    1.50      void fileExportXML();
    1.51      void fileExportXHTML();
    1.52 -    void fileExportImage(int);
    1.53 +    void fileExportImage();
    1.54      void fileExportASCII();
    1.55      void fileExportLaTeX();
    1.56      void fileExportKDEBookmarks();
    1.57 @@ -89,16 +89,22 @@
    1.58      void editOpenFindWindow();
    1.59  	void editFind(QString);
    1.60  	void editFindChanged();
    1.61 +private:
    1.62 +	void openTabs(QStringList);
    1.63  public slots:
    1.64  	void editOpenURL();
    1.65  	void editOpenURLTab();
    1.66  private slots:
    1.67 +	void editOpenMultipleURLTabs();
    1.68  	void editURL();
    1.69  	void editHeading2URL();
    1.70  	void editBugzilla2URL();
    1.71  	void editFATE2URL();
    1.72 +	void openVymLinks(const QStringList &);
    1.73  	void editVymLink();
    1.74 +	void editOpenMultipleVymLinks();
    1.75  public slots:
    1.76 +    void editHeading();
    1.77  	void editOpenVymLink();
    1.78  private slots:
    1.79  	void editDeleteVymLink();
    1.80 @@ -108,7 +114,6 @@
    1.81      void editMoveDown();	
    1.82      void editToggleScroll();
    1.83      void editUnScrollAll();
    1.84 -    void editHeading();
    1.85      void editNewBranch();
    1.86      void editNewBranchHere();
    1.87      void editNewBranchAbove();
    1.88 @@ -126,9 +131,9 @@
    1.89      void editFirstBranch();
    1.90      void editLastBranch();
    1.91      void editLoadImage();
    1.92 -    void editSaveImage(int);
    1.93 -    void editFollowXLink (int);
    1.94 -    void editEditXLink (int);
    1.95 +    void editSaveImage();
    1.96 +    void editFollowXLink (QAction *);
    1.97 +    void editEditXLink (QAction *);
    1.98  
    1.99      void formatSelectColor();
   1.100      void formatPickColor();
   1.101 @@ -179,13 +184,17 @@
   1.102      void helpAboutQT();
   1.103  
   1.104  private:
   1.105 -// not needed?    QCanvas* canvas;
   1.106  	QTabWidget *tabWidget;
   1.107  	FindWindow *findWindow;
   1.108  	QStringList lastMaps;
   1.109  	int maxLastMaps;
   1.110 -	QString lastFileDir;
   1.111  	QProcess *procBrowser;
   1.112 +
   1.113 +	QStringList imageTypes;
   1.114 +
   1.115 +	QLineEdit *lineedit;	// to enter headings of branches
   1.116 +	QString editSel;
   1.117 +	
   1.118  };
   1.119  
   1.120