Use UTF8 for LaTeX export.

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

diff --git a/src/graphics/GraphicsImage.h b/src/graphics/GraphicsImage.h
index 7200a8ce341f0de70ffe7a67a36c3ecfcd414c08..5364aa1dbb7263c3e3321f5514cf2addbb4fcc21 100644 (file)
--- a/src/graphics/GraphicsImage.h
+++ b/src/graphics/GraphicsImage.h
@@ -24,11 +24,9 @@
 #ifndef GRAPHICSIMAGE_H
 #define GRAPHICSIMAGE_H
 
-#include "support/std_string.h"
-
+#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/function/function0.hpp>
-#include <boost/signals/signal1.hpp>
+#include <boost/signal.hpp>
 
 #include <vector>
 #include <utility>
@@ -45,12 +43,12 @@ public:
         */
        typedef boost::shared_ptr<Image> ImagePtr;
        ///
-       static boost::function0<ImagePtr> newImage;
+       static boost::function<ImagePtr()> newImage;
 
-       /// Return the list of loadable formats.
-       typedef std::vector<string> FormatList;
        ///
-       static boost::function0<FormatList> loadableFormats;
+       typedef std::vector<std::string> FormatList;
+       /// Return the list of loadable formats.
+       static boost::function<FormatList()> loadableFormats;
 
        ///
        virtual ~Image() {}
@@ -68,9 +66,9 @@ public:
        bool isDrawable() const;
 
        /** At the end of the loading process inform the outside world
-        *  by emitting a signal.
+        *  by emitting a signal
         */
-       typedef boost::signal1<void, bool> SignalType;
+       typedef boost::signal<void(bool)> SignalType;
        ///
        SignalType finishedLoading;
 
@@ -78,7 +76,7 @@ public:
         *  The caller should expect this process to be asynchronous and
         *  so should connect to the "finished" signal above.
         */
-       void load(string const & filename);
+       void load(std::string const & filename);
 
        /** Generate the pixmap.
         *  Uses the params to decide on color, grayscale etc.
@@ -124,7 +122,7 @@ private:
         *  The caller should expect this process to be asynchronous and
         *  so should connect to the "finished" signal above.
         */
-       virtual void load_impl(string const & filename) = 0;
+       virtual void load_impl(std::string const & filename) = 0;
 
        /** Generate the pixmap.
         *  Uses the params to decide on color, grayscale etc.
@@ -172,7 +170,7 @@ bool Image::isDrawable() const
 
 
 inline
-void Image::load(string const & filename)
+void Image::load(std::string const & filename)
 {
        return load_impl(filename);
 }