LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / exporter.C

diff --git a/src/exporter.C b/src/exporter.C
index 39ff61944074f47a8a44a6d531f8ba185f7136e0..762428fa5d9ceed79af18bd00dee98049c3901ad 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -36,21 +36,25 @@
 
 #include <boost/filesystem/operations.hpp>
 
-using lyx::support::addName;
-using lyx::support::bformat;
-using lyx::support::changeExtension;
-using lyx::support::contains;
-using lyx::support::makeAbsPath;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyFilename;
-using lyx::support::onlyPath;
-using lyx::support::package;
-using lyx::support::prefixIs;
+
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::changeExtension;
+using support::contains;
+using support::makeAbsPath;
+using support::makeDisplayPath;
+using support::onlyFilename;
+using support::onlyPath;
+using support::package;
+using support::prefixIs;
 
 using std::find;
 using std::string;
 using std::vector;
 
+namespace Alert = frontend::Alert;
 namespace fs = boost::filesystem;
 
 namespace {
@@ -74,8 +78,8 @@ vector<string> const Backends(Buffer const & buffer)
 int checkOverwrite(string const & filename)
 {
        if (fs::exists(filename)) {
-               string text = bformat(_("The file %1$s already exists.\n\n"
-                                       "Do you want to over-write that file?"),
+               docstring text = bformat(_("The file %1$s already exists.\n\n"
+                                                    "Do you want to over-write that file?"),
                                      makeDisplayPath(filename));
                return Alert::prompt(_("Over-write file?"),
                                     text, 0, 2,
@@ -245,7 +249,7 @@ bool Exporter::Export(Buffer * buffer, string const & format,
                                          result_file, result_file,
                                          status == FORCE);
                        buffer->message(bformat(_("Document exported as %1$s "
-                                                 "to file `%2$s'"),
+                                                              "to file `%2$s'"),
                                                formats.prettyName(format),
                                                makeDisplayPath(result_file)));
                } else {
@@ -319,7 +323,7 @@ void ExportData::addExternalFile(string const & format,
                                 string const & sourceName,
                                 string const & exportName)
 {
-       BOOST_ASSERT(lyx::support::absolutePath(sourceName));
+       BOOST_ASSERT(support::absolutePath(sourceName));
 
        // Make sure that we have every file only once, otherwise copyFile()
        // would ask several times if it should overwrite a file.
@@ -345,3 +349,6 @@ ExportData::externalFiles(string const & format) const
                return cit->second;
        return vector<ExportedFile>();
 }
+
+
+} // namespace lyx