#include "GraphicsImage.h"
#include "ConverterCache.h"
-#include "debug.h"
+#include "support/debug.h"
#include "Format.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/FileMonitor.h"
-#include "support/lyxlib.h"
#include <boost/bind.hpp>
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::FileMonitor;
-using support::FileName;
-using support::makeDisplayPath;
-using support::onlyFilename;
-using support::tempName;
-using support::unlink;
-using support::unzipFile;
-
-using std::endl;
-using std::string;
-
-
namespace graphics {
class CacheItem::Impl : public boost::signals::trackable {
CacheItem::~CacheItem()
-{}
+{
+ delete pimpl_;
+}
FileName const & CacheItem::filename() const
{
zipped_ = false;
if (!unzipped_filename_.empty())
- unlink(unzipped_filename_);
+ unzipped_filename_.removeFile();
unzipped_filename_.erase();
if (remove_loaded_file_ && !file_to_load_.empty())
- unlink(file_to_load_);
+ file_to_load_.removeFile();
remove_loaded_file_ = false;
file_to_load_.erase();
to_.erase();
converter_.reset();
cc_.disconnect();
- success = !file_to_load_.empty() && file_to_load_.isFileReadable();
+ success = !file_to_load_.empty() && file_to_load_.isReadableFile();
if (!success) {
LYXERR(Debug::GRAPHICS, "Unable to find converted file!");
setStatus(ErrorConverting);
if (zipped_)
- unlink(unzipped_filename_);
+ unzipped_filename_.removeFile();
return;
}
setStatus(Loading);
LYXERR(Debug::GRAPHICS, "Loading image.");
- image_ = Image::newImage();
+ image_.reset(Image::newImage());
cl_.disconnect();
cl_ = image_->finishedLoading.connect(
// Clean up after loading.
if (zipped_)
- unlink(unzipped_filename_);
+ unzipped_filename_.removeFile();
if (remove_loaded_file_ && unzipped_filename_ != file_to_load_)
- unlink(file_to_load_);
+ file_to_load_.removeFile();
cl_.disconnect();
setStatus(Converting);
// First, check that the file exists!
- if (!filename_.isFileReadable()) {
+ if (!filename_.isReadableFile()) {
if (status_ != ErrorNoFile) {
setStatus(ErrorNoFile);
LYXERR(Debug::GRAPHICS, "\tThe file is not readable");
FileName filename;
zipped_ = filename_.isZippedFile();
if (zipped_) {
- unzipped_filename_ = tempName(FileName(), filename_.toFilesystemEncoding());
+ unzipped_filename_ = FileName::tempName(
+ filename_.toFilesystemEncoding());
if (unzipped_filename_.empty()) {
setStatus(ErrorConverting);
LYXERR(Debug::GRAPHICS, "\tCould not create temporary file.");
// 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(tempName(FileName(), "CacheItem"));
+ FileName const to_file_base = FileName::tempName("CacheItem");
remove_loaded_file_ = true;
// Remove the temp file, we only want the name...
// FIXME: This is unsafe!
- unlink(to_file_base);
+ to_file_base.removeFile();
// Connect a signal to this->imageConverted and pass this signal to
// the graphics converter so that we can load the modified file