* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include "support/filetools.h"
#include "lyx_gui_misc.h" //WriteAlert
#include "gettext.h"
+#include "BufferView.h"
using std::vector;
using std::find;
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");
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;
if (loader_format.empty()) {
WriteAlert(_("Can not import file"),
_("No information for importing from ")
- + formats.PrettyName(format));
+ + formats.prettyName(format));
return false;
}
} else
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
{
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;