couple more fixes

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 144b76200b3973887f12afd4bfbb5fa527e6e533..03eb4002b92be0dc35a300a86a8c16468c248f9c 100644 (file)
--- 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,12 +18,12 @@
 
 #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"
 
@@ -34,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");
 
@@ -58,7 +58,7 @@ 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));
                        return false;
@@ -77,8 +77,8 @@ bool Importer::Import(LyXView * lv, string const & filename,
                string filename2 = (loader_format == format) ? filename
                        : ChangeExtension(filename,
                                          formats.extension(loader_format));
-               InsertAsciiFile(lv->view(), filename2, as_paragraphs);
-               lv->getLyXFunc()->dispatch(LFUN_MARK_OFF);
+               InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
+               lv->dispatch(FuncRequest(LFUN_MARK_OFF));
        }
 
        // we are done
@@ -87,23 +87,10 @@ 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 = 
+       vector<Format const *> result =
                converters.getReachableTo(loaders[0], true);
        for (vector<string>::const_iterator it = loaders.begin() + 1;
             it != loaders.end(); ++it) {