MultiLevelJsonBase.cpp   MultiLevelJsonBase.cpp 
skipping to change at line 33 skipping to change at line 33
#include "StelProjector.hpp" #include "StelProjector.hpp"
#include "StelCore.hpp" #include "StelCore.hpp"
#include "kfilterdev.h" #include "kfilterdev.h"
#include "StelUtils.hpp" #include "StelUtils.hpp"
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QHttp> #include <QHttp>
#include <QUrl> #include <QUrl>
#include <QDir>
#include <QBuffer> #include <QBuffer>
#include <QThread> #include <QThread>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QNetworkReply> #include <QNetworkReply>
#include <stdexcept> #include <stdexcept>
// #include <QNetworkDiskCache> // #include <QNetworkDiskCache>
// Init statics // Init statics
skipping to change at line 149 skipping to change at line 150
QFile f(fileName); QFile f(fileName);
f.open(QIODevice::ReadOnly); f.open(QIODevice::ReadOnly);
const bool compressed = fileName.endsWith(".qZ"); const bool compressed = fileName.endsWith(".qZ");
const bool gzCompressed = fileName.endsWith(".gz"); const bool gzCompressed = fileName.endsWith(".gz");
try try
{ {
loadFromQVariantMap(loadFromJSON(f, compressed, gzCo mpressed)); loadFromQVariantMap(loadFromJSON(f, compressed, gzCo mpressed));
} }
catch (std::runtime_error e) catch (std::runtime_error e)
{ {
qWarning() << "WARNING : Can't parse JSON descriptio n: " << fileName << ": " << e.what(); qWarning() << "WARNING : Can't parse JSON descriptio n: " << QDir::toNativeSeparators(fileName) << ": " << e.what();
errorOccured = true; errorOccured = true;
f.close(); f.close();
return; return;
} }
f.close(); f.close();
} }
else else
{ {
// Use a very short deletion delay to ensure that tile which are outside screen are discared before they are even downloaded // Use a very short deletion delay to ensure that tile which are outside screen are discared before they are even downloaded
// This is useful to reduce bandwidth when the user moves ra pidely // This is useful to reduce bandwidth when the user moves ra pidely
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 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/