lyxstring compile fixes ; small stuff

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index ff506f62abb9d88d2ae780fb001b7165f1d9ab98..8b7193954714b8cdf0e17414fcc8646f8be44466 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -20,10 +20,12 @@
 #include "converter.h"
 #include "LyXView.h"
 #include "lyxfunc.h"
-#include "minibuffer.h"
+
 #include "bufferlist.h"
 #include "support/filetools.h"
 #include "lyx_gui_misc.h" //WriteAlert
+#include "gettext.h"
+#include "BufferView.h"
 
 using std::vector;
 using std::find;
@@ -35,10 +37,12 @@ extern void InsertAsciiFile(BufferView *, string const &, bool);
 bool Importer::Import(LyXView * lv, string const & filename, 
                      string const & format)
 {
-       string displaypath = MakeDisplayPath(filename);
-       lv->getMiniBuffer()->Set(_("Importing"), displaypath, "...");
+       string const displaypath = MakeDisplayPath(filename);
+       ostringstream s1;
+       s1 << _("Importing") << ' ' << displaypath << "...";
+       lv->message(s1.str().c_str());
 
-       string lyxfile = ChangeExtension(filename, ".lyx");
+       string const lyxfile = ChangeExtension(filename, ".lyx");
 
        string loader_format;
        vector<string> loaders = Loaders();
@@ -78,10 +82,11 @@ bool Importer::Import(LyXView * lv, string const & filename,
        }
 
        // we are done
-       lv->getMiniBuffer()->Set(displaypath, _("imported."));
+       lv->message(_("imported."));
        return true;
 }
 
+
 #if 0
 bool Importer::IsImportable(string const & format)
 {
@@ -94,6 +99,7 @@ bool Importer::IsImportable(string const & format)
 }
 #endif
 
+
 vector<Format const *> const Importer::GetImportableFormats()
 {
        vector<string> loaders = Loaders();