Fix InsetInclude properly. Data is now stored in an InsetCommandParams

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

diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C
index 13b4b91206c64c52c810ddd7279bc3c0388a42da..b75095ecd0fca4d1514d0be53f2f3638d6183334 100644 (file)
--- a/src/graphics/GraphicsConverter.C
+++ b/src/graphics/GraphicsConverter.C
@@ -13,23 +13,19 @@
 #include "GraphicsConverter.h"
 
 #include "converter.h"
-#include "format.h"
 #include "debug.h"
+#include "format.h"
 
 #include "support/filetools.h"
-#include "support/forkedcall.h"
 #include "support/forkedcallqueue.h"
 #include "support/tostr.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 
 #include <boost/bind.hpp>
-#include <boost/signals/trackable.hpp>
 
-#include "Lsstream.h"
-#include "support/LOstream.h"
+#include "support/std_sstream.h"
 #include <fstream>
-#include <sys/types.h> // needed for pid_t
 
 namespace support = lyx::support;
 
@@ -47,6 +43,8 @@ using support::unlink;
 
 using std::endl;
 using std::ostream;
+using std::ostringstream;
+
 
 namespace lyx {
 namespace graphics {
@@ -179,7 +177,7 @@ Converter::Impl::Impl(string const & from_file,   string const & to_file_base,
 
                lyxerr[Debug::GRAPHICS] << "\tConversion script:"
                        << "\n--------------------------------------\n"
-                       << STRCONV(script.str())
+                       << script.str()
                        << "\n--------------------------------------\n";
 
                // Output the script to file.
@@ -191,7 +189,7 @@ Converter::Impl::Impl(string const & from_file,   string const & to_file_base,
                if (!fs.good())
                        return;
 
-               fs << STRCONV(script.str());
+               fs << script.str();
                fs.close();
 
                // The command needed to run the conversion process
@@ -261,7 +259,7 @@ string const move_file(string const & from_file, string const & to_file)
                << "\t'rm' -f ${fromfile}\n"
                << "}\n";
 
-       return STRCONV(command.str());
+       return command.str();
 }