de.po: fix doubled accelerator keys

[lyx.git] / src / graphics / GraphicsConverter.cpp

diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
index 9f736803cd1ff07c46a35b5e822587acd37480b4..6242ed91cb8e4b14e436cffbe4665ff5afc0a559 100644 (file)
--- a/src/graphics/GraphicsConverter.cpp
+++ b/src/graphics/GraphicsConverter.cpp
@@ -15,12 +15,13 @@
 #include "Converter.h"
 #include "Format.h"
 
+#include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/ForkedCalls.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/os.h"
 
 #include <boost/bind.hpp>
@@ -28,28 +29,11 @@
 #include <sstream>
 #include <fstream>
 
-namespace support = lyx::support;
-
-using support::addExtension;
-using support::changeExtension;
-using support::FileName;
-using support::ForkedCall;
-using support::getExtension;
-using support::libScriptSearch;
-using support::onlyPath;
-using support::onlyFilename;
-using support::quoteName;
-using support::quote_python;
-using support::subst;
-using support::tempName;
-
-using std::endl;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
+
 namespace graphics {
 
 class Converter::Impl : public boost::signals::trackable {
@@ -160,12 +144,12 @@ Converter::Impl::Impl(FileName const & from_file, string const & to_file_base,
        script_file_ = FileName(onlyPath(to_file_base) + "lyxconvert" +
                convert<string>(counter++) + ".py");
 
-       std::ofstream fs(script_file_.toFilesystemEncoding().c_str());
+       ofstream fs(script_file_.toFilesystemEncoding().c_str());
        if (!fs.good()) {
                lyxerr << "Unable to write the conversion script to \""
                       << script_file_ << '\n'
                       << "Please check your directory permissions."
-                      << std::endl;
+                      << endl;
                return;
        }
 
@@ -176,7 +160,7 @@ Converter::Impl::Impl(FileName const & from_file, string const & to_file_base,
        // We create a dummy command for ease of understanding of the
        // list of forked processes.
        // Note: 'python ' is absolutely essential, or execvp will fail.
-       script_command_ = support::os::python() + ' ' +
+       script_command_ = os::python() + ' ' +
                quoteName(script_file_.toFilesystemEncoding()) + ' ' +
                quoteName(onlyFilename(from_file.toFilesystemEncoding())) + ' ' +
                quoteName(to_format);
@@ -193,7 +177,7 @@ void Converter::Impl::startConversion()
        }
 
        ForkedCall::SignalTypePtr ptr =
-               support::ForkedCallQueue::add(script_command_);
+               ForkedCallQueue::add(script_command_);
        ptr->connect(boost::bind(&Impl::converted, this, _1, _2));
 }
 
@@ -274,7 +258,7 @@ static void build_script(FileName const & from_file,
                  string const & to_format,
                  ostream & script)
 {
-       BOOST_ASSERT(from_format != to_format);
+       LASSERT(from_format != to_format, /**/);
        LYXERR(Debug::GRAPHICS, "build_script ... ");
        typedef Converters::EdgePath EdgePath;
 
@@ -310,8 +294,7 @@ static void build_script(FileName const & from_file,
        // Remember to remove the temp file because we only want the name...
        static int counter = 0;
        string const tmp = "gconvert" + convert<string>(counter++);
-       FileName const to_base(tempName(FileName(), tmp));
-       to_base.removeFile();
+       FileName const to_base = FileName::tempName(tmp);
 
        // Create a copy of the file in case the original name contains
        // problematic characters like ' or ". We can work around that problem
@@ -342,7 +325,7 @@ static void build_script(FileName const & from_file,
                       << quoteName(to_file, quote_python) << ")\n";
 
                ostringstream os;
-               os << support::os::python() << ' '
+               os << os::python() << ' '
                   << libScriptSearch("$$s/scripts/convertDefault.py",
                                      quote_python) << ' ';
                if (!from_format.empty())