#include "GraphicsLoader.h"
#include "PreviewLoader.h"
-#include "support/filename.h"
-#include "support/lyxlib.h"
+#include "support/FileName.h"
#include <boost/bind.hpp>
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-
-using support::FileName;
-
namespace graphics {
class PreviewImage::Impl : public boost::signals::trackable {
PreviewImage::~PreviewImage()
-{}
-
-
-string const & PreviewImage::snippet() const
{
- return pimpl_->snippet_;
+ delete pimpl_;
}
-int PreviewImage::ascent() const
+string const & PreviewImage::snippet() const
{
- Image const * const image = pimpl_->iloader_.image();
- if (!image)
- return 0;
-
- return int(pimpl_->ascent_frac_ * double(image->getHeight()));
+ return pimpl_->snippet_;
}
-int PreviewImage::descent() const
+Dimension PreviewImage::dim() const
{
+ Dimension dim;
Image const * const image = pimpl_->iloader_.image();
if (!image)
- return 0;
+ return dim;
- // Avoids rounding errors.
- return image->getHeight() - ascent();
-}
-
-
-int PreviewImage::width() const
-{
- Image const * const image = pimpl_->iloader_.image();
- return image ? image->getWidth() : 0;
+ dim.asc = int(pimpl_->ascent_frac_ * double(image->height()));
+ dim.des = image->height() - dim.asc;
+ dim.wid = image->width();
+ return dim;
}
PreviewImage::Impl::~Impl()
{
- support::unlink(iloader_.filename());
+ iloader_.filename().removeFile();
}
case ErrorLoading:
case ErrorGeneratingPixmap:
case ErrorUnknown:
- //lyx::unlink(iloader_.filename());
+ //iloader_.filename().removeFile();
ploader_.remove(snippet_);
break;
case Ready:
- support::unlink(iloader_.filename());
+ iloader_.filename().removeFile();
break;
}
ploader_.emitSignal(parent_);