TemplateTrack: Clear warnings

Author: dg0yt

src/templates/template_track.cpp

@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012, 2013 Thomas Schöps
- *    Copyright 2013-2019 Kai Pastor
+ *    Copyright 2013-2020 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -145,7 +145,7 @@ bool TemplateTrack::loadTypeSpecificTemplateConfiguration(QXmlStreamReader& xml)
 	else if (xml.name() == QLatin1String("georeferencing"))
 	{
 		// Preserve explicit georeferencing from OgrTemplate.
-		preserved_georef.reset(new Georeferencing());
+		preserved_georef = std::make_unique<Georeferencing>();
 		preserved_georef->load(xml, false);
 	}
 	else
@@ -329,8 +329,8 @@ void TemplateTrack::drawWaypoints(QPainter* painter) const
 		{
 			painter->setPen(qRgb(255, 0, 0));
 			int width = painter->fontMetrics().width(point_name);
-			painter->drawText(QRect(point.map_coord.x() - 0.5*width,
-			                        point.map_coord.y() - height,
+			painter->drawText(QRect(qRound(point.map_coord.x() - 0.5*width),
+			                        qRound(point.map_coord.y() - height),
 			                        width,
 			                        height),
 			                  Qt::AlignCenter,
@@ -389,7 +389,7 @@ bool TemplateTrack::hasAlpha() const
 
 PathObject* TemplateTrack::importPathStart()
 {
-	PathObject* path = new PathObject();
+	auto* path = new PathObject();
 	path->setSymbol(map->getUndefinedLine(), true);
 	return path;
 }
@@ -402,7 +402,7 @@ void TemplateTrack::importPathEnd(PathObject* path)
 
 PointObject* TemplateTrack::importWaypoint(const MapCoordF& position, const QString& name)
 {
-	PointObject* point = new PointObject(map->getUndefinedPoint());
+	auto* point = new PointObject(map->getUndefinedPoint());
 	point->setPosition(position);
 	point->setTag(QStringLiteral("name"), name);
 	map->addObject(point);
@@ -418,7 +418,7 @@ bool TemplateTrack::import(QWidget* dialog_parent)
 		return false;
 	}
 
-	DeleteObjectsUndoStep* undo_step = new DeleteObjectsUndoStep(map);
+	auto* undo_step = new DeleteObjectsUndoStep(map);
 	MapPart* part = map->getCurrentPart();
 	std::vector< Object* > result;
 	// clazy:excludeall=reserve-candidates

src/templates/template_track.h

@@ -1,6 +1,6 @@
 /*
  *    Copyright 2012-2014 Thomas Schöps
- *    Copyright 2013-2019 Kai Pastor
+ *    Copyright 2013-2020 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -63,7 +63,13 @@ Q_OBJECT
 protected:
 	TemplateTrack(const TemplateTrack& proto);
 public:
-    ~TemplateTrack() override;
+	TemplateTrack() = delete;
+	TemplateTrack(TemplateTrack&&) = delete;
+	
+	~TemplateTrack() override;
+	
+	TemplateTrack& operator=(const TemplateTrack&) = delete;
+	TemplateTrack& operator=(TemplateTrack&&) = delete;
 
 	TemplateTrack* duplicate() const override;
 
@@ -76,10 +82,10 @@ Q_OBJECT
 	bool postLoadConfiguration(QWidget* dialog_parent, bool& out_center_in_view) override;
 	void unloadTemplateFileImpl() override;
 
-    void drawTemplate(QPainter* painter, const QRectF& clip_rect, double scale, bool on_screen, qreal opacity) const override;
+	void drawTemplate(QPainter* painter, const QRectF& clip_rect, double scale, bool on_screen, qreal opacity) const override;
 	QRectF getTemplateExtent() const override;
-    QRectF calculateTemplateBoundingBox() const override;
-    int getTemplateBoundingBoxPixelBorder() override;
+	QRectF calculateTemplateBoundingBox() const override;
+	int getTemplateBoundingBoxPixelBorder() override;
 
 	bool hasAlpha() const override;
 
@@ -104,8 +110,8 @@ public slots:
 	void updateGeoreferencing();
 
 protected:
-    void saveTypeSpecificTemplateConfiguration(QXmlStreamWriter& xml) const override;
-    bool loadTypeSpecificTemplateConfiguration(QXmlStreamReader& xml) override;
+	void saveTypeSpecificTemplateConfiguration(QXmlStreamWriter& xml) const override;
+	bool loadTypeSpecificTemplateConfiguration(QXmlStreamReader& xml) override;
 
 	/// Projects the track in non-georeferenced mode
 	QString calculateLocalGeoreferencing() const;
@@ -116,7 +122,7 @@ public slots:
 	void importPathEnd(PathObject* path);
 	PointObject* importWaypoint(const MapCoordF& position, const QString &name = QString());
 
-	
+private:
 	Track track;
 	QString track_crs_spec;
 	QString projected_crs_spec;