X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FExporter.cpp;h=85d5eb3d5551862f7791fc21897651da4124a5bc;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=326358560cf8cc4e6a0800ffb60903c305a6afbf;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git diff --git a/src/Exporter.cpp b/src/Exporter.cpp index 326358560c..85d5eb3d55 100644 --- a/src/Exporter.cpp +++ b/src/Exporter.cpp @@ -5,11 +5,11 @@ * * \author unknown * \author Alfredo Braunstein - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean Marc Lasgouttes * \author Angus Leeming * \author John Levon - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -30,17 +30,10 @@ #include using namespace std; +using namespace lyx::support; namespace lyx { -using support::bformat; -using support::FileName; -using support::makeDisplayPath; -using support::onlyFilename; -using support::onlyPath; -using support::package; -using support::prefixIs; - namespace Alert = frontend::Alert; /// ask the user what to do if a file already exists @@ -122,7 +115,7 @@ void ExportData::addExternalFile(string const & format, { // Make sure that we have every file only once, otherwise copyFile() // would ask several times if it should overwrite a file. - vector & files = externalfiles[format]; + vector & files = externalfiles_[format]; ExportedFile file(sourceName, exportName); if (find(files.begin(), files.end(), file) == files.end()) files.push_back(file); @@ -139,8 +132,8 @@ void ExportData::addExternalFile(string const & format, vector const ExportData::externalFiles(string const & format) const { - FileMap::const_iterator cit = externalfiles.find(format); - if (cit != externalfiles.end()) + FileMap::const_iterator cit = externalfiles_.find(format); + if (cit != externalfiles_.end()) return cit->second; return vector(); }