1.1 --- a/mainwindow.h	Fri May 01 10:30:29 2009 +0000
     1.2 +++ b/mainwindow.h	Wed May 13 08:26:27 2009 +0000
     1.3 @@ -5,6 +5,7 @@
     1.4  
     1.5  #include "branchpropwindow.h"
     1.6  #include "extrainfodialog.h"
     1.7 +#include "flag.h"
     1.8  #include "file.h"
     1.9  #include "findwindow.h"
    1.10  #include "historywindow.h"
    1.11 @@ -58,7 +59,7 @@
    1.12      void setupViewActions();
    1.13      void setupModeActions();
    1.14      void setupWindowActions();
    1.15 -    void setupFlag(FlagObj *fo, QToolBar *tb, bool aw, const QString &name, const QString &tooltip);
    1.16 +    void setupFlag(Flag *flag, QToolBar *tb, const QString &name, const QString &tooltip);
    1.17      void setupFlagActions();
    1.18      void setupNetworkActions();
    1.19      void setupSettingsActions();
    1.20 @@ -133,11 +134,9 @@
    1.21  	void openVymLinks(const QStringList &);
    1.22  	void editVymLink();
    1.23  	void editOpenMultipleVymLinks();
    1.24 -    void editAttributeFinished();
    1.25  public slots:
    1.26      void editHeadingFinished(VymModel *m);
    1.27  //    void editHeading();
    1.28 -    void editAttribute();
    1.29  	void editOpenVymLink();
    1.30  private slots:
    1.31  	void editDeleteVymLink();
    1.32 @@ -223,7 +222,6 @@
    1.33  	ModMode getModMode();
    1.34  	bool autoEditNewBranch();
    1.35  	bool autoSelectNewBranch();
    1.36 -	bool useFlagGroups();
    1.37  	void setScript(const QString &);
    1.38  	void runScript(const QString &);
    1.39  	void runScriptEverywhere (const QString &);