Android build fix no.3

src/GUI/elevationgraph.cpp

@@ -1,7 +1,6 @@
 #include <cmath>
 #include <QLocale>
 #include "data/data.h"
-#include "tooltip.h"
 #include "elevationgraphitem.h"
 #include "elevationgraph.h"
 

src/GUI/fileselectwidget.cpp

@@ -5,8 +5,10 @@
 #include <QFileInfo>
 #include <QApplication>
 #include <QFontMetrics>
-#include "common/util.h"
 #include "fileselectwidget.h"
+#ifdef Q_OS_ANDROID
+#include "common/util.h"
+#endif // Q_OS_ANDROID
 
 
 FileSelectWidget::FileSelectWidget(QWidget *parent) : QWidget(parent)

src/GUI/graphview.cpp

@@ -16,7 +16,6 @@
 #include "infoitem.h"
 #include "griditem.h"
 #include "graphitem.h"
-#include "pathitem.h"
 #include "format.h"
 #include "graphicsscene.h"
 #include "graphview.h"

src/GUI/gui.cpp

@@ -52,11 +52,13 @@
 #include "graphtab.h"
 #include "graphitem.h"
 #include "pathitem.h"
-#include "mapitem.h"
 #include "mapaction.h"
 #include "poiaction.h"
-#include "navigationwidget.h"
 #include "gui.h"
+#ifdef Q_OS_ANDROID
+#include "common/util.h"
+#include "navigationwidget.h"
+#endif // Q_OS_ANDROID
 
 
 #define MAX_RECENT_FILES  10

src/GUI/mapitem.cpp

@@ -4,9 +4,11 @@
 #include <QGraphicsSceneMouseEvent>
 #include "map/map.h"
 #include "mapaction.h"
-#include "popup.h"
 #include "tooltip.h"
 #include "mapitem.h"
+#ifdef Q_OS_ANDROID
+#include "popup.h"
+#endif // Q_OS_ANDROID
 
 
 static void growLeft(Map *map, const Coordinates &c, QRectF &rect)

src/GUI/settings.cpp

@@ -4,7 +4,6 @@
 #include <QPageSize>
 #include <QGeoPositionInfoSource>
 #include "common/config.h"
-#include "common/util.h"
 #include "data/graph.h"
 #include "format.h"
 #include "units.h"

src/GUI/speedgraph.cpp

@@ -1,6 +1,5 @@
 #include <QLocale>
 #include "data/data.h"
-#include "tooltip.h"
 #include "format.h"
 #include "speedgraphitem.h"
 #include "speedgraph.h"

src/data/poi.cpp

@@ -2,11 +2,9 @@
 #include <QDir>
 #include "common/rectc.h"
 #include "common/greatcircle.h"
-#include "data.h"
-#include "dem.h"
-#include "path.h"
-#include "area.h"
 #include "common/wgs84.h"
+#include "data.h"
+#include "path.h"
 #include "poi.h"
 
 

src/data/smlparser.cpp

@@ -13,7 +13,7 @@ QDebug operator<<(QDebug dbg, const SMLParser::Sensors &sensors)
 #endif // QT_NO_DEBUG
 
 
-void SMLParser::sample(SegmentData &segment, QMap<QDateTime, Sensors> &map)
+void SMLParser::sample(SegmentData &segment, SensorsMap &map)
 {
 	QDateTime timestamp;
 	Sensors sensors;
@@ -97,19 +97,20 @@ void SMLParser::sample(SegmentData &segment, QMap<QDateTime, Sensors> &map)
 
 void SMLParser::samples(SegmentData &segment)
 {
-	QMap<QDateTime, Sensors> sensors;
-	QMap<QDateTime, Sensors>::const_iterator it;
+	SensorsMap map;
 
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("Sample")) {
-			sample(segment, sensors);
+			sample(segment, map);
 		} else
 			_reader.skipCurrentElement();
 	}
 
 	for (int i = 0; i < segment.size(); i++) {
 		Trackpoint &t = segment[i];
-		if ((it = sensors.lowerBound(t.timestamp())) != sensors.constEnd()) {
+		SensorsMap::const_iterator it(map.lowerBound(t.timestamp()));
+
+		if (it != map.constEnd()) {
 			t.setCadence(it->cadence * 60);
 			t.setTemperature(it->temperature - 273.15);
 			t.setHeartRate(it->hr * 60);

src/data/smlparser.h

@@ -23,10 +23,12 @@ private:
 		qreal cadence, temperature, hr, power, speed;
 	};
 
+	typedef QMap<QDateTime, Sensors> SensorsMap;
+
 	void sml(QList<TrackData> &tracks);
 	void deviceLog(TrackData &track);
 	void samples(SegmentData &segment);
-	void sample(SegmentData &segment, QMap<QDateTime, Sensors> &map);
+	void sample(SegmentData &segment, SensorsMap &map);
 
 #ifndef QT_NO_DEBUG
 	friend QDebug operator<<(QDebug dbg, const Sensors &sensors);

src/map/aqmmap.cpp

@@ -4,7 +4,6 @@
 #include <QImageReader>
 #include <QBuffer>
 #include <QtConcurrent>
-#include "common/hash.h"
 #include "osm.h"
 #include "tile.h"
 #include "aqmmap.h"

src/map/gcs.cpp

@@ -1,5 +1,4 @@
 #include <QFile>
-#include "common/wgs84.h"
 #include "common/csv.h"
 #include "gcs.h"
 

src/map/geotiffmap.cpp

@@ -1,6 +1,5 @@
 #include <QPainter>
 #include <QImageReader>
-#include "common/util.h"
 #include "geotiff.h"
 #include "image.h"
 #include "geotiffmap.h"

src/map/jnxmap.cpp

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

src/map/kmzmap.cpp

@@ -18,7 +18,6 @@
 #include <QPainter>
 #include <QPixmapCache>
 #include <private/qzipreader_p.h>
-#include "common/util.h"
 #include "kmzmap.h"
 
 

src/map/kmzmap.h

@@ -4,7 +4,6 @@
 #include <QImage>
 #include "projection.h"
 #include "transform.h"
-#include "rectd.h"
 #include "map.h"
 
 class QXmlStreamReader;

src/map/mapsforge/mapdata.cpp

@@ -3,7 +3,6 @@
 #include <QFile>
 #include <QDataStream>
 #include <QColor>
-#include "common/hash.h"
 #include "map/osm.h"
 #include "subfile.h"
 #include "mapdata.h"

src/map/pcs.h

@@ -5,8 +5,6 @@
 #include <QMap>
 #include "common/kv.h"
 #include "gcs.h"
-#include "linearunits.h"
-#include "coordinatesystem.h"
 #include "conversion.h"
 
 class PCS

src/map/worldfilemap.cpp

@@ -3,7 +3,6 @@
 #include <QPainter>
 #include <QImageReader>
 #include "image.h"
-#include "gcs.h"
 #include "prjfile.h"
 #include "wldfile.h"
 #include "worldfilemap.h"