X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=879e9c2df6560862ac6feee6ae955ed82ad59053;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=c3c1edf9338a5c6343908c42a70ff400ea7dc2ea;hpb=eed73def237384f97efb1de65806ffbf86fe3815;p=lyx.git

diff --git a/src/lyx_main.C b/src/lyx_main.C
index c3c1edf933..879e9c2df6 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -36,8 +36,11 @@
 #include "lyxtextclasslist.h"
 #include "lyxserver.h"
 #include "MenuBackend.h"
+#include "mover.h"
 #include "ToolbarBackend.h"
 
+#include "mathed/math_inset.h"
+
 #include "frontends/Alert.h"
 #include "frontends/lyx_gui.h"
 #include "frontends/LyXView.h"
@@ -71,7 +74,8 @@ using lyx::support::setLyxPaths;
 using lyx::support::system_lyxdir;
 using lyx::support::user_lyxdir;
 
-namespace os = lyx::support::os;
+using lyx::support::os::getTmpDir;
+using lyx::support::os::setTmpDir;
 
 using std::endl;
 using std::string;
@@ -160,7 +164,7 @@ void LyX::addLyXView(boost::shared_ptr<LyXView> const & lyxview)
 }
 
 
-Buffer const * const LyX::updateInset(InsetOld const * inset) const
+Buffer const * const LyX::updateInset(InsetBase const * inset) const
 {
 	if (!inset)
 		return 0;
@@ -204,6 +208,8 @@ void LyX::priv_exec(int & argc, char * argv[])
 	if (want_gui)
 		lyx_gui::parse_lyxrc();
 
+	initMath();
+
 	vector<string> files;
 
 	for (int argi = argc - 1; argi >= 1; --argi)
@@ -368,6 +374,7 @@ void LyX::init(bool gui)
 	system_lyxrc = lyxrc;
 	system_formats = formats;
 	system_converters = converters;
+	system_movers = movers;
 	system_lcolor = lcolor;
 
 	string prefsfile = "preferences";
@@ -397,8 +404,8 @@ void LyX::init(bool gui)
 	if (lyxerr.debugging(Debug::LYXRC))
 		lyxrc.print();
 
-	os::setTmpDir(createLyXTmpDir(lyxrc.tempdir_path));
-	if (os::getTmpDir().empty()) {
+	setTmpDir(createLyXTmpDir(lyxrc.tempdir_path));
+	if (getTmpDir().empty()) {
 		Alert::error(_("Could not create temporary directory"),
 		             bformat(_("Could not create a temporary directory in\n"
 		                       "%1$s. Make sure that this\n"
@@ -413,7 +420,7 @@ void LyX::init(bool gui)
 	}
 
 	if (lyxerr.debugging(Debug::INIT)) {
-		lyxerr << "LyX tmp dir: `" << os::getTmpDir() << '\'' << endl;
+		lyxerr << "LyX tmp dir: `" << getTmpDir() << '\'' << endl;
 	}
 
 	lyxerr[Debug::INIT] << "Reading lastfiles `"