diff -r 7a71a914afdb -r 6d2b32f305f9 mainwindow.h
--- a/mainwindow.h	Thu May 07 08:48:53 2009 +0000
+++ b/mainwindow.h	Wed May 13 08:26:27 2009 +0000
@@ -5,6 +5,7 @@
 
 #include "branchpropwindow.h"
 #include "extrainfodialog.h"
+#include "flag.h"
 #include "file.h"
 #include "findwindow.h"
 #include "historywindow.h"
@@ -58,7 +59,7 @@
     void setupViewActions();
     void setupModeActions();
     void setupWindowActions();
-    void setupFlag(FlagObj *fo, QToolBar *tb, bool aw, const QString &name, const QString &tooltip);
+    void setupFlag(Flag *flag, QToolBar *tb, const QString &name, const QString &tooltip);
     void setupFlagActions();
     void setupNetworkActions();
     void setupSettingsActions();
@@ -133,11 +134,9 @@
 	void openVymLinks(const QStringList &);
 	void editVymLink();
 	void editOpenMultipleVymLinks();
-    void editAttributeFinished();
 public slots:
     void editHeadingFinished(VymModel *m);
 //    void editHeading();
-    void editAttribute();
 	void editOpenVymLink();
 private slots:
 	void editDeleteVymLink();
@@ -223,7 +222,6 @@
 	ModMode getModMode();
 	bool autoEditNewBranch();
 	bool autoSelectNewBranch();
-	bool useFlagGroups();
 	void setScript(const QString &);
 	void runScript(const QString &);
 	void runScriptEverywhere (const QString &);