* remove various xforms relicts, in particular:

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index d79ed4be5f1826344a142e5107c934f11c44fa83..1c84d3d147e22eef988f5e8786daf435ff908c96 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -1,14 +1,15 @@
 /**
- * \file exporter.C
+ * \file importer.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
-
 #include <config.h>
 
 #include "importer.h"
@@ -16,6 +17,7 @@
 #include "format.h"
 #include "frontends/LyXView.h"
 #include "funcrequest.h"
+#include "lyx_cb.h"
 
 #include "bufferlist.h"
 #include "support/filetools.h"
@@ -23,23 +25,25 @@
 #include "gettext.h"
 #include "BufferView.h"
 
-#include <algorithm>
+using lyx::support::bformat;
+using lyx::support::changeExtension;
+using lyx::support::makeDisplayPath;
 
-using std::vector;
 using std::find;
+using std::string;
+using std::vector;
 
 
 extern BufferList bufferlist;
-extern void InsertAsciiFile(BufferView *, string const &, bool);
 
 
 bool Importer::Import(LyXView * lv, string const & filename,
                      string const & format)
 {
-       string const displaypath = MakeDisplayPath(filename);
+       string const displaypath = makeDisplayPath(filename);
        lv->message(bformat(_("Importing %1$s..."), displaypath));
 
-       string const lyxfile = ChangeExtension(filename, ".lyx");
+       string const lyxfile = changeExtension(filename, ".lyx");
 
        string loader_format;
        vector<string> loaders = Loaders();
@@ -57,7 +61,7 @@ bool Importer::Import(LyXView * lv, string const & filename,
                if (loader_format.empty()) {
                        Alert::error(_("Couldn't import file"),
                                     bformat(_("No information for importing the format %1$s."),
-                                        formats.prettyName(format)));
+                                        formats.prettyName(format)));
                        return false;
                }
        } else
@@ -65,16 +69,14 @@ 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()->newFile(lyxfile, string(), true);
                bool as_paragraphs = loader_format == "textparagraph";
                string filename2 = (loader_format == format) ? filename
-                       : ChangeExtension(filename,
+                       : changeExtension(filename,
                                          formats.extension(loader_format));
-               InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
+               insertAsciiFile(lv->view(), filename2, as_paragraphs);
                lv->dispatch(FuncRequest(LFUN_MARK_OFF));
        }