src/GUI/areaitem.cpp

@@ -9,9 +9,8 @@
 #include "areaitem.h"
 
 
-ToolTip AreaItem::info(bool extended) const
+ToolTip AreaItem::info() const
 {
-	Q_UNUSED(extended);
 	ToolTip tt;
 
 	if (!_area.name().isEmpty())

src/GUI/areaitem.h

@@ -26,7 +26,7 @@ public:
 	void setDigitalZoom(int zoom);
 	void updateStyle();
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 
 protected:
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);

src/GUI/cadencegraphitem.cpp

@@ -9,9 +9,8 @@ CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
 {
 }
 
-ToolTip CadenceGraphItem::info(bool extended) const
+ToolTip CadenceGraphItem::info() const
 {
-	Q_UNUSED(extended);
 	ToolTip tt;
 	QLocale l(QLocale::system());
 

src/GUI/cadencegraphitem.h

@@ -11,7 +11,7 @@ public:
 	CadenceGraphItem(const Graph &graph, GraphType type, int width,
 	  const QColor &color, QGraphicsItem *parent = 0);
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 };
 
 #endif // CADENCEGRAPHITEM_H

src/GUI/elevationgraphitem.cpp

@@ -26,10 +26,8 @@ ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
 	}
 }
 
-ToolTip ElevationGraphItem::info(bool extended) const
+ToolTip ElevationGraphItem::info() const
 {
-	Q_UNUSED(extended);
-
 	ToolTip tt;
 	qreal scale = (_units == Metric) ? 1.0 : M2FT;
 	QString su = (_units == Metric) ? tr("m") : tr("ft");

src/GUI/elevationgraphitem.h

@@ -18,7 +18,7 @@ public:
 	qreal max() const {return _max;}
 	qreal min() const {return _min;}
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 
 private:
 	qreal _ascent, _descent, _min, _max;

src/GUI/gearratiographitem.cpp

@@ -27,10 +27,8 @@ GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
 	_top = key;
 }
 
-ToolTip GearRatioGraphItem::info(bool extended) const
+ToolTip GearRatioGraphItem::info() const
 {
-	Q_UNUSED(extended);
-
 	ToolTip tt;
 	QLocale l(QLocale::system());
 

src/GUI/gearratiographitem.h

@@ -15,7 +15,7 @@ public:
 	qreal top() const {return _top;}
 	const QMap<qreal, qreal> &map() const {return _map;}
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 
 private:
 	QMap<qreal, qreal> _map;

src/GUI/graphicsscene.cpp

@@ -41,8 +41,7 @@ void GraphicsScene::helpEvent(QGraphicsSceneHelpEvent *event)
 	for (int i = 0; i < list.size(); i++) {
 		if (list.at(i)->type() == QGraphicsItem::UserType + 1) {
 			GraphicsItem *mi = static_cast<GraphicsItem*>(list.at(i));
-			Popup::show(event->screenPos(), mi->info(_showExtendedInfo),
+			Popup::show(event->screenPos(), mi->info(), event->widget());
-			  event->widget());
 			return;
 		}
 	}

src/GUI/graphicsscene.h

@@ -10,7 +10,7 @@ class GraphicsItem : public QGraphicsItem
 public:
 	GraphicsItem(QGraphicsItem *parent = 0) : QGraphicsItem(parent) {}
 
-	virtual ToolTip info(bool extended) const = 0;
+	virtual ToolTip info() const = 0;
 	int type() const {return QGraphicsItem::UserType + 1;}
 
 	static void useStyle(bool use) {_useStyle = use;}
@@ -22,11 +22,7 @@ protected:
 class GraphicsScene : public QGraphicsScene
 {
 public:
-	GraphicsScene(QObject *parent = 0)
+	GraphicsScene(QObject *parent = 0) : QGraphicsScene(parent) {}
-	  : QGraphicsScene(parent), _showExtendedInfo(false) {}
-
-	bool showExtendedInfo() const {return _showExtendedInfo;}
-	void showExtendedInfo(bool show) {_showExtendedInfo = show;}
 
 public slots:
 	void clear();
@@ -35,8 +31,6 @@ protected:
 	void helpEvent(QGraphicsSceneHelpEvent *event);
 
 private:
-	bool _showExtendedInfo;
-
 	QList<QGraphicsItem *> itemsAtPosition(const QPoint &screenPos,
 	  const QPointF &scenePos, QWidget *widget) const;
 };

src/GUI/graphitem.cpp

@@ -379,9 +379,6 @@ void GraphItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 
 void GraphItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-	GraphicsScene *gs = dynamic_cast<GraphicsScene *>(scene());
+	Popup::show(event->screenPos(), info(), event->widget());
-	if (gs)
-		Popup::show(event->screenPos(), info(gs->showExtendedInfo()),
-		  event->widget());
 	GraphicsItem::mousePressEvent(event);
 }

src/GUI/graphitem.h

@@ -26,7 +26,7 @@ public:
 	  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent = 0);
 	virtual ~GraphItem() {}
 
-	virtual ToolTip info(bool extended) const = 0;
+	virtual ToolTip info() const = 0;
 
 	QPainterPath shape() const {return _shape;}
 	QRectF boundingRect() const {return _shape.boundingRect();}

