diff -r 36d140349897 -r 49f2d7a5f85d mainwindow.h
--- a/mainwindow.h	Mon Jun 25 12:54:19 2007 +0000
+++ b/mainwindow.h	Wed Jul 18 10:15:46 2007 +0000
@@ -189,8 +189,8 @@
 	void updateSatellites(MapEditor *);
 	void updateActions();
 	ModMode getModMode();
-	bool autoEdit();
-	bool autoSelectHeading();
+	bool autoEditNewBranch();
+	bool autoSelectNewBranch();
 	bool useFlagGroups();
 	void setScript(const QString &);
 	void runScript(const QString &);
@@ -312,8 +312,8 @@
 	QAction *actionViewToggleSmoothPixmapTransform;
 	QAction* actionViewCenter;
 
-	QAction* actionSettingsAutoEdit;
-	QAction* actionSettingsAutoSelectHeading;
+	QAction* actionSettingsAutoEditNewBranch;
+	QAction* actionSettingsAutoSelectNewBranch;
 	QAction* actionSettingsAutoSelectText;
 	QAction* actionSettingsUseDelKey;
 	QAction* actionSettingsUseFlagGroups;