Author: rgheck
Date: Tue Jan 18 16:07:26 2011
New Revision: 37246
URL: http://www.lyx.org/trac/changeset/37246
Log:
Move bind file format tag to LyXAction.cpp, and rename it.
Modified:
lyx-devel/trunk/src/KeyMap.cpp
lyx-devel/trunk/src/LyXAction.h
Modified: lyx-devel/trunk/src/KeyMap.cpp
==============================================================================
--- lyx-devel/trunk/src/KeyMap.cpp Tue Jan 18 10:57:03 2011 (r37245)
+++ lyx-devel/trunk/src/KeyMap.cpp Tue Jan 18 16:07:26 2011 (r37246)
@@ -37,11 +37,6 @@
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 @@
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 @@
// 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 @@
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);
Modified: lyx-devel/trunk/src/LyXAction.h
==============================================================================
--- lyx-devel/trunk/src/LyXAction.h Tue Jan 18 10:57:03 2011 (r37245)
+++ lyx-devel/trunk/src/LyXAction.h Tue Jan 18 16:07:26 2011 (r37246)
@@ -21,6 +21,9 @@
namespace lyx {
+// current LFUN format
+static unsigned int const LFUN_FORMAT = 1;
+
class FuncRequest;
class LyXErr;
