* mover.h

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index b37c9f0cfa89e3db9c5ff4c051f277025e01a982..6b27af5191ffbd19048abb7ce2ff46d388061659 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -32,6 +32,7 @@ namespace lyx {
 
 using support::bformat;
 using support::changeExtension;
+using support::FileName;
 using support::makeDisplayPath;
 
 using std::find;
@@ -39,24 +40,24 @@ using std::string;
 using std::vector;
 
 
-bool Importer::Import(LyXView * lv, string const & filename,
+bool Importer::Import(LyXView * lv, FileName const & filename,
                      string const & format, ErrorList & errorList)
 {
-       docstring const displaypath = makeDisplayPath(filename);
+       docstring const displaypath = makeDisplayPath(filename.absFilename());
        lv->message(bformat(_("Importing %1$s..."), displaypath));
 
-       string const lyxfile = changeExtension(filename, ".lyx");
+       FileName const lyxfile(changeExtension(filename.absFilename(), ".lyx"));
 
        string loader_format;
        vector<string> loaders = Loaders();
        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 (theConverters().isReachable(format, *it)) {
                                string const tofile =
-                                       changeExtension(filename,
+                                       changeExtension(filename.absFilename(),
                                                formats.extension(*it));
-                               if (!converters.convert(0, filename, tofile,
+                               if (!theConverters().convert(0, filename, FileName(tofile),
                                                        filename, format, *it, errorList))
                                        return false;
                                loader_format = *it;
@@ -77,16 +78,16 @@ bool Importer::Import(LyXView * lv, string const & filename,
        if (loader_format == "lyx") {
                lv->loadLyXFile(lyxfile);
        } else {
-               Buffer * const b = newFile(lyxfile, string(), true);
+               Buffer * const b = newFile(lyxfile.absFilename(), string(), true);
                if (b)
                        lv->setBuffer(b);
                else
                        return false;
                bool as_paragraphs = loader_format == "textparagraph";
-               string filename2 = (loader_format == format) ? filename
-                       : changeExtension(filename,
+               string filename2 = (loader_format == format) ? filename.absFilename()
+                       : changeExtension(filename.absFilename(),
                                          formats.extension(loader_format));
-               insertAsciiFile(lv->view(), filename2, as_paragraphs);
+               insertPlaintextFile(lv->view(), filename2, as_paragraphs);
                lv->dispatch(FuncRequest(LFUN_MARK_OFF));
        }
 
@@ -100,11 +101,11 @@ vector<Format const *> const Importer::GetImportableFormats()
 {
        vector<string> loaders = Loaders();
        vector<Format const *> result =
-               converters.getReachableTo(loaders[0], true);
+               theConverters().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);
+                       theConverters().getReachableTo(*it, false);
                result.insert(result.end(), r.begin(), r.end());
        }
        return result;