Rename files in src/support, step one.

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

diff --git a/src/graphics/GraphicsConverter.h b/src/graphics/GraphicsConverter.h
index 282730bfb3ccbfddeabc37957a2a5d6e7e22d05a..d69c13fceff8cb861b7cee53a8438273eb6cd26a 100644 (file)
--- a/src/graphics/GraphicsConverter.h
+++ b/src/graphics/GraphicsConverter.h
@@ -17,25 +17,27 @@
 #ifndef GRAPHICSCONVERTER_H
 #define GRAPHICSCONVERTER_H
 
-#include "support/std_string.h"
-#include <boost/signals/signal1.hpp>
 #include <boost/scoped_ptr.hpp>
+#include <boost/signal.hpp>
 #include <boost/utility.hpp>
 
 namespace lyx {
+
+namespace support { class FileName; }
+
 namespace graphics {
 
 class Converter : boost::noncopyable {
 public:
        /// Can the conversion be performed?
-       static bool isReachable(string const & from_format_name,
-                               string const & to_format_name);
+       static bool isReachable(std::string const & from_format_name,
+                               std::string const & to_format_name);
 
        /** One Converter per conversion ensures that the (hidden) signal
         *  is always connected to the expected slot.
         */
-       Converter(string const & from_file,   string const & to_file_base,
-                 string const & from_format, string const & to_format);
+       Converter(support::FileName const & from_file, std::string const & to_file_base,
+                 std::string const & from_format, std::string const & to_format);
 
        /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
        ~Converter();
@@ -47,7 +49,8 @@ public:
         *  finished.
         *  If the conversion is succesful, then the listener is passed \c true.
         */
-       typedef boost::signal1<void, bool>::slot_type slot_type;
+       typedef boost::signal<void(bool)> sig_type;
+       typedef sig_type::slot_type slot_type;
        ///
        boost::signals::connection connect(slot_type const &) const;
 
@@ -56,7 +59,7 @@ public:
         *  If conversion fails or has not been completed, however, it
         *  returns an empty string.
         */
-       string const & convertedFile() const;
+       support::FileName const & convertedFile() const;
 
 private:
        /// Use the Pimpl idiom to hide the internals.