John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 8b7193954714b8cdf0e17414fcc8646f8be44466..65c3ce185ce8af390fb736a275e53ea5a155d225 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -23,7 +23,7 @@
 
 #include "bufferlist.h"
 #include "support/filetools.h"
-#include "lyx_gui_misc.h" //WriteAlert
+#include "frontends/Alert.h"
 #include "gettext.h"
 #include "BufferView.h"
 
@@ -49,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;
@@ -58,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
@@ -76,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
@@ -104,11 +104,11 @@ vector<Format const *> const Importer::GetImportableFormats()
 {
        vector<string> loaders = Loaders();
        vector<Format const *> result = 
-               converters.GetReachableTo(loaders[0], true);
+               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;