From 7f7aba1bcf23dae13dc6bb2c1206d7df4b729164 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 24 Oct 2011 20:17:57 +0000
Subject: [PATCH] Make cmd::Command::name const

Originally committed to SVN as r5769.
---
 aegisub/src/auto4_lua.h        | 2 +-
 aegisub/src/command/command.h  | 4 ++--
 aegisub/src/command/recent.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aegisub/src/auto4_lua.h b/aegisub/src/auto4_lua.h
index 0cb5a4c97..6a49e3b7c 100644
--- a/aegisub/src/auto4_lua.h
+++ b/aegisub/src/auto4_lua.h
@@ -257,7 +257,7 @@ namespace Automation4 {
 	public:
 		~LuaCommand();
 
-		const char* name() { return cmd_name.c_str(); }
+		const char* name() const { return cmd_name.c_str(); }
 		wxString StrMenu(const agi::Context *) const { return display; }
 		wxString StrDisplay(const agi::Context *) const { return display; }
 		wxString StrHelp() const { return help; }
diff --git a/aegisub/src/command/command.h b/aegisub/src/command/command.h
index 71ee48bf6..0d2ab0c6c 100644
--- a/aegisub/src/command/command.h
+++ b/aegisub/src/command/command.h
@@ -36,7 +36,7 @@ DEFINE_SIMPLE_EXCEPTION_NOINNER(CommandNotFound, CommandError, "command/notfound
 DEFINE_SIMPLE_EXCEPTION_NOINNER(CommandIconNone, CommandError, "command/icon")
 DEFINE_SIMPLE_EXCEPTION_NOINNER(CommandIconInvalid, CommandError, "command/icon/invalid")
 
-#define CMD_NAME(a) const char* name() { return a; }
+#define CMD_NAME(a) const char* name() const { return a; }
 #define STR_MENU(a) wxString StrMenu(const agi::Context *) const { return a; }
 #define STR_DISP(a) wxString StrDisplay(const agi::Context *) const { return a; }
 #define STR_HELP(a) wxString StrHelp() const { return a; }
@@ -86,7 +86,7 @@ namespace cmd {
 	class Command {
 	public:
 		/// Command name
-		virtual const char* name()=0;
+		virtual const char* name() const=0;
 		/// String for menu purposes including accelerators, but not hotkeys
 		virtual wxString StrMenu(const agi::Context *) const=0;
 		/// Plain string for display purposes; should normally be the same as StrMenu
diff --git a/aegisub/src/command/recent.cpp b/aegisub/src/command/recent.cpp
index db26d631e..118801c49 100644
--- a/aegisub/src/command/recent.cpp
+++ b/aegisub/src/command/recent.cpp
@@ -124,7 +124,7 @@ class mru_wrapper : public T {
 	int id;
 	std::string full_name;
 public:
-	const char *name() { return full_name.c_str(); }
+	const char *name() const { return full_name.c_str(); }
 	void operator()(agi::Context *c) {
 		T::operator()(c, id);
 	}