summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-07-05 20:20:20 +0300
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2017-07-18 10:45:12 +0200
commit815ffb253b555c9a99b7d63a343745db05802c76 (patch)
treebb88441f06a1db50415331a986ee7cea7ad1318e /platform/android
parent46c43510d7ac5fe078010d5f0f5d39c4d5df3305 (diff)
downloadqtlocation-mapboxgl-815ffb253b555c9a99b7d63a343745db05802c76.tar.gz
[android][glfw][ios][macos][node][qt] rename backend to renderer backend
Diffstat (limited to 'platform/android')
-rwxr-xr-xplatform/android/src/native_map_view.cpp10
-rwxr-xr-xplatform/android/src/native_map_view.hpp10
2 files changed, 10 insertions, 10 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index 5faad75d5d..8da2ccb6a2 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -14,7 +14,7 @@
#include <jni/jni.hpp>
-#include <mbgl/map/backend_scope.hpp>
+#include <mbgl/renderer/backend_scope.hpp>
#include <mbgl/math/minmax.hpp>
#include <mbgl/util/constants.hpp>
#include <mbgl/util/event.hpp>
@@ -110,7 +110,7 @@ void NativeMapView::bind() {
}
/**
- * From mbgl::Backend.
+ * From mbgl::RendererBackend.
*/
gl::ProcAddress NativeMapView::initializeExtension(const char* name) {
return eglGetProcAddress(name);
@@ -145,7 +145,7 @@ void NativeMapView::activate() {
}
/**
- * From mbgl::Backend.
+ * From mbgl::RendererBackend.
*/
void NativeMapView::deactivate() {
if (--active) {
@@ -172,7 +172,7 @@ void NativeMapView::deactivate() {
}
/**
- * From mbgl::Backend. Callback to java NativeMapView#onInvalidate().
+ * From mbgl::RendererBackend. Callback to java NativeMapView#onInvalidate().
*
* May be called from any thread
*/
@@ -183,7 +183,7 @@ void NativeMapView::invalidate() {
}
/**
- * From mbgl::Backend. Callback to java NativeMapView#onMapChanged(int).
+ * From mbgl::RendererBackend. Callback to java NativeMapView#onMapChanged(int).
*
* May be called from any thread
*/
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
index 35d4c68a98..6409237940 100755
--- a/platform/android/src/native_map_view.hpp
+++ b/platform/android/src/native_map_view.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include <mbgl/map/backend.hpp>
+#include <mbgl/renderer/renderer_backend.hpp>
#include <mbgl/map/change.hpp>
#include <mbgl/map/camera.hpp>
#include <mbgl/map/map.hpp>
@@ -38,7 +38,7 @@ namespace android {
class AndroidRendererFrontend;
-class NativeMapView : public View, public Backend, public MapObserver {
+class NativeMapView : public View, public RendererBackend, public MapObserver {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/NativeMapView"; };
@@ -59,14 +59,14 @@ public:
void bind() override;
- // mbgl::Backend //
+ // mbgl::RendererBackend //
void updateAssumedState() override;
// Deprecated //
void notifyMapChange(mbgl::MapChange);
- // mbgl::Backend (mbgl::MapObserver) //
+ // mbgl::RendererBackend (mbgl::MapObserver) //
void onCameraWillChange(MapObserver::CameraChangeMode) override;
void onCameraIsChanging() override;
void onCameraDidChange(MapObserver::CameraChangeMode) override;
@@ -266,7 +266,7 @@ public:
void removeImage(JNIEnv&, jni::String);
protected:
- // mbgl::Backend //
+ // mbgl::RendererBackend //
gl::ProcAddress initializeExtension(const char*) override;
void activate() override;