#include "support/filetools.h"
#include "support/FileMonitor.h"
#include "support/lassert.h"
+#include "support/unique_ptr.h"
#include "support/bind.h"
#include "support/TempFile.h"
namespace graphics {
-class CacheItem::Impl : public boost::signals::trackable {
+class CacheItem::Impl : public boost::signals2::trackable {
public:
///
bool remove_loaded_file_;
/// The image and its loading status.
- shared_ptr<Image> image_;
+ std::shared_ptr<Image> image_;
///
ImageStatus status_;
/// This signal is emitted when the image loading status changes.
- boost::signal<void()> statusChanged;
+ boost::signals2::signal<void()> statusChanged;
/// The connection of the signal ConvProcess::finishedConversion,
- boost::signals::connection cc_;
+ boost::signals2::connection cc_;
///
unique_ptr<Converter> converter_;
}
-boost::signals::connection CacheItem::connect(slot_type const & slot) const
+boost::signals2::connection CacheItem::connect(slot_type const & slot) const
{
return pimpl_->statusChanged.connect(slot);
}
if (cc_.connected())
cc_.disconnect();
- if (converter_.get())
+ if (converter_)
converter_.reset();
}
string const text = success ? "succeeded" : "failed";
LYXERR(Debug::GRAPHICS, "Image conversion " << text << '.');
- file_to_load_ = converter_.get() ?
- FileName(converter_->convertedFile()) : FileName();
+ file_to_load_ = converter_ ? FileName(converter_->convertedFile())
+ : FileName();
converter_.reset();
cc_.disconnect();
// Connect a signal to this->imageConverted and pass this signal to
// the graphics converter so that we can load the modified file
// on completion of the conversion process.
- converter_.reset(new Converter(filename, to_file_base.absFileName(), from, to_));
+ converter_ = make_unique<Converter>(filename, to_file_base.absFileName(),
+ from, to_);
converter_->connect(bind(&Impl::imageConverted, this, _1));
converter_->startConversion();
}