X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=5c4fb468459dbc3fa2a7ab12bbf418d1b6f7674e;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=1e4634ca0f8e37bcee5b0369cee97065b3734cc2;hpb=f7ab948b9f5a892003604b12ea0c165baa2b9d50;p=lyx.git

diff --git a/src/main.cpp b/src/main.cpp
index 1e4634ca0f..5c4fb46845 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,31 +11,31 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "LyX.h"
-#include "gettext.h"
 
+#include "support/debug.h"
 #include "support/os.h"
 
+#include <iostream>
 #ifdef HAVE_IOS
 #include <ios>
 #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::support::os::init(argc, argv);
+	lyx::lyxerr.setStream(cerr);
 
-	// initialize for internationalized version *EK*
-	lyx::locale_init();
+	lyx::support::os::init(argc, &argv);
 
 	lyx::LyX the_lyx_instance;