Changed application data paths to more platform-standard locations

src/map/downloader.cpp

@@ -2,6 +2,8 @@
 #include <QFileInfo>
 #include <QNetworkRequest>
 #include <QBasicTimer>
+#include <QDir>
+#include <QTimerEvent>
 #include "downloader.h"
 
 

src/map/downloader.h

@@ -7,7 +7,7 @@
 #include <QList>
 #include <QSet>
 #include <QHash>
-#include "config.h"
+#include "common/config.h"
 
 
 class Download

src/map/geotiffmap.cpp

@@ -1,7 +1,7 @@
 #include <QFileInfo>
 #include <QPainter>
 #include <QImageReader>
-#include "config.h"
+#include "common/config.h"
 #include "geotiff.h"
 #include "image.h"
 #include "geotiffmap.h"

src/map/image.cpp

@@ -1,6 +1,6 @@
 #include <QPainter>
 #include <QPixmapCache>
-#include "config.h"
+#include "common/config.h"
 #include "image.h"
 
 

src/map/jnxmap.cpp

@@ -2,10 +2,10 @@
 #include <QPainter>
 #include <QFileInfo>
 #include <QPixmapCache>
+#include "common/config.h"
 #include "rectd.h"
 #include "gcs.h"
 #include "pcs.h"
-#include "config.h"
 #include "jnxmap.h"
 
 

src/map/mapsource.cpp

@@ -1,6 +1,6 @@
 #include <QFile>
 #include <QXmlStreamReader>
-#include "config.h"
+#include "common/config.h"
 #include "onlinemap.h"
 #include "wmtsmap.h"
 #include "wmsmap.h"

src/map/mbtilesmap.cpp

@@ -5,8 +5,8 @@
 #include <QPainter>
 #include <QPixmapCache>
 #include "common/rectc.h"
+#include "common/config.h"
 #include "osm.h"
-#include "config.h"
 #include "mbtilesmap.h"
 
 

src/map/onlinemap.cpp

@@ -1,9 +1,10 @@
 #include <QtCore>
 #include <QPainter>
+#include <QDir>
 #include "common/rectc.h"
+#include "common/programpaths.h"
 #include "downloader.h"
 #include "osm.h"
-#include "config.h"
 #include "onlinemap.h"
 
 
@@ -16,7 +17,8 @@ OnlineMap::OnlineMap(const QString &name, const QString &url,
 	_zoom(_zooms.max()), _deviceRatio(1.0), _tileRatio(tileRatio),
 	_invertY(invertY)
 {
-	_tileLoader = new TileLoader(TILES_DIR + "/" + _name, this);
+	_tileLoader = new TileLoader(QDir(ProgramPaths::tilesDir()).filePath(_name),
+	  this);
 	_tileLoader->setUrl(url);
 	_tileLoader->setAuthorization(authorization);
 	connect(_tileLoader, SIGNAL(finished()), this, SIGNAL(loaded()));

src/map/ozimap.cpp

@@ -7,11 +7,11 @@
 #include <QPixmapCache>
 #include "common/coordinates.h"
 #include "common/rectc.h"
+#include "common/config.h"
 #include "tar.h"
 #include "ozf.h"
 #include "image.h"
 #include "mapfile.h"
-#include "config.h"
 #include "ozimap.h"
 
 

src/map/wmsmap.cpp

@@ -3,7 +3,7 @@
 #include <QPainter>
 #include "common/wgs84.h"
 #include "common/rectc.h"
-#include "config.h"
+#include "common/programpaths.h"
 #include "downloader.h"
 #include "tileloader.h"
 #include "wmsmap.h"
@@ -42,7 +42,7 @@ QString WMSMap::tileUrl(const QString &version) const
 
 QString WMSMap::tilesDir() const
 {
-	return QString(TILES_DIR + "/" + _name);
+	return QString(QDir(ProgramPaths::tilesDir()).filePath(_name));
 }
 
 void WMSMap::computeZooms(const RangeF &scaleDenominator)

src/map/wmtsmap.cpp

@@ -1,8 +1,9 @@
 #include <QtCore>
 #include <QPainter>
+#include <QDir>
 #include "common/rectc.h"
 #include "common/wgs84.h"
-#include "config.h"
+#include "common/programpaths.h"
 #include "transform.h"
 #include "tileloader.h"
 #include "wmts.h"
@@ -58,7 +59,7 @@ void WMTSMap::clearCache()
 
 QString WMTSMap::tilesDir() const
 {
-	return QString(TILES_DIR + "/" + _name);
+	return QString(QDir(ProgramPaths::tilesDir()).filePath(_name));
 }
 
 double WMTSMap::sd2res(double scaleDenominator) const