X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FExporter.cpp;h=85d5eb3d5551862f7791fc21897651da4124a5bc;hb=ce2e071cdfde88864c1524818d66cbae52273502;hp=e90c23f4e05543280edae110f86d18e01bd9189e;hpb=f625dd7ea0770f0f1151401ed90d0ef2146595d7;p=lyx.git

diff --git a/src/Exporter.cpp b/src/Exporter.cpp
index e90c23f4e0..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.
  */
@@ -18,29 +18,22 @@
 
 #include "Exporter.h"
 
-#include "gettext.h"
 #include "Mover.h"
+
 #include "frontends/alert.h"
 
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Package.h"
 
-using std::find;
-using std::string;
-using std::vector;
+#include <algorithm>
 
+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<ExportedFile> & files = externalfiles[format];
+	vector<ExportedFile> & 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<ExportedFile> 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<ExportedFile>();
 }