X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fimporter.C;h=03eb4002b92be0dc35a300a86a8c16468c248f9c;hb=5091380d6bad1686800e384ed1bbb03836a15aab;hp=a0610964ef3b53041bb65cc1e0bc6075f0495f40;hpb=50a25e9a76d753f5229b4fca1076e242a99af467;p=lyx.git

diff --git a/src/importer.C b/src/importer.C
index a0610964ef..03eb4002b9 100644
--- a/src/importer.C
+++ b/src/importer.C
@@ -19,7 +19,7 @@
 #include "importer.h"
 #include "converter.h"
 #include "frontends/LyXView.h"
-#include "lyxfunc.h"
+#include "funcrequest.h"
 
 #include "bufferlist.h"
 #include "support/filetools.h"
@@ -40,7 +40,7 @@ bool Importer::Import(LyXView * lv, string const & filename,
 	string const displaypath = MakeDisplayPath(filename);
 	ostringstream s1;
 	s1 << _("Importing") << ' ' << displaypath << "...";
-	lv->message(s1.str().c_str());
+	lv->message(STRCONV(s1.str()));
 
 	string const lyxfile = ChangeExtension(filename, ".lyx");
 
@@ -77,8 +77,8 @@ bool Importer::Import(LyXView * lv, string const & filename,
 		string filename2 = (loader_format == format) ? filename
 			: ChangeExtension(filename,
 					  formats.extension(loader_format));
-		InsertAsciiFile(lv->view(), filename2, as_paragraphs);
-		lv->getLyXFunc()->dispatch(LFUN_MARK_OFF);
+		InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
+		lv->dispatch(FuncRequest(LFUN_MARK_OFF));
 	}
 
 	// we are done