summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-06-07 16:36:35 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-06-13 10:57:46 -0700
commit39b0b36759c991bc6f99dc751a97d6438b277d09 (patch)
treef8b42c5f0e77d23237661297ae554dc410ace1f1 /src
parent37f9e838439c3b7fc162e01207aa36c6344fc09b (diff)
downloadqtlocation-mapboxgl-39b0b36759c991bc6f99dc751a97d6438b277d09.tar.gz
[core] Remove unnecessary virtual redoPlacement overload
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/tile/geometry_tile_data.hpp5
-rw-r--r--src/mbgl/tile/tile_data.hpp1
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/tile/geometry_tile_data.hpp b/src/mbgl/tile/geometry_tile_data.hpp
index 4e13278dc5..6c7ff2f3d9 100644
--- a/src/mbgl/tile/geometry_tile_data.hpp
+++ b/src/mbgl/tile/geometry_tile_data.hpp
@@ -39,8 +39,7 @@ public:
bool parsePending() override;
- void redoPlacement(PlacementConfig config) override;
- void redoPlacement() override;
+ void redoPlacement(PlacementConfig) override;
void queryRenderedFeatures(
std::unordered_map<std::string, std::vector<Feature>>& result,
@@ -51,6 +50,8 @@ public:
void cancel() override;
private:
+ void redoPlacement();
+
style::Style& style;
Worker& worker;
TileWorker tileWorker;
diff --git a/src/mbgl/tile/tile_data.hpp b/src/mbgl/tile/tile_data.hpp
index db3e024024..4eee82ef4c 100644
--- a/src/mbgl/tile/tile_data.hpp
+++ b/src/mbgl/tile/tile_data.hpp
@@ -46,7 +46,6 @@ public:
virtual bool parsePending() { return true; }
virtual void redoPlacement(PlacementConfig) {}
- virtual void redoPlacement() {}
virtual void queryRenderedFeatures(
std::unordered_map<std::string, std::vector<Feature>>& result,