fix typo that put too many include paths for most people

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 119be0ea82a2e0c6b8ff067d861db46639894e17..563651d465e372b6db207709067a1845c16f8008 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -1,10 +1,10 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -23,8 +23,9 @@
 
 #include "bufferlist.h"
 #include "support/filetools.h"
-#include "lyx_gui_misc.h" //WriteAlert
+#include "frontends/Alert.h"
 #include "gettext.h"
+#include "BufferView.h"
 
 using std::vector;
 using std::find;
@@ -33,12 +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);
-       string const s1 = _("Importing") + ' ' + displaypath + "...";
-       lv->message(s1);
+       ostringstream s1;
+       s1 << _("Importing") << ' ' << displaypath << "...";
+       lv->message(s1.str().c_str());
 
        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"),
+                       Alert::alert(_("Cannot import file"),
                                   _("No information for importing from ")
-                                  + formats.PrettyName(format));
+                                  + formats.prettyName(format));
                        return false;
                }
        } else
@@ -74,9 +76,9 @@ bool Importer::Import(LyXView * lv, string const & filename,
                bool as_paragraphs = loader_format == "textparagraph";
                string filename2 = (loader_format == format) ? filename
                        : ChangeExtension(filename,
-                                         formats.Extension(loader_format));
+                                         formats.extension(loader_format));
                InsertAsciiFile(lv->view(), filename2, as_paragraphs);
-               lv->getLyXFunc()->Dispatch(LFUN_MARK_OFF);
+               lv->getLyXFunc()->dispatch(LFUN_MARK_OFF);
        }
 
        // we are done
@@ -101,12 +103,12 @@ bool Importer::IsImportable(string const & format)
 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;