root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-01-18 19:52:09 +01:00
Code Issues Projects Releases Activity

Fixed QT4 build

Browse Source
This commit is contained in:
Martin Tůma 2019-03-05 23:05:50 +01:00
parent 408ac22994
commit e2ad2e9d98
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/tileloader.cpp
View File

@ -130,7 +130,7 @@ void TileLoader::loadTilesSync(QVector<Tile> &list)
for (int i = 0; i < tl.size(); i++) { for (int i = 0; i < tl.size(); i++) {
Tile *t = tl[i]; Tile *t = tl[i];
QString file = tileFile(*t); QString file = tileFile(*t);
if (QFileInfo::exists(file)) if (QFileInfo(file).exists())
imgs.append(TileImage(file, t)); imgs.append(TileImage(file, t));
} }
} }

4
src/map/wms.cpp
View File

@ -264,7 +264,7 @@ bool WMS::getCapabilities(const QString &url, const QString &file,
if (d.get(dl, authorization)) if (d.get(dl, authorization))
wait.exec(); wait.exec();
if (!QFileInfo::exists(file)) { if (!QFileInfo(file).exists()) {
_errorString = "Error downloading capabilities XML file"; _errorString = "Error downloading capabilities XML file";
return false; return false;
} }
@ -277,7 +277,7 @@ WMS::WMS(const QString &file, const WMS::Setup &setup) : _valid(false)
QString capaUrl = QString("%1%2service=WMS&request=GetCapabilities") QString capaUrl = QString("%1%2service=WMS&request=GetCapabilities")
.arg(setup.url(), setup.url().contains('?') ? "&" : "?"); .arg(setup.url(), setup.url().contains('?') ? "&" : "?");
if (!QFileInfo::exists(file)) if (!QFileInfo(file).exists())
if (!getCapabilities(capaUrl, file, setup.authorization())) if (!getCapabilities(capaUrl, file, setup.authorization()))
return; return;
if (!parseCapabilities(file, setup)) if (!parseCapabilities(file, setup))

4
src/map/wmts.cpp
View File

@ -305,7 +305,7 @@ bool WMTS::downloadCapabilities(const QString &url, const QString &file,
if (d.get(dl, authorization)) if (d.get(dl, authorization))
wait.exec(); wait.exec();
if (!QFileInfo::exists(file)) { if (!QFileInfo(file).exists()) {
_errorString = "Error downloading capabilities XML file"; _errorString = "Error downloading capabilities XML file";
return false; return false;
} }
@ -319,7 +319,7 @@ WMTS::WMTS(const QString &file, const WMTS::Setup &setup) : _valid(false)
"%1%2service=WMTS&Version=1.0.0&request=GetCapabilities").arg(setup.url(), "%1%2service=WMTS&Version=1.0.0&request=GetCapabilities").arg(setup.url(),
setup.url().contains('?') ? "&" : "?")); setup.url().contains('?') ? "&" : "?"));
if (!url.isLocalFile() && !QFileInfo::exists(file)) if (!url.isLocalFile() && !QFileInfo(file).exists())
if (!downloadCapabilities(url.toString(), file, setup.authorization())) if (!downloadCapabilities(url.toString(), file, setup.authorization()))
return; return;