X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fimporter.C;h=3e6ccf69e09c3aa9f1ef4dafb818e27504864371;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=a486d7b8c8890ea2de7d7189a30ee6b5aae3cfdc;hpb=83acbbd5237373926c629855379e1df9a04209b2;p=lyx.git

diff --git a/src/importer.C b/src/importer.C
index a486d7b8c8..3e6ccf69e0 100644
--- a/src/importer.C
+++ b/src/importer.C
@@ -1,44 +1,46 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file importer.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
-
-#include <config.h>
+ * \author unknown
+ *
+ * Full author contact details are available in file CREDITS
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
-#include <algorithm>
+#include <config.h>
 
 #include "importer.h"
 #include "converter.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
+#include "format.h"
+#include "frontends/LyXView.h"
+#include "funcrequest.h"
 
 #include "bufferlist.h"
+#include "buffer_funcs.h"
 #include "support/filetools.h"
-#include "lyx_gui_misc.h" //WriteAlert
+#include "frontends/Alert.h"
 #include "gettext.h"
+#include "BufferView.h"
+
+#include <algorithm>
+
+using namespace lyx::support;
 
 using std::vector;
 using std::find;
 
+
 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);
-	string const s1 = _("Importing") + ' ' + displaypath + "...";
-	lv->message(s1);
+	lv->message(bformat(_("Importing %1$s..."), displaypath));
 
 	string const lyxfile = ChangeExtension(filename, ".lyx");
 
@@ -47,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;
@@ -56,9 +58,9 @@ bool Importer::Import(LyXView * lv, string const & filename,
 			}
 		}
 		if (loader_format.empty()) {
-			WriteAlert(_("Can not import file"),
-				   _("No information for importing from ")
-				   + formats.PrettyName(format));
+			Alert::error(_("Couldn't import file"),
+				     bformat(_("No information for importing the format %1$s."),
+				         formats.prettyName(format)));
 			return false;
 		}
 	} else
@@ -66,17 +68,15 @@ bool Importer::Import(LyXView * lv, string const & filename,
 
 
 	if (loader_format == "lyx") {
-		Buffer * buffer = bufferlist.loadLyXFile(lyxfile);
-		if (buffer)
-			lv->view()->buffer(buffer);
+		lv->view()->loadLyXFile(lyxfile);
 	} else {
-		lv->view()->buffer(bufferlist.newFile(lyxfile, string(), true));
+		lv->view()->buffer(newFile(lyxfile, string(), true));
 		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
@@ -85,28 +85,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;