X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsConverter.cpp;h=817768e489f21d5686ae0578f018a985dbabca50;hb=9abb7db46800e554f57e865a3e768602ffd9d6f1;hp=81ac3c64d38948c2a1387fdaef35bc98d1dc3689;hpb=1aafa6ff77b792e4ddc3454d9604bf9c15588731;p=lyx.git diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp index 81ac3c64d3..817768e489 100644 --- a/src/graphics/GraphicsConverter.cpp +++ b/src/graphics/GraphicsConverter.cpp @@ -28,29 +28,11 @@ #include #include -namespace support = lyx::support; - -using support::addExtension; -using support::changeExtension; -using support::FileName; -using support::ForkedCall; -using support::ForkedCallQueue; -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 { @@ -161,12 +143,12 @@ Converter::Impl::Impl(FileName const & from_file, string const & to_file_base, script_file_ = FileName(onlyPath(to_file_base) + "lyxconvert" + convert(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; } @@ -193,9 +175,8 @@ void Converter::Impl::startConversion() return; } - ForkedCall::SignalTypePtr - ptr = ForkedCallQueue::get().add(script_command_); - + ForkedCall::SignalTypePtr ptr = + support::ForkedCallQueue::add(script_command_); ptr->connect(boost::bind(&Impl::converted, this, _1, _2)); }