Add context menu for outline operations. Choice of words might not be best.

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

diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
index 817768e489f21d5686ae0578f018a985dbabca50..4433f82b0f14aeef7fc37a876ed9869a9e380025 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>
@@ -159,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);
@@ -176,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));
 }
 
@@ -257,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;
 
@@ -293,7 +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));
+       FileName const to_base = FileName::tempName(tmp);
        to_base.removeFile();
 
        // Create a copy of the file in case the original name contains
@@ -325,7 +326,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())