Tweaks.

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index d425369fd7d67549fa372317f4a799c97a36aec9..e12d859f403e796f4e330e8a5ff3c0443a65ec60 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -52,7 +52,6 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/Messages.h"
 #include "support/os.h"
 #include "support/Package.h"
@@ -66,6 +65,7 @@
 #include <iostream>
 #include <csignal>
 #include <map>
+#include <stdlib.h>
 #include <string>
 #include <vector>
 
@@ -184,7 +184,6 @@ LyX::~LyX()
        delete pimpl_;
 }
 
-#include <stdlib.h>
 
 void LyX::exit(int exit_code) const
 {
@@ -531,7 +530,7 @@ int LyX::init(int & argc, char * argv[])
                // the filename if necessary
                pimpl_->files_to_load_.push_back(fileSearch(string(),
                        os::internal_path(to_utf8(from_local8bit(argv[argi]))),
-                       "lyx", allow_unreadable));
+                       "lyx", may_not_exist));
        }
 
        if (first_start)
@@ -1110,7 +1109,7 @@ bool LyX::readUIFile(string const & name, bool include)
                        break;
                }
                case ui_menuset:
-                       menubackend.read(lex);
+                       theApp()->menuBackend().read(lex);
                        break;
 
                case ui_toolbarset: