if (bf.empty()) {
if (rt == MissingOK)
return true;
+
lyxerr << "Could not find bind file: " << bind_file;
if (rt == Default) {
frontend::Alert::warning(_("Could not find bind file"),
"Please check your installation."), from_utf8(bind_file)));
return false;
}
+
+ static string const defaultBindfile = "cua";
+ if (bind_file == defaultBindfile) {
+ frontend::Alert::warning(_("Could not find `cua.bind' file"),
+ _("Unable to find the default bind file `cua.bind'.\n"
+ "Please check your installation."));
+ return false;
+ }
+
+ // Try it with the default file.
frontend::Alert::warning(_("Could not find bind file"),
bformat(_("Unable to find the bind file\n%1$s.\n"
"Falling back to default."), from_utf8(bind_file)));
- // So try it with the default file.
- if (read("cua", unbind_map))
- return true;
- lyxerr << "Could not find cua bind file!";
- frontend::Alert::warning(_("Could not find cua bind file"),
- _("Unable to find the default bind file `cua'.\n"
- "Please check your installation."));
- return false;
+ return read(defaultBindfile, unbind_map);
}
return read(bf, unbind_map);
}
BindingList list;
listBindings(list, KeySequence(0, 0), tag);
if (unbound) {
- LyXAction::const_func_iterator fit = lyxaction.func_begin();
- LyXAction::const_func_iterator fit_end = lyxaction.func_end();
- for (; fit != fit_end; ++fit) {
+ LyXAction::const_iterator fit = lyxaction.func_begin();
+ LyXAction::const_iterator const fen = lyxaction.func_end();
+ for (; fit != fen; ++fit) {
FuncCode action = fit->second;
bool has_action = false;
- BindingList::const_iterator it = list.begin();
- BindingList::const_iterator it_end = list.end();
- for (; it != it_end; ++it)
- if (it->request.action == action) {
+ BindingList::const_iterator bit = list.begin();
+ BindingList::const_iterator const ben = list.end();
+ for (; bit != ben; ++bit)
+ if (bit->request.action == action) {
has_action = true;
break;
}