#include "support/FileName.h"
#include "support/filetools.h"
#include "support/FileMonitor.h"
+#include "support/lassert.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
+#include "support/TempFile.h"
using namespace std;
using namespace lyx::support;
bool remove_loaded_file_;
/// The image and its loading status.
- boost::shared_ptr<Image> image_;
+ shared_ptr<Image> image_;
///
ImageStatus status_;
remove_loaded_file_(false),
status_(WaitingToLoad)
{
- monitor_.connect(boost::bind(&Impl::startLoading, this));
+ monitor_.connect(bind(&Impl::startLoading, this));
}
file_to_load_.erase();
to_.erase();
- if (image_.get())
+ if (image_)
image_.reset();
status_ = WaitingToLoad;
FormatList const & formats = Cache::get().loadableFormats();
// There must be a format to load from.
- LASSERT(!formats.empty(), /**/);
+ LASSERT(!formats.empty(), return string());
// Use the standard converter if we don't know the format to load
// from.
return false;
}
- zipped_ = filename_.isZippedFile();
+ zipped_ = formats.isZippedFile(filename_);
if (zipped_) {
- unzipped_filename_ = FileName::tempName(
- filename_.toFilesystemEncoding());
+ TempFile tempfile(filename_.toFilesystemEncoding());
+ tempfile.setAutoRemove(false);
+ unzipped_filename_ = tempfile.name();
if (unzipped_filename_.empty()) {
status_ = ErrorConverting;
LYXERR(Debug::GRAPHICS, "\tCould not create temporary file.");
filename = filename_;
}
- docstring const displayed_filename = makeDisplayPath(filename_.absFilename());
+ docstring const displayed_filename = makeDisplayPath(filename_.absFileName());
LYXERR(Debug::GRAPHICS, "[CacheItem::Impl::convertToDisplayFormat]\n"
<< "\tAttempting to convert image file: " << filename
<< "\n\twith displayed filename: " << to_utf8(displayed_filename));
// Add some stuff to create a uniquely named temporary file.
// This file is deleted in loadImage after it is loaded into memory.
- FileName const to_file_base = FileName::tempName("CacheItem");
+ TempFile tempfile("CacheItem");
+ tempfile.setAutoRemove(false);
+ FileName const to_file_base = tempfile.name();
remove_loaded_file_ = true;
// 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_->connect(boost::bind(&Impl::imageConverted, this, _1));
+ converter_.reset(new Converter(filename, to_file_base.absFileName(), from, to_));
+ converter_->connect(bind(&Impl::imageConverted, this, _1));
converter_->startConversion();
}