X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmain.C;h=dc5c978237bf584456fe4ba75547a970dd4b462b;hb=7aa50e8f2bc942e4bb3d7a45e62fdfbe6a21654e;hp=10e94692314a894cb483ff0d35c14ae5e69dac20;hpb=b6e6f87f71b83a01607f11fe9201a114993ff559;p=lyx.git

diff --git a/src/main.C b/src/main.C
index 10e9469231..dc5c978237 100644
--- a/src/main.C
+++ b/src/main.C
@@ -24,7 +24,6 @@
 #endif
 
 
-namespace os = lyx::support::os;
 namespace fs = boost::filesystem;
 
 int main(int argc, char * argv[])
@@ -37,13 +36,14 @@ int main(int argc, char * argv[])
 	// 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;
+	lyx::LyX the_lyx_instance;
+
+	return the_lyx_instance.exec(argc, argv);
 }