X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmain.C;h=c7286c0e21b93fa77808fa5be274dab115f20335;hb=3bc4d28449143f6c90cf8209f29693c975801b28;hp=f0de20d48a027fd0e49e0e0177fc7e52a4e9ea02;hpb=d66e61a93c4ddc346772b6843ceb00a572255e54;p=lyx.git diff --git a/src/main.C b/src/main.C index f0de20d48a..c7286c0e21 100644 --- a/src/main.C +++ b/src/main.C @@ -14,31 +14,34 @@ #include "debug.h" #include "lyx_main.h" #include "gettext.h" + #include "support/os.h" +#include + #ifdef HAVE_IOS #include #endif -namespace os = lyx::support::os; - +namespace fs = boost::filesystem; int main(int argc, char * argv[]) { #ifdef HAVE_IOS std::ios_base::sync_with_stdio(false); #endif + fs::path::default_name_check(fs::no_check); + // To avoid ordering of global object problems with some // stdlibs we do the initialization here, but still as // early as possible. - lyxerr.rdbuf(std::cerr.rdbuf()); + lyx::lyxerr.rdbuf(std::cerr.rdbuf()); - os::init(&argc, &argv); + lyx::support::os::init(argc, argv); // initialize for internationalized version *EK* - locale_init(); + lyx::locale_init(); - LyX::exec(argc, argv); - return 0; + return lyx::LyX::exec(argc, argv); }