#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>
namespace lyx {
+
+namespace support { class FileName; }
+
namespace graphics {
class Params;
*/
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() {}
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;
* 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(support::FileName const & filename);
/** Generate the pixmap.
* Uses the params to decide on color, grayscale etc.
* 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(support::FileName const & filename) = 0;
/** Generate the pixmap.
* Uses the params to decide on color, grayscale etc.
inline
-void Image::load(string const & filename)
+void Image::load(support::FileName const & filename)
{
return load_impl(filename);
}