#include "support/debug.h"
#include "support/Timeout.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <set>
#include <queue>
LoaderQueue::LoaderQueue() : timer(s_millisecs_, Timeout::ONETIME),
running_(false)
{
- timer.timeout.connect(boost::bind(&LoaderQueue::loadNext, this));
+ timer.timeout.connect(bind(&LoaderQueue::loadNext, this));
}
//
/////////////////////////////////////////////////////////////////////
-typedef boost::shared_ptr<Image> ImagePtr;
+typedef shared_ptr<Image> ImagePtr;
class Loader::Impl : public boost::signals::trackable {
public:
// signal needs to be disconnected.
sc_.disconnect();
cached_item_.reset();
- Cache::get().remove(old_file);
+ if (status_ != Converting) {
+ Cache::get().remove(old_file);
+ } else {
+ //TODO remove cache item when it is not busy any more, see #7163
+ }
}
status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad;
if (continue_monitoring && !cached_item_->monitoring())
cached_item_->startMonitoring();
- sc_ = cached_item_->connect(boost::bind(&Impl::statusChanged, this));
+ sc_ = cached_item_->connect(bind(&Impl::statusChanged, this));
}