anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37246 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-01-18 15:07:26 +00:00
parent eb18b4e835
commit 718925cb5b
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/KeyMap.cpp
View File

@ -37,11 +37,6 @@ using namespace lyx::support;
namespace lyx { 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 const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
{ {
string buf; string buf;
@ -252,12 +247,12 @@ bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
if (retval != FormatMismatch) if (retval != FormatMismatch)
return retval == ReadOK; 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"); FileName const tempfile = FileName::tempName("convert_bind");
bool const success = prefs2prefs(bind_file, tempfile, true); bool const success = prefs2prefs(bind_file, tempfile, true);
if (!success) { if (!success) {
LYXERR0 ("Unable to convert " << bind_file << LYXERR0 ("Unable to convert " << bind_file <<
" to format " << BIND_FORMAT); " to format " << LFUN_FORMAT);
return false; return false;
} }
retval = readWithoutConv(tempfile, unbind_map); 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 // This is triggered the first time through the loop unless
// we hit a format tag. // we hit a format tag.
if (format != BIND_FORMAT) if (format != LFUN_FORMAT)
return FormatMismatch; return FormatMismatch;
} }
@ -402,7 +397,7 @@ void KeyMap::write(string const & bind_file, bool append, bool unbind) const
if (!append) if (!append)
os << "## This file is automatically generated by lyx\n" os << "## This file is automatically generated by lyx\n"
<< "## All modifications will be lost\n\n" << "## All modifications will be lost\n\n"
<< "Format " << BIND_FORMAT << "\n\n"; << "Format " << LFUN_FORMAT << "\n\n";
string tag = unbind ? "\\unbind" : "\\bind"; string tag = unbind ? "\\unbind" : "\\bind";
BindingList const list = listBindings(false); BindingList const list = listBindings(false);

3
src/LyXAction.h
View File

@ -21,6 +21,9 @@
namespace lyx { namespace lyx {
// current LFUN format
static unsigned int const LFUN_FORMAT = 1;
class FuncRequest; class FuncRequest;
class LyXErr; class LyXErr;