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

diff --git a/src/importer.C b/src/importer.C
index 58f1c87b28..03eb4002b9 100644
--- a/src/importer.C
+++ b/src/importer.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -18,13 +18,14 @@
 
 #include "importer.h"
 #include "converter.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
+#include "frontends/LyXView.h"
+#include "funcrequest.h"
 
 #include "bufferlist.h"
 #include "support/filetools.h"
-#include "lyx_gui_misc.h" //WriteAlert
+#include "frontends/Alert.h"
 #include "gettext.h"
+#include "BufferView.h"
 
 using std::vector;
 using std::find;
@@ -33,13 +34,13 @@ extern BufferList bufferlist;
 extern void InsertAsciiFile(BufferView *, string const &, bool);
 
 
-bool Importer::Import(LyXView * lv, string const & filename, 
+bool Importer::Import(LyXView * lv, string const & filename,
 		      string const & format)
 {
 	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");
 
@@ -48,8 +49,8 @@ bool Importer::Import(LyXView * lv, string const & filename,
 	if (find(loaders.begin(), loaders.end(), format) == loaders.end()) {
 		for (vector<string>::const_iterator it = loaders.begin();
 		     it != loaders.end(); ++it) {
-			if (converters.IsReachable(format, *it)) {
-				if (!converters.Convert(0, filename, filename,
+			if (converters.isReachable(format, *it)) {
+				if (!converters.convert(0, filename, filename,
 							format, *it))
 					return false;
 				loader_format = *it;
@@ -57,9 +58,9 @@ bool Importer::Import(LyXView * lv, string const & filename,
 			}
 		}
 		if (loader_format.empty()) {
-			WriteAlert(_("Can not import file"),
+			Alert::alert(_("Cannot import file"),
 				   _("No information for importing from ")
-				   + formats.PrettyName(format));
+				   + formats.prettyName(format));
 			return false;
 		}
 	} else
@@ -75,9 +76,9 @@ bool Importer::Import(LyXView * lv, string const & filename,
 		bool as_paragraphs = loader_format == "textparagraph";
 		string filename2 = (loader_format == format) ? filename
 			: ChangeExtension(filename,
-					  formats.Extension(loader_format));
-		InsertAsciiFile(lv->view(), filename2, as_paragraphs);
-		lv->getLyXFunc()->Dispatch(LFUN_MARK_OFF);
+					  formats.extension(loader_format));
+		InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
+		lv->dispatch(FuncRequest(LFUN_MARK_OFF));
 	}
 
 	// we are done
@@ -86,28 +87,15 @@ bool Importer::Import(LyXView * lv, string const & filename,
 }
 
 
-#if 0
-bool Importer::IsImportable(string const & format)
-{
-	vector<string> loaders = Loaders();
-	for (vector<string>::const_iterator it = loaders.begin();
-	     it != loaders.end(); ++it)
-		if (converters.IsReachable(format, *it))
-			return true;
-	return false;
-}
-#endif
-
-
 vector<Format const *> const Importer::GetImportableFormats()
 {
 	vector<string> loaders = Loaders();
-	vector<Format const *> result = 
-		converters.GetReachableTo(loaders[0], true);
+	vector<Format const *> result =
+		converters.getReachableTo(loaders[0], true);
 	for (vector<string>::const_iterator it = loaders.begin() + 1;
 	     it != loaders.end(); ++it) {
 		vector<Format const *> r =
-			converters.GetReachableTo(*it, false);
+			converters.getReachableTo(*it, false);
 		result.insert(result.end(), r.begin(), r.end());
 	}
 	return result;