src/GUI/gui.cpp

@@ -1069,8 +1069,6 @@ bool GUI::openFile(const QString &fileName, bool tryUnknown, int &showError)
 	updateNavigationActions();
 	updateStatusBarInfo();
 	updateWindowTitle();
-	if (_files.count() > 1)
-		_mapView->showExtendedInfo(true);
 #ifndef Q_OS_ANDROID
 	updateRecentFiles(canonicalFileName);
 #endif // Q_OS_ANDROID
@@ -1557,7 +1555,6 @@ void GUI::reloadFiles()
 		_browser->setCurrent(_files.last());
 #endif // Q_OS_ANDROID
 	updateDataDEMDownloadAction();
-	_mapView->showExtendedInfo(_files.size() > 1);
 }
 
 void GUI::closeFiles()
@@ -1578,7 +1575,6 @@ void GUI::closeFiles()
 	_lastTab = 0;
 
 	_mapView->clear();
-	_mapView->showExtendedInfo(false);
 
 	_files.clear();
 }

src/GUI/heartrategraphitem.cpp

@@ -9,10 +9,8 @@ HeartRateGraphItem::HeartRateGraphItem(const Graph &graph, GraphType type,
 {
 }
 
-ToolTip HeartRateGraphItem::info(bool extended) const
+ToolTip HeartRateGraphItem::info() const
 {
-	Q_UNUSED(extended);
-
 	ToolTip tt;
 	QLocale l(QLocale::system());
 

src/GUI/heartrategraphitem.h

@@ -11,7 +11,7 @@ public:
 	HeartRateGraphItem(const Graph &graph, GraphType type, int width,
 	  const QColor &color, QGraphicsItem *parent = 0);
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 };
 
 #endif // HEARTRATEGRAPHITEM_H

src/GUI/mapitem.cpp

@@ -71,9 +71,8 @@ static QRectF bbox(const RectC &rect, Map *map, int samples = 100)
 	return prect;
 }
 
-ToolTip MapItem::info(bool extended) const
+ToolTip MapItem::info() const
 {
-	Q_UNUSED(extended);
 	ToolTip tt;
 
 	if (!_name.isEmpty())
@@ -213,10 +212,7 @@ void MapItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 	update();
 
 #ifdef Q_OS_ANDROID
-	GraphicsScene *gs = dynamic_cast<GraphicsScene *>(scene());
+	Popup::show(event->screenPos(), info(), event->widget());
-	if (gs)
-		Popup::show(event->screenPos(), info(gs->showExtendedInfo()),
-		  event->widget());
 #endif // Q_OS_ANDROID
 }
 

src/GUI/mapitem.h

@@ -27,7 +27,7 @@ public:
 	void setPenStyle(Qt::PenStyle style);
 	void setDigitalZoom(int zoom);
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 
 signals:
 	void triggered();

src/GUI/mapview.cpp

@@ -19,6 +19,7 @@
 #include "coordinatesitem.h"
 #include "mapitem.h"
 #include "keys.h"
+#include "graphicsscene.h"
 #include "mapaction.h"
 #include "markerinfoitem.h"
 #include "crosshairitem.h"

src/GUI/mapview.h

@@ -14,7 +14,6 @@
 #include "format.h"
 #include "markerinfoitem.h"
 #include "palette.h"
-#include "graphicsscene.h"
 
 
 class QGeoPositionInfoSource;
@@ -36,6 +35,7 @@ class GraphItem;
 class PlaneItem;
 class MapItem;
 class Area;
+class GraphicsScene;
 class QTimeZone;
 class MapAction;
 class CrosshairItem;
@@ -64,7 +64,6 @@ public:
 	void setMap(Map *map);
 	void setPositionSource(QGeoPositionInfoSource *source);
 	void setGraph(int index);
-	void showExtendedInfo(bool show) {_scene->showExtendedInfo(show);}
 
 	void plot(QPainter *painter, const QRectF &target, qreal scale,
 	  PlotFlags flags);

src/GUI/pathitem.cpp

@@ -510,9 +510,6 @@ void PathItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 
 void PathItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-	GraphicsScene *gs = dynamic_cast<GraphicsScene *>(scene());
+	Popup::show(event->screenPos(), info(), event->widget());
-	if (gs)
-		Popup::show(event->screenPos(), info(gs->showExtendedInfo()),
-		  event->widget());
 	GraphicsItem::mousePressEvent(event);
 }

src/GUI/pathtickitem.cpp

@@ -76,9 +76,6 @@ QRect PathTickItem::tickRect(int value)
 void PathTickItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
 	const PathItem *pi = static_cast<PathItem*>(parentItem());
-	GraphicsScene *gs = dynamic_cast<GraphicsScene *>(scene());
+	Popup::show(event->screenPos(), pi->info(), event->widget());
-	if (gs)
-		Popup::show(event->screenPos(), pi->info(gs->showExtendedInfo()),
-		  event->widget());
 	QGraphicsItem::mousePressEvent(event);
 }

src/GUI/pathtickitem.h

