Move these declarations closer to where they are used.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30654 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-07-17 21:44:19 +00:00
parent 660b950aa7
commit 277e74ff9c

View File

@ -1463,21 +1463,6 @@ bool GuiApplication::searchMenu(FuncRequest const & func,
bool GuiApplication::readUIFile(QString const & name, bool include)
{
enum {
ui_menuset = 1,
ui_toolbars,
ui_toolbarset,
ui_include,
ui_last
};
LexerKeyword uitags[] = {
{ "include", ui_include },
{ "menuset", ui_menuset },
{ "toolbars", ui_toolbars },
{ "toolbarset", ui_toolbarset }
};
LYXERR(Debug::INIT, "About to read " << name << "...");
FileName ui_path;
@ -1532,6 +1517,21 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
enum {
ui_menuset = 1,
ui_toolbars,
ui_toolbarset,
ui_include,
ui_last
};
LexerKeyword uitags[] = {
{ "include", ui_include },
{ "menuset", ui_menuset },
{ "toolbars", ui_toolbars },
{ "toolbarset", ui_toolbarset }
};
Lexer lex(uitags);
lex.setFile(ui_path);
if (!lex.isOK()) {