X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsConverter.cpp;h=ebb074cb4112cf7556ec3cd187a9fe9cf4318eeb;hb=338cef2a976d5bf36c334d2cc8ce437da7f6d815;hp=83d895edd7623b8c4badf029fd91af2a69621910;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git

diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
index 83d895edd7..ebb074cb41 100644
--- a/src/graphics/GraphicsConverter.cpp
+++ b/src/graphics/GraphicsConverter.cpp
@@ -37,7 +37,7 @@ namespace lyx {
 
 namespace graphics {
 
-class Converter::Impl : public boost::signals::trackable {
+class Converter::Impl : public boost::signals2::trackable {
 public:
 	///
 	Impl(FileName const &, string const &, string const &, string const &);
@@ -55,7 +55,7 @@ public:
 	/** At the end of the conversion process inform the outside world
 	 *  by emitting a signal.
 	 */
-	typedef boost::signal<void(bool)> SignalType;
+	typedef boost::signals2::signal<void(bool)> SignalType;
 	///
 	SignalType finishedConversion;
 
@@ -97,7 +97,7 @@ void Converter::startConversion() const
 }
 
 
-boost::signals::connection Converter::connect(slot_type const & slot) const
+boost::signals2::connection Converter::connect(slot_type const & slot) const
 {
 	return pimpl_->finishedConversion.connect(slot);
 }
@@ -324,13 +324,15 @@ static void build_script(string const & from_file,
 		ostringstream os;
 		os << os::python() << ' '
 		   << commandPrep("$$s/scripts/convertDefault.py") << ' ';
-		if (!from_format.empty())
-			os << strip_digit(from_format) << ':';
+		if (from_format.empty())
+			os << "unknown ";
+		else
+			os << strip_digit(from_format) << ' ';
 		// The extra " quotes around infile and outfile are needed
 		// because the filename may contain spaces and it is used
 		// as argument of os.system().
 		os << "' + '\"' + infile + '\"' + ' "
-		   << strip_digit(to_format) << ":' + '\"' + outfile + '\"' + '";
+		   << strip_digit(to_format) << " ' + '\"' + outfile + '\"' + '";
 		string const command = os.str();
 
 		LYXERR(Debug::GRAPHICS,
@@ -356,16 +358,16 @@ static void build_script(string const & from_file,
 		// Build the conversion command
 		string const infile      = outfile;
 		string const infile_base = changeExtension(infile, string());
-		outfile = conv.result_file.empty()
-			? addExtension(to_base, conv.To->extension())
-			: addName(subst(conv.result_dir,
+		outfile = conv.result_file().empty()
+			? addExtension(to_base, conv.To()->extension())
+			: addName(subst(conv.result_dir(),
 					token_base, infile_base),
-				  subst(conv.result_file,
+				  subst(conv.result_file(),
 					token_base, onlyFileName(infile_base)));
 
 		// If two formats share the same extension we may get identical names
-		if (outfile == infile && conv.result_file.empty()) {
-			TempFile tempfile(addExtension("gconvertXXXXXX", conv.To->extension()));
+		if (outfile == infile && conv.result_file().empty()) {
+			TempFile tempfile(addExtension("gconvertXXXXXX", conv.To()->extension()));
 			tempfile.setAutoRemove(false);
 			outfile = tempfile.name().toFilesystemEncoding();
 		}
@@ -381,7 +383,7 @@ static void build_script(string const & from_file,
 
 		// See comment about extra " quotes above (although that
 		// applies only for the first loop run here).
-		string command = conv.command;
+		string command = conv.command();
 		command = subst(command, token_from,  "' + '\"' + infile + '\"' + '");
 		command = subst(command, token_base,  "' + '\"' + infile_base + '\"' + '");
 		command = subst(command, token_to,    "' + '\"' + outfile + '\"' + '");