Skip to content

Commit 6e288c3

Browse files
committed
Track: Move from sensors to core
This unit has no dependencies on Qt Positioning or Sensors.
1 parent 9e867c6 commit 6e288c3

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ set(Mapper_Common_SRCS
5858
core/map_view.cpp
5959
core/path_coord.cpp
6060
core/storage_location.cpp
61+
core/track.cpp
6162
core/virtual_coord_vector.cpp
6263
core/virtual_path.cpp
6364

@@ -158,7 +159,6 @@ set(Mapper_Common_SRCS
158159
sensors/compass.cpp
159160
sensors/gps_display.cpp
160161
sensors/gps_temporary_markers.cpp
161-
sensors/gps_track.cpp
162162
sensors/gps_track_recorder.cpp
163163

164164
templates/template.cpp

src/sensors/gps_track.cpp renamed to src/core/track.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright 2012, 2013 Thomas Schöps
3-
* Copyright 2014-2017 Kai Pastor
3+
* Copyright 2014-2018 Kai Pastor
44
*
55
* This file is part of OpenOrienteering.
66
*
@@ -19,7 +19,7 @@
1919
*/
2020

2121

22-
#include "gps_track.h"
22+
#include "track.h"
2323

2424
#include <QApplication>
2525
#include <QFile>

src/sensors/gps_track.h renamed to src/core/track.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright 2012, 2013 Thomas Schöps
3+
* Copyright 2017, 2018 Kai Pastor
34
*
45
* This file is part of OpenOrienteering.
56
*
@@ -18,8 +19,8 @@
1819
*/
1920

2021

21-
#ifndef OPENORIENTEERING_GPS_TRACK_H
22-
#define OPENORIENTEERING_GPS_TRACK_H
22+
#ifndef OPENORIENTEERING_TRACK_H
23+
#define OPENORIENTEERING_TRACK_H
2324

2425
#include <vector>
2526

@@ -179,4 +180,4 @@ const Track::ElementTags& Track::tags() const
179180

180181
} // namespace OpenOrienteering
181182

182-
#endif
183+
#endif // OPENORIENTEERING_TRACK_H

src/gdal/ogr_template.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
#include "core/latlon.h"
4141
#include "core/map.h"
4242
#include "core/map_coord.h"
43+
#include "core/track.h"
4344
#include "core/objects/object.h"
4445
#include "fileformats/file_format.h"
4546
#include "gdal/gdal_manager.h"
4647
#include "gdal/ogr_file_format_p.h"
4748
#include "gui/georeferencing_dialog.h"
48-
#include "sensors/gps_track.h"
4949
#include "templates/template.h"
5050
#include "templates/template_positioning_dialog.h"
5151
#include "templates/template_track.h"

src/templates/template_track.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#include <QRectF>
3030
#include <QString>
3131

32+
#include "core/track.h"
3233
#include "templates/template.h"
33-
#include "sensors/gps_track.h"
3434

3535
class QByteArray;
3636
class QPainter;

0 commit comments

Comments
 (0)