@@ -20,9 +20,9 @@ public:
 	void setDigitalZoom(int zoom) {setScale(qPow(2, -zoom));}
 
 	int type() const {return parentItem()->type();}
-	ToolTip info(bool extended) const
+	ToolTip info() const
 	{
-		return static_cast<GraphicsItem*>(parentItem())->info(extended);
+		return static_cast<GraphicsItem*>(parentItem())->info();
 	}
 
 	static QRect tickRect(int value);

src/GUI/powergraphitem.cpp

@@ -9,9 +9,8 @@ PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type, int width,
 {
 }
 
-ToolTip PowerGraphItem::info(bool extended) const
+ToolTip PowerGraphItem::info() const
 {
-	Q_UNUSED(extended);
 	ToolTip tt;
 	QLocale l(QLocale::system());
 

src/GUI/powergraphitem.h

@@ -11,7 +11,7 @@ public:
 	PowerGraphItem(const Graph &graph, GraphType type, int width,
 	  const QColor &color, QGraphicsItem *parent = 0);
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 };
 
 #endif // POWERGRAPHITEM_H

src/GUI/routeitem.cpp

@@ -1,14 +1,14 @@
-#include <QLocale>
+#include <QPainter>
-#include <QFileInfo>
 #include "data/waypoint.h"
 #include "data/route.h"
+#include "map/map.h"
 #include "format.h"
 #include "waypointitem.h"
 #include "tooltip.h"
 #include "routeitem.h"
 
 
-ToolTip RouteItem::info(bool extended) const
+ToolTip RouteItem::info() const
 {
 	ToolTip tt;
 
@@ -31,13 +31,6 @@ ToolTip RouteItem::info(bool extended) const
 		}
 		tt.insert(tr("Links"), links);
 	}
-#ifdef Q_OS_ANDROID
-	Q_UNUSED(extended);
-#else // Q_OS_ANDROID
-	if (extended && !_file.isEmpty())
-		tt.insert(tr("File"), QString("<a href=\"file:%1\">%2</a>")
-		  .arg(_file, QFileInfo(_file).fileName()));
-#endif // Q_OS_ANDROID
 
 	return tt;
 }
@@ -55,7 +48,6 @@ RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)
 	_desc = route.description();
 	_comment = route.comment();
 	_links = route.links();
-	_file = route.file();
 }
 
 void RouteItem::setMap(Map *map)

src/GUI/routeitem.h

@@ -22,7 +22,7 @@ public:
 	void showWaypointLabels(bool show);
 	void showWaypointIcons(bool show);
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 	QDateTime date() const {return QDateTime();}
 
 private:
@@ -31,7 +31,6 @@ private:
 	QString _comment;
 	QVector<Link> _links;
 	QVector<WaypointItem*> _waypoints;
-	QString _file;
 };
 
 #endif // ROUTEITEM_H

src/GUI/speedgraphitem.cpp

@@ -15,10 +15,8 @@ SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type, int width,
 	_mavg = graph.last().last().s() / movingTime;
 }
 
-ToolTip SpeedGraphItem::info(bool extended) const
+ToolTip SpeedGraphItem::info() const
 {
-	Q_UNUSED(extended);
-
 	ToolTip tt;
 	qreal scale = (_units == Imperial) ? MS2MIH : (_units == Nautical)
 	  ? MS2KN : MS2KMH;

src/GUI/speedgraphitem.h

@@ -17,7 +17,7 @@ public:
 	qreal mavg() const {return _mavg;}
 	qreal max() const {return _max;}
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 
 	void setTimeType(TimeType type);
 

src/GUI/temperaturegraphitem.cpp

@@ -12,10 +12,8 @@ TemperatureGraphItem::TemperatureGraphItem(const Graph &graph, GraphType type,
 	_avg = GraphItem::avg();
 }
 
-ToolTip TemperatureGraphItem::info(bool extended) const
+ToolTip TemperatureGraphItem::info() const
 {
-	Q_UNUSED(extended);
-
 	ToolTip tt;
 	qreal scale = (_units == Metric) ? 1.0 : C2FS;
 	qreal offset = (_units == Metric) ? 0 : C2FO;

src/GUI/temperaturegraphitem.h

@@ -15,7 +15,7 @@ public:
 	qreal min() const {return _min;}
 	qreal avg() const {return _avg;}
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 
 private:
 	qreal _min, _max, _avg;

src/GUI/trackitem.cpp

@@ -1,12 +1,12 @@
-#include <QLocale>
+#include <QPainter>
-#include "common/util.h"
+#include "map/map.h"
 #include "data/track.h"
 #include "format.h"
 #include "tooltip.h"
 #include "trackitem.h"
 
 
-ToolTip TrackItem::info(bool extended) const
+ToolTip TrackItem::info() const
 {
 	ToolTip tt;
 	QLocale l;
@@ -39,13 +39,6 @@ ToolTip TrackItem::info(bool extended) const
 		}
 		tt.insert(tr("Links"), links);
 	}
-#ifdef Q_OS_ANDROID
-	Q_UNUSED(extended);
-#else // Q_OS_ANDROID
-	if (extended && !_file.isEmpty())
-		tt.insert(tr("File"), QString("<a href=\"file:%1\">%2</a>")
-		  .arg(_file, QFileInfo(_file).fileName()));
-#endif // Q_OS_ANDROID
 
 	return tt;
 }
