Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'openlr/openlr_match_quality/openlr_assessment_tool')
-rw-r--r--openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp2
-rw-r--r--openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp3
-rw-r--r--openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp5
3 files changed, 4 insertions, 6 deletions
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp b/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
index 8cb93fc125..1ee4a5f296 100644
--- a/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
+++ b/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
@@ -229,7 +229,7 @@ public:
private:
Framework & m_framework;
- DataSourceBase const & m_dataSource;
+ DataSource const & m_dataSource;
routing::FeaturesRoadGraph m_roadGraph;
};
} // namespace
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp b/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
index 1c8fe93757..e1fbe1929f 100644
--- a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
+++ b/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
@@ -102,8 +102,7 @@ void RoadPointCandidate::SetActivePoint(FeatureID const & fid)
namespace openlr
{
// TrafficMode -------------------------------------------------------------------------------------
-TrafficMode::TrafficMode(std::string const & dataFileName,
- DataSourceBase const & dataSource,
+TrafficMode::TrafficMode(std::string const & dataFileName, DataSource const & dataSource,
std::unique_ptr<TrafficDrawerDelegateBase> drawerDelegate,
std::unique_ptr<PointsControllerDelegateBase> pointsDelegate,
QObject * parent)
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp b/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp
index 42ad40cd24..4d7c88654d 100644
--- a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp
+++ b/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp
@@ -67,8 +67,7 @@ class TrafficMode : public QAbstractTableModel
public:
// TODO(mgsergio): Check we are on the right mwm. I.e. right mwm version and everything.
- TrafficMode(std::string const & dataFileName,
- DataSourceBase const & dataSource,
+ TrafficMode(std::string const & dataFileName, DataSource const & dataSource,
std::unique_ptr<TrafficDrawerDelegateBase> drawerDelegate,
std::unique_ptr<PointsControllerDelegateBase> pointsDelegate,
QObject * parent = Q_NULLPTR);
@@ -114,7 +113,7 @@ private:
void HandlePoint(m2::PointD clickPoint, Qt::MouseButton const button);
bool StartBuildingPathChecks() const;
- DataSourceBase const & m_dataSource;
+ DataSource const & m_dataSource;
std::vector<SegmentCorrespondence> m_segments;
// Non-owning pointer to an element of m_segments.
SegmentCorrespondence * m_currentSegment = nullptr;