From: Richard Heck Date: Fri, 17 Jul 2009 21:44:19 +0000 (+0000) Subject: Move these declarations closer to where they are used. X-Git-Tag: 2.0.0~5976 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=277e74ff9ca70a1933b52220d616e70ac3b3bb4e;p=features.git 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 --- diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index d236269ae2..001e3658fa 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -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()) {