Code cleanup

src/graphview.cpp

@@ -67,8 +67,6 @@ GraphView::~GraphView()
 
 	if (_info->scene() != _scene)
 		delete _info;
-
-	delete _scene;
 }
 
 void GraphView::updateBounds(const QPointF &point)

src/gui.cpp

@@ -26,7 +26,7 @@
 #include "speedgraph.h"
 #include "heartrategraph.h"
 #include "trackview.h"
-#include "infoitem.h"
+#include "trackinfo.h"
 #include "filebrowser.h"
 #include "cpuarch.h"
 #include "gui.h"
@@ -656,13 +656,7 @@ void GUI::saveFile(const QString &fileName)
 
 	QPainter p(&printer);
 
-	_track->plot(&p, QRectF(0, 300, printer.width(), (0.80 * printer.height())
-	  - 400));
-	_elevationGraph->plot(&p,  QRectF(0, 0.80 * printer.height(),
-	  printer.width(), printer.height() * 0.20));
-
-	QGraphicsScene scene;
-	InfoItem info;
+	TrackInfo info;
 	if (_imperialUnitsAction->isChecked()) {
 		info.insert(tr("Distance"), QString::number(_distance * M2MI, 'f', 1)
 		  + UNIT_SPACE + tr("mi"));
@@ -688,8 +682,12 @@ void GUI::saveFile(const QString &fileName)
 		info.insert(tr("Minimum"), QString::number(_elevationGraph->min(), 'f',
 		  0) + UNIT_SPACE + tr("m"));
 	}
-	scene.addItem(&info);
-	scene.render(&p, QRectF(0, 0, printer.width(), 200));
+
+	_track->plot(&p, QRectF(0, 300, printer.width(), (0.80 * printer.height())
+	  - 400));
+	_elevationGraph->plot(&p,  QRectF(0, 0.80 * printer.height(),
+	  printer.width(), printer.height() * 0.20));
+	info.plot(&p, QRectF(0, 0, printer.width(), 200));
 }
 
 void GUI::reloadFile()

src/trackinfo.cpp

@@ -0,0 +1,18 @@
+#include "infoitem.h"
+#include "trackinfo.h"
+
+TrackInfo::TrackInfo(QObject *parent) : QGraphicsScene(parent)
+{
+	_info = new InfoItem();
+	addItem(_info);
+}
+
+void TrackInfo::insert(const QString &key, const QString &value)
+{
+	_info->insert(key, value);
+}
+
+void TrackInfo::plot(QPainter *painter, const QRectF &target)
+{
+	render(painter, QRectF(0, 0, target.width(), target.height()));
+}

src/trackinfo.h

@@ -0,0 +1,22 @@
+#ifndef TRACKINFO_H
+#define TRACKINFO_H
+
+#include <QGraphicsScene>
+
+class InfoItem;
+
+class TrackInfo : public QGraphicsScene
+{
+	Q_OBJECT
+
+public:
+	TrackInfo(QObject *parent = 0);
+
+	void insert(const QString &key, const QString &value);
+	void plot(QPainter *painter, const QRectF &target);
+
+private:
+	InfoItem *_info;
+};
+
+#endif // TRACKINFO_H

src/trackview.cpp

@@ -40,7 +40,8 @@ TrackView::TrackView(QWidget *parent)
 
 TrackView::~TrackView()
 {
-	delete _scene;
+	if (_mapScale->scene() != _scene)
+		delete _mapScale;
 }
 
 void TrackView::addTrack(const QVector<QPointF> &track)