@@ -60,5 +53,4 @@ TrackItem::TrackItem(const Track &track, Map *map, QGraphicsItem *parent)
 	_date = track.date();
 	_time = track.time();
 	_movingTime = track.movingTime();
-	_file = track.file();
 }

src/GUI/trackitem.h

@@ -15,7 +15,7 @@ class TrackItem : public PathItem
 public:
 	TrackItem(const Track &track, Map *map, QGraphicsItem *parent = 0);
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 	QDateTime date() const {return _date;}
 
 private:
@@ -26,7 +26,6 @@ private:
 	QDateTime _date;
 	qreal _time;
 	qreal _movingTime;
-	QString _file;
 };
 
 #endif // TRACKITEM_H

src/GUI/waypointitem.cpp

@@ -16,9 +16,8 @@ Units WaypointItem::_units = Metric;
 CoordinatesFormat WaypointItem::_format = DecimalDegrees;
 QTimeZone WaypointItem::_timeZone = QTimeZone::utc();
 
-ToolTip WaypointItem::info(bool extended) const
+ToolTip WaypointItem::info() const
 {
-	Q_UNUSED(extended);
 	ToolTip tt;
 	QLocale l;
 
@@ -275,10 +274,7 @@ void WaypointItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 
 void WaypointItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-	GraphicsScene *gs = dynamic_cast<GraphicsScene *>(scene());
+	Popup::show(event->screenPos(), info(), event->widget());
-	if (gs)
-		Popup::show(event->screenPos(), info(gs->showExtendedInfo()),
-		  event->widget());
 	/* Do not propagate the event any further as lower stacked items (path
 	   items) would replace the popup with their own popup */
 }

src/GUI/waypointitem.h

@@ -30,7 +30,7 @@ public:
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);
 
-	ToolTip info(bool extended) const;
+	ToolTip info() const;
 
 	static void setUnits(Units units) {_units = units;}
 	static void setCoordinatesFormat(CoordinatesFormat format)

src/common/util.cpp

@@ -137,14 +137,16 @@ QString Util::displayName(const QString &path)
 	QUrl url(path);
 
 	// Not an Android URL, return standard filename.
-	if (url.scheme() != "content")
+	if (url.scheme() != "content") {
-		return QFileInfo(path).fileName();
+		QFileInfo fi(path);
+		return fi.fileName();
 	// Directory browsing URLs. Those can not be translated using the Android
 	// content resolver but we can get the filename from the URL path.
-	else if (url.path().startsWith("/tree/"))
+	} else if (url.path().startsWith("/tree/")) {
-		return QFileInfo(url.fileName()).fileName();
+		QFileInfo fi(url.fileName());
+		return fi.fileName();
 	// Translate all "regular" android URLs using the Android content resolver.
-	else
+	} else
 		return documentName(path);
 #else
 	return path;

src/data/cupparser.cpp

@@ -86,7 +86,7 @@ bool CUPParser::waypoint(const QByteArrayList &entry,
 	return true;
 }
 
-bool CUPParser::task(const QString &fileName, const QByteArrayList &entry,
+bool CUPParser::task(const QByteArrayList &entry,
   const QVector<Waypoint> &waypoints, QList<RouteData> &routes)
 {
 	if (entry.size() < 3) {
@@ -96,7 +96,6 @@ bool CUPParser::task(const QString &fileName, const QByteArrayList &entry,
 
 	RouteData r;
 	r.setName(entry.at(0));
-	r.setFile(fileName);
 	for (int i = 1; i < entry.size(); i++) {
 		if (entry.at(i) == "???")
 			continue;
@@ -156,7 +155,7 @@ bool CUPParser::parse(QFile *file, QList<TrackData> &tracks,
 				return false;
 		} else if (segment == Tasks) {
 			if (entry.at(0) != "Options" && !entry.at(0).startsWith("ObsZone=")
-			  && !task(file->fileName(), entry, waypoints, routes))
+			  && !task(entry, waypoints, routes))
 				return false;
 		}
 

src/data/cupparser.h

@@ -15,8 +15,8 @@ public:
 
 private:
 	bool waypoint(const QByteArrayList &entry, QVector<Waypoint> &waypoints);
-	bool task(const QString &fileName, const QByteArrayList &entry,
+	bool task(const QByteArrayList &entry, const QVector<Waypoint> &waypoints,
-	  const QVector<Waypoint> &waypoints, QList<RouteData> &routes);
+	  QList<RouteData> &routes);
 
 	QString _errorString;
 	int _errorLine;

src/data/fitparser.cpp

@@ -481,7 +481,6 @@ bool FITParser::parse(QFile *file, QList<TrackData> &tracks,
 			return false;
 
 	tracks.append(ctx.segment);
-	tracks.last().setFile(file->fileName());
 
 	return true;
 }

src/data/geojsonparser.cpp

@@ -330,7 +330,7 @@ bool GeoJSONParser::multiPoint(const QJsonObject &object,
 	return true;
 }
 
-bool GeoJSONParser::lineString(const QJsonObject &object, const QString &file,
+bool GeoJSONParser::lineString(const QJsonObject &object,
   const Projection &parent, const QJsonValue &properties,
   QList<TrackData> &tracks)
 {
@@ -367,7 +367,6 @@ bool GeoJSONParser::lineString(const QJsonObject &object, const QString &file,
 
 	setSegmentProperties(segment, -1, properties);
 	TrackData track(segment);
-	track.setFile(file);
 	setTrackProperties(track, properties);
 	tracks.append(track);
 
@@ -375,7 +374,7 @@ bool GeoJSONParser::lineString(const QJsonObject &object, const QString &file,
 }
 
 bool GeoJSONParser::multiLineString(const QJsonObject &object,
-  const QString &file, const Projection &parent, const QJsonValue &properties,
+  const Projection &parent, const QJsonValue &properties,
   QList<TrackData> &tracks)
 {
 	if (!object.contains("coordinates")) {
@@ -422,7 +421,6 @@ bool GeoJSONParser::multiLineString(const QJsonObject &object,
 		}
 	}
 
-	track.setFile(file);
 	setTrackProperties(track, properties);
 	tracks.append(track);
 
@@ -541,7 +539,7 @@ bool GeoJSONParser::multiPolygon(const QJsonObject &object,
 }
 
 bool GeoJSONParser::geometryCollection(const QJsonObject &object,
-  const QString &file, const Projection &parent, const QJsonValue &properties,
+  const Projection &parent, const QJsonValue &properties,
   QList<TrackData> &tracks, QList<Area> &areas, QVector<Waypoint> &waypoints)
 {
 	if (!object["geometries"].isArray()) {
@@ -569,13 +567,13 @@ bool GeoJSONParser::geometryCollection(const QJsonObject &object,
 					return false;
 				break;
 			case LineString:
-				if (!lineString(geometry, file, PROJ(proj, parent), properties,
+				if (!lineString(geometry, PROJ(proj, parent), properties,
 				  tracks))
 					return false;
 				break;
 			case MultiLineString:
-				if (!multiLineString(geometry, file, PROJ(proj, parent),
+				if (!multiLineString(geometry, PROJ(proj, parent), properties,
-				  properties, tracks))
+				  tracks))
 					return false;
 				break;
 			case Polygon:
@@ -588,7 +586,7 @@ bool GeoJSONParser::geometryCollection(const QJsonObject &object,
 					return false;
 				break;
 			case GeometryCollection:
-				if (!geometryCollection(geometry, file, PROJ(proj, parent),
+				if (!geometryCollection(geometry, PROJ(proj, parent),
 				  properties, tracks, areas, waypoints))
 					return false;
 				break;
@@ -602,9 +600,8 @@ bool GeoJSONParser::geometryCollection(const QJsonObject &object,
 	return true;
 }
 
-bool GeoJSONParser::feature(const QJsonObject &object, const QString &file,
+bool GeoJSONParser::feature(const QJsonObject &object, const Projection &parent,
-  const Projection &parent, QList<TrackData> &tracks, QList<Area> &areas,
+  QList<TrackData> &tracks, QList<Area> &areas, QVector<Waypoint> &waypoints)
-  QVector<Waypoint> &waypoints)
 {
 	if (object["geometry"].isNull())
 		return true;
@@ -626,14 +623,13 @@ bool GeoJSONParser::feature(const QJsonObject &object, const QString &file,
 			return multiPoint(geometry, PROJ(proj, parent), properties,
 			  waypoints);
 		case LineString:
-			return lineString(geometry, file, PROJ(proj, parent), properties,
+			return lineString(geometry, PROJ(proj, parent), properties, tracks);
-			  tracks);
 		case MultiLineString:
-			return multiLineString(geometry, file, PROJ(proj, parent),
+			return multiLineString(geometry, PROJ(proj, parent), properties,
-			  properties, tracks);
+			  tracks);
 		case GeometryCollection:
-			return geometryCollection(geometry, file, PROJ(proj, parent),
+			return geometryCollection(geometry, PROJ(proj, parent), properties,
-			  properties, tracks, areas, waypoints);
+			  tracks, areas, waypoints);
 		case Polygon:
 			return polygon(geometry, PROJ(proj, parent), properties, areas);
 		case MultiPolygon:
@@ -646,8 +642,8 @@ bool GeoJSONParser::feature(const QJsonObject &object, const QString &file,
 }
 
 bool GeoJSONParser::featureCollection(const QJsonObject &object,
-  const QString &file, const Projection &parent, QList<TrackData> &tracks,
+  const Projection &parent, QList<TrackData> &tracks, QList<Area> &areas,
-  QList<Area> &areas, QVector<Waypoint> &waypoints)
+  QVector<Waypoint> &waypoints)
 {
 	if (!object["features"].isArray()) {
 		_errorString = "Invalid/missing FeatureCollection features array";
@@ -660,8 +656,8 @@ bool GeoJSONParser::featureCollection(const QJsonObject &object,
 		return false;
 
 	for (int i = 0; i < features.size(); i++)
-		if (!feature(features.at(i).toObject(), file, PROJ(proj, parent),
+		if (!feature(features.at(i).toObject(), PROJ(proj, parent), tracks,
-		  tracks, areas, waypoints))
+		  areas, waypoints))
 			return false;
 
 	return true;
@@ -690,7 +686,6 @@ bool GeoJSONParser::parse(QFile *file, QList<TrackData> &tracks,
 
 	QJsonObject object(doc.object());
 	Projection proj(GCS::WGS84());
-	QString fileName(file->fileName());
 
 	switch (type(object)) {
 		case Point:
@@ -698,17 +693,16 @@ bool GeoJSONParser::parse(QFile *file, QList<TrackData> &tracks,
 		case MultiPoint:
 			return multiPoint(object, proj, QJsonValue(), waypoints);
 		case LineString:
-			return lineString(object, fileName, proj, QJsonValue(), tracks);
+			return lineString(object, proj, QJsonValue(), tracks);
 		case MultiLineString:
-			return multiLineString(object, fileName, proj, QJsonValue(), tracks);
+			return multiLineString(object, proj, QJsonValue(), tracks);
 		case GeometryCollection:
-			return geometryCollection(object, fileName, proj, QJsonValue(),
+			return geometryCollection(object, proj, QJsonValue(), tracks, areas,
-			  tracks, areas, waypoints);
-		case Feature:
-			return feature(object, fileName, proj, tracks, areas, waypoints);
-		case FeatureCollection:
-			return featureCollection(object, fileName, proj, tracks, areas,
 			  waypoints);
+		case Feature:
+			return feature(object, proj, tracks, areas, waypoints);
+		case FeatureCollection:
+			return featureCollection(object, proj, tracks, areas, waypoints);
 		case Polygon:
 			return polygon(object, proj, QJsonValue(), areas);
 		case MultiPolygon:

src/data/geojsonparser.h

@@ -37,25 +37,22 @@ private:
 	  const QJsonValue &properties, QVector<Waypoint> &waypoints);
 	bool multiPoint(const QJsonObject &object, const Projection &parent,
 	  const QJsonValue &properties, QVector<Waypoint> &waypoints);
-	bool lineString(const QJsonObject &coordinates, const QString &file,
+	bool lineString(const QJsonObject &coordinates, const Projection &parent,
-	  const Projection &parent, const QJsonValue &properties,
+	  const QJsonValue &properties, QList<TrackData> &tracks);
-	  QList<TrackData> &tracks);
+	bool multiLineString(const QJsonObject &object, const Projection &proj,
-	bool multiLineString(const QJsonObject &object, const QString &file,
+	  const QJsonValue &properties, QList<TrackData> &tracks);
-	  const Projection &proj, const QJsonValue &properties,
-	  QList<TrackData> &tracks);
 	bool polygon(const QJsonObject &object, const Projection &parent,
 	  const QJsonValue &properties, QList<Area> &areas);
 	bool multiPolygon(const QJsonObject &object, const Projection &proj,
 	  const QJsonValue &properties, QList<Area> &areas);
-	bool geometryCollection(const QJsonObject &json, const QString &file,
+	bool geometryCollection(const QJsonObject &json, const Projection &parent,
-	  const Projection &parent, const QJsonValue &properties,
+	  const QJsonValue &properties, QList<TrackData> &tracks,
+	  QList<Area> &areas, QVector<Waypoint> &waypoints);
+	bool feature(const QJsonObject &json, const Projection &parent,
+	  QList<TrackData> &tracks, QList<Area> &areas,
+	  QVector<Waypoint> &waypoints);
+	bool featureCollection(const QJsonObject &object, const Projection &parent,
 	  QList<TrackData> &tracks, QList<Area> &areas, QVector<Waypoint> &waypoints);
-	bool feature(const QJsonObject &json, const QString &file,
-	  const Projection &parent, QList<TrackData> &tracks, QList<Area> &areas,
-	  QVector<Waypoint> &waypoints);
-	bool featureCollection(const QJsonObject &object, const QString &file,
-	  const Projection &parent, QList<TrackData> &tracks, QList<Area> &areas,
-	  QVector<Waypoint> &waypoints);
 
 	QString _errorString;
 };

src/data/gpxparser.cpp

@@ -343,10 +343,6 @@ void GPXParser::track(TrackData &track)
 
 	if (!link10.URL().isEmpty())
 		track.addLink(link10);
-
-	QFile *file = qobject_cast<QFile *>(_reader.device());
-	if (file)
-		track.setFile(file->fileName());
 }
 
 void GPXParser::area(Area &area)
@@ -392,9 +388,6 @@ void GPXParser::gpx(QList<TrackData> &tracks, QList<RouteData> &routes,
 			track(tracks.back());
 		} else if (_reader.name() == QLatin1String("rte")) {
 			routes.append(RouteData());
-			QFile *file = qobject_cast<QFile *>(_reader.device());
-			if (file)
-				routes.back().setFile(file->fileName());
 			routepoints(routes.back(), tracks);
 		} else if (_reader.name() == QLatin1String("wpt")) {
 			waypoints.append(Waypoint(coordinates()));

src/data/igcparser.cpp

@@ -237,7 +237,6 @@ bool IGCParser::parse(QFile *file, QList<TrackData> &tracks,
 				} else {
 					route = true;
 					routes.append(RouteData());
-					routes.last().setFile(file->fileName());
 				}
 			} else if (line[0] == 'B') {
 				if (ctx.date.isNull()) {
@@ -249,7 +248,6 @@ bool IGCParser::parse(QFile *file, QList<TrackData> &tracks,
 				}
 				if (!track) {
 					tracks.append(SegmentData());
-					tracks.last().setFile(file->fileName());
 					ctx.time = QTime(0, 0);
 					track = true;
 				}

src/data/itnparser.cpp

@@ -40,7 +40,6 @@ bool ITNParser::parse(QFile *file, QList<TrackData> &tracks,
 		_errorLine++;
 	}
 
-	rd.setFile(file->fileName());
 	routes.append(rd);
 
 	return true;

src/data/kmlparser.cpp

@@ -594,8 +594,8 @@ void KMLParser::photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints,
 	}
 }
 
-void KMLParser::multiGeometry(const Ctx &ctx, QList<TrackData> &tracks,
+void KMLParser::multiGeometry(QList<TrackData> &tracks, QList<Area> &areas,
-  QList<Area> &areas, QVector<Waypoint> &waypoints)
+  QVector<Waypoint> &waypoints)
 {
 	TrackData *tp = 0;
 	Area *ap = 0;
@@ -608,7 +608,6 @@ void KMLParser::multiGeometry(const Ctx &ctx, QList<TrackData> &tracks,
 		} else if (_reader.name() == QLatin1String("LineString")) {
 			if (!tp) {
 				tracks.append(TrackData());
-				tracks.last().setFile(ctx.path);
 				tp = &tracks.last();
 			}
 			tp->append(SegmentData());
@@ -652,24 +651,21 @@ void KMLParser::placemark(const Ctx &ctx, QList<TrackData> &tracks,
 		} else if (_reader.name() == QLatin1String("StyleMap"))
 			styleMap(map);
 		else if (_reader.name() == QLatin1String("MultiGeometry"))
-			multiGeometry(ctx, tracks, areas, waypoints);
+			multiGeometry(tracks, areas, waypoints);
 		else if (_reader.name() == QLatin1String("Point")) {
 			waypoints.append(Waypoint());
 			point(waypoints.last());
 		} else if (_reader.name() == QLatin1String("LineString")
 		  || _reader.name() == QLatin1String("LinearRing")) {
 			tracks.append(TrackData());
-			tracks.last().setFile(ctx.path);
 			tracks.last().append(SegmentData());
 			lineString(tracks.last().last());
 		} else if (_reader.name() == QLatin1String("Track")) {
 			tracks.append(TrackData());
-			tracks.last().setFile(ctx.path);
 			tracks.last().append(SegmentData());
 			track(tracks.last().last());
 		} else if (_reader.name() == QLatin1String("MultiTrack")) {
 			tracks.append(TrackData());
-			tracks.last().setFile(ctx.path);
 			multiTrack(tracks.last());
 		} else if (_reader.name() == QLatin1String("Polygon")) {
 			areas.append(Area());

src/data/kmlparser.h

@@ -40,8 +40,8 @@ private:
 	  QVector<Waypoint> &waypoints, PointStyleMap &pointStyles,
 	  PolygonStyleMap &polyStyles, LineStyleMap &lineStyles,
 	  QMap<QString, QString> &map);
-	void multiGeometry(const Ctx &ctx, QList<TrackData> &tracks,
+	void multiGeometry(QList<TrackData> &tracks, QList<Area> &areas,
-	  QList<Area> &areas, QVector<Waypoint> &waypoints);
+	  QVector<Waypoint> &waypoints);
 	void photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints,
 	  PointStyleMap &pointStyles, QMap<QString, QString> &map);
 	void track(SegmentData &segment);

src/data/nmeaparser.cpp

@@ -531,7 +531,6 @@ bool NMEAParser::parse(QFile *file, QList<TrackData> &tracks,
 
 	if (segment.size()) {
 		tracks.append(TrackData());
-		tracks.last().setFile(file->fileName());
 		tracks.last().append(segment);
 	}
 

src/data/onmoveparsers.cpp

@@ -276,7 +276,6 @@ bool GHPParser::parse(QFile *file, QList<TrackData> &tracks,
 	}
 
 	tracks.append(TrackData());
-	tracks.last().setFile(file->fileName());
 	tracks.last().append(segment);
 
 	return true;

src/data/oziparsers.cpp

@@ -41,7 +41,6 @@ bool PLTParser::parse(QFile *file, QList<TrackData> &tracks,
 
 	tracks.append(TrackData());
 	TrackData &track = tracks.last();
-	track.setFile(file->fileName());
 	track.append(SegmentData());
 	SegmentData &segment = track.last();
 
@@ -160,7 +159,6 @@ bool RTEParser::parse(QFile *file, QList<TrackData> &tracks,
 
 			if (list.at(0).trimmed() == "R") {
 				routes.append(RouteData());
-				routes.last().setFile(file->fileName());
 				record = true;
 
 				if (list.size() >= 3) {

src/data/route.h

@@ -23,7 +23,6 @@ public:
 	const QString &comment() const {return _data.comment();}
 	const QVector<Link> &links() const {return _data.links();}
 	const LineStyle &style() const {return _data.style();}
-	const QString &file() const {return _data.file();}
 
 	bool isValid() const {return _data.size() >= 2;}
 

src/data/routedata.h

@@ -15,20 +15,17 @@ public:
 	const QString &comment() const {return _comment;}
 	const QVector<Link> &links() const {return _links;}
 	const LineStyle &style() const {return _style;}
-	const QString &file() const {return _file;}
 
 	void setName(const QString &name) {_name = name;}
 	void setDescription(const QString &desc) {_desc = desc;}
 	void setComment(const QString &comment) {_comment = comment;}
 	void addLink(const Link &link) {_links.append(link);}
 	void setStyle(const LineStyle &style) {_style = style;}
-	void setFile(const QString &file) {_file = file;}
 
 private:
 	QString _name;
 	QString _desc;
 	QString _comment;
-	QString _file;
 	QVector<Link> _links;
 	LineStyle _style;
 };

src/data/slfparser.cpp

@@ -109,7 +109,6 @@ bool SLFParser::parse(QFile *file, QList<TrackData> &tracks,
 	if (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("Activity")) {
 			tracks.append(TrackData());
-			tracks.last().setFile(file->fileName());
 			activity(tracks.last());
 		} else
 			_reader.raiseError("Not a SLF file");

src/data/smlparser.cpp

@@ -136,9 +136,6 @@ void SMLParser::sml(QList<TrackData> &tracks)
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("DeviceLog")) {
 			tracks.append(TrackData());
-			QFile *file = qobject_cast<QFile*>(_reader.device());
-			if (file)
-				tracks.last().setFile(file->fileName());
 			deviceLog(tracks.last());
 		} else
 			_reader.skipCurrentElement();

src/data/tcxparser.cpp

@@ -196,10 +196,7 @@ void TCXParser::courses(QList<TrackData> &tracks, QVector<Waypoint> &waypoints)
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("Course")) {
 			tracks.append(TrackData());
-			QFile *file = qobject_cast<QFile*>(_reader.device());
+			course(waypoints, tracks.back());
-			if (file)
-				tracks.last().setFile(file->fileName());
-			course(waypoints, tracks.last());
 		} else
 			_reader.skipCurrentElement();
 	}
@@ -210,9 +207,6 @@ void TCXParser::sport(QList<TrackData> &tracks)
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("Activity")) {
 			tracks.append(TrackData());
-			QFile *file = qobject_cast<QFile*>(_reader.device());
-			if (file)
-				tracks.last().setFile(file->fileName());
 			activity(tracks.last());
 		} else
 			_reader.skipCurrentElement();
@@ -235,9 +229,6 @@ void TCXParser::activities(QList<TrackData> &tracks)
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("Activity")) {
 			tracks.append(TrackData());
-			QFile *file = qobject_cast<QFile*>(_reader.device());
-			if (file)
-				tracks.last().setFile(file->fileName());
 			activity(tracks.last());
 		} else if (_reader.name() == QLatin1String("MultiSportSession"))
 			multiSportSession(tracks);

src/data/track.h

@@ -36,7 +36,6 @@ public:
 	const QString &comment() const {return _data.comment();}
 	const QVector<Link> &links() const {return _data.links();}
 	const LineStyle &style() const {return _data.style();}
-	const QString &file() const {return _data.file();}
 
 	bool isValid() const;
 

src/data/trackdata.h

@@ -25,20 +25,17 @@ public:
 	const QString &comment() const {return _comment;}
 	const QVector<Link> &links() const {return _links;}
 	const LineStyle &style() const {return _style;}
-	const QString &file() const {return _file;}
 
 	void setName(const QString &name) {_name = name;}
 	void setDescription(const QString &desc) {_desc = desc;}
 	void setComment(const QString &comment) {_comment = comment;}
 	void addLink(const Link &link) {_links.append(link);}
 	void setStyle(const LineStyle &style) {_style = style;}
-	void setFile(const QString &path) {_file = path;}
 
 private:
 	QString _name;
 	QString _desc;
 	QString _comment;
-	QString _file;
 	QVector<Link> _links;
 	LineStyle _style;
 };

src/data/twonavparser.cpp

@@ -152,7 +152,6 @@ bool TwoNavParser::parse(QFile *file, QList<TrackData> &tracks,
 
 				if (!track) {
 					tracks.append(SegmentData());
-					tracks.last().setFile(file->fileName());
 					track = true;
 				}
 
@@ -206,7 +205,6 @@ bool TwoNavParser::parse(QFile *file, QList<TrackData> &tracks,
 			case 'R':
 				{QStringList list(codec.toString(line).split(','));
 				routes.append(RouteData());
-				routes.last().setFile(file->fileName());
 				if (list.size() > 1)
 					routes.last().setName(list.at(1));
 				route = true;}