From: Richard Heck <rgheck@comcast.net>
Date: Tue, 18 Jan 2011 15:07:26 +0000 (+0000)
Subject: Move bind file format tag to LyXAction.cpp, and rename it.
X-Git-Tag: 2.0.0~1069
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=718925cb5b059a8c06234575a47581201b08edf7;p=features.git

Move bind file format tag to LyXAction.cpp, and rename it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37246 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 7084861097..54b21f2868 100644
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -37,11 +37,6 @@ using namespace lyx::support;
 
 namespace lyx {
 
-namespace {
-	// current format of bind files
-	static unsigned int const BIND_FORMAT = 1;
-}
-
 string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
 {
 	string buf;
@@ -252,12 +247,12 @@ bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
 	if (retval != FormatMismatch)
 		return retval == ReadOK;
 
-	LYXERR(Debug::FILES, "Converting bind file to " << BIND_FORMAT);
+	LYXERR(Debug::FILES, "Converting bind file to " << LFUN_FORMAT);
 	FileName const tempfile = FileName::tempName("convert_bind");
 	bool const success = prefs2prefs(bind_file, tempfile, true);
 	if (!success) {
 		LYXERR0 ("Unable to convert " << bind_file <<
-			" to format " << BIND_FORMAT);
+			" to format " << LFUN_FORMAT);
 		return false;
 	}
 	retval = readWithoutConv(tempfile, unbind_map);
@@ -382,7 +377,7 @@ KeyMap::ReturnValues KeyMap::readWithoutConv(FileName const & bind_file, KeyMap
 
 		// This is triggered the first time through the loop unless
 		// we hit a format tag.
-		if (format != BIND_FORMAT)
+		if (format != LFUN_FORMAT)
 			return FormatMismatch;
 	}
 
@@ -402,7 +397,7 @@ void KeyMap::write(string const & bind_file, bool append, bool unbind) const
 	if (!append)
 		os << "## This file is automatically generated by lyx\n"
 		   << "## All modifications will be lost\n\n"
-		   << "Format " << BIND_FORMAT << "\n\n";
+		   << "Format " << LFUN_FORMAT << "\n\n";
 
 	string tag = unbind ? "\\unbind" : "\\bind";
 	BindingList const list = listBindings(false);
diff --git a/src/LyXAction.h b/src/LyXAction.h
index 9191694372..cbe59b95a9 100644
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -21,6 +21,9 @@
 
 namespace lyx {
 
+// current LFUN format
+static unsigned int const LFUN_FORMAT = 1;
+
 class FuncRequest;
 class LyXErr;