MultiLevelJsonBase.cpp   MultiLevelJsonBase.cpp 
skipping to change at line 93 skipping to change at line 93
tile->temporaryResultMap = MultiLevelJsonBase::loadFromJSON( buf, qZcompressed, gzCompressed); tile->temporaryResultMap = MultiLevelJsonBase::loadFromJSON( buf, qZcompressed, gzCompressed);
} }
catch (std::runtime_error e) catch (std::runtime_error e)
{ {
qWarning() << "WARNING : Can't parse loaded JSON description : " << e.what(); qWarning() << "WARNING : Can't parse loaded JSON description : " << e.what();
tile->errorOccured = true; tile->errorOccured = true;
} }
} }
MultiLevelJsonBase::MultiLevelJsonBase(MultiLevelJsonBase* parent) : StelSk yLayer(parent) MultiLevelJsonBase::MultiLevelJsonBase(MultiLevelJsonBase* parent) : StelSk yLayer(parent)
, errorOccured(false)
, downloading(false)
, httpReply(NULL)
, deletionDelay(2.)
, loadThread(NULL)
, timeWhenDeletionScheduled(-1.) // Avoid tiles to be deleted just a
fter constructed
, loadingState(false)
, lastPercent(0)
{ {
errorOccured = false;
httpReply = NULL;
downloading = false;
loadThread = NULL;
loadingState = false;
lastPercent = 0;
// Avoid tiles to be deleted just after constructed
timeWhenDeletionScheduled = -1.;
deletionDelay = 2.;
if (parent!=NULL) if (parent!=NULL)
{ {
deletionDelay = parent->deletionDelay; deletionDelay = parent->deletionDelay;
} }
} }
void MultiLevelJsonBase::initFromUrl(const QString& url) void MultiLevelJsonBase::initFromUrl(const QString& url)
{ {
const MultiLevelJsonBase* parent = qobject_cast<MultiLevelJsonBase*> (QObject::parent()); const MultiLevelJsonBase* parent = qobject_cast<MultiLevelJsonBase*> (QObject::parent());
contructorUrl = url; contructorUrl = url;
 End of changes. 2 change blocks. 
10 lines changed or deleted 9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/