remove noload/don't typeset

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 65c3ce185ce8af390fb736a275e53ea5a155d225..f70b2295ace2ca359379ed7caccac04ff0d0ba2a 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,8 +18,8 @@
 
 #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"
@@ -34,7 +34,7 @@ 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);
@@ -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) {