X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmain.cpp;h=b72725372be83e04874a17570fae7441fc19ef84;hb=5a8b8ba8e11360a716465b9c6c7c0dc48f37f552;hp=1e4634ca0f8e37bcee5b0369cee97065b3734cc2;hpb=f7ab948b9f5a892003604b12ea0c165baa2b9d50;p=lyx.git diff --git a/src/main.cpp b/src/main.cpp index 1e4634ca0f..b72725372b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean Marc Lasgouttes * * Full author contact details are available in file CREDITS. @@ -11,32 +11,32 @@ #include -#include "debug.h" #include "LyX.h" -#include "gettext.h" +#include "support/debug.h" #include "support/os.h" +#include #ifdef HAVE_IOS #include #endif +using namespace std; + + int main(int argc, char * argv[]) { #ifdef HAVE_IOS - std::ios_base::sync_with_stdio(false); + ios_base::sync_with_stdio(false); #endif // To avoid ordering of global object problems with some // stdlibs we do the initialization here, but still as // early as possible. - lyx::lyxerr.rdbuf(std::cerr.rdbuf()); + lyx::lyxerr.setStream(cerr); lyx::support::os::init(argc, argv); - // initialize for internationalized version *EK* - lyx::locale_init(); - lyx::LyX the_lyx_instance; return the_lyx_instance.exec(argc, argv);