From 815ffb253b555c9a99b7d63a343745db05802c76 Mon Sep 17 00:00:00 2001
From: Ivo van Dongen <info@ivovandongen.nl>
Date: Wed, 5 Jul 2017 20:20:20 +0300
Subject: [android][glfw][ios][macos][node][qt] rename backend to renderer
 backend

---
 platform/android/src/native_map_view.cpp          | 10 +++++-----
 platform/android/src/native_map_view.hpp          | 10 +++++-----
 platform/glfw/glfw_view.cpp                       |  2 +-
 platform/glfw/glfw_view.hpp                       |  6 +++---
 platform/ios/src/MGLMapView.mm                    |  8 ++++----
 platform/macos/src/MGLMapView.mm                  |  6 +++---
 platform/node/src/node_map.cpp                    |  2 +-
 platform/node/src/node_renderer_frontend.cpp      |  2 +-
 platform/node/src/node_renderer_frontend.hpp      |  2 +-
 platform/qt/src/qmapboxgl.cpp                     |  2 +-
 platform/qt/src/qmapboxgl_p.hpp                   |  6 +++---
 platform/qt/src/qmapboxgl_renderer_frontend_p.cpp |  2 +-
 platform/qt/src/thread_local.cpp                  |  2 +-
 13 files changed, 30 insertions(+), 30 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;
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp
index ffc6588464..7a65dc9117 100644
--- a/platform/glfw/glfw_view.cpp
+++ b/platform/glfw/glfw_view.cpp
@@ -11,8 +11,8 @@
 #include <mbgl/util/platform.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/chrono.hpp>
-#include <mbgl/map/backend_scope.hpp>
 #include <mbgl/renderer/renderer.hpp>
+#include <mbgl/renderer/backend_scope.hpp>
 #include <mbgl/map/camera.hpp>
 
 #include <mapbox/cheap_ruler.hpp>
diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp
index 02e98a831d..12035f3e39 100644
--- a/platform/glfw/glfw_view.hpp
+++ b/platform/glfw/glfw_view.hpp
@@ -2,7 +2,7 @@
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/view.hpp>
-#include <mbgl/map/backend.hpp>
+#include <mbgl/renderer/renderer_backend.hpp>
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/timer.hpp>
 #include <mbgl/util/geometry.hpp>
@@ -10,7 +10,7 @@
 struct GLFWwindow;
 class GLFWRendererFrontend;
 
-class GLFWView : public mbgl::View, public mbgl::Backend, public mbgl::MapObserver {
+class GLFWView : public mbgl::View, public mbgl::RendererBackend, public mbgl::MapObserver {
 public:
     GLFWView(bool fullscreen = false, bool benchmark = false);
     ~GLFWView() override;
@@ -42,7 +42,7 @@ public:
     mbgl::Size getSize() const;
     mbgl::Size getFramebufferSize() const;
 
-    // mbgl::Backend implementation
+    // mbgl::RendererBackend implementation
     void updateAssumedState() override;
 
     // mbgl::MapObserver implementation
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 133c704d0b..1800332e42 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -15,13 +15,13 @@
 #include <mbgl/util/default_thread_pool.hpp>
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/network_status.hpp>
-#include <mbgl/renderer/renderer.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/image.hpp>
 #include <mbgl/style/transition_options.hpp>
 #include <mbgl/style/layers/custom_layer.hpp>
-#include <mbgl/map/backend.hpp>
-#include <mbgl/map/backend_scope.hpp>
+#include <mbgl/renderer/renderer.hpp>
+#include <mbgl/renderer/renderer_backend.hpp>
+#include <mbgl/renderer/backend_scope.hpp>
 #include <mbgl/math/wrap.hpp>
 #include <mbgl/util/exception.hpp>
 #include <mbgl/util/geo.hpp>
@@ -5417,7 +5417,7 @@ public:
     return _annotationViewReuseQueueByIdentifier[identifier];
 }
 
-class MBGLView : public mbgl::View, public mbgl::Backend, public mbgl::MapObserver
+class MBGLView : public mbgl::View, public mbgl::RendererBackend, public mbgl::MapObserver
 {
 public:
     MBGLView(MGLMapView* nativeView_) : nativeView(nativeView_) {
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index d0cd4dce1b..10afdc6e5f 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -30,10 +30,10 @@
 #import <mbgl/map/camera.hpp>
 #import <mbgl/storage/reachability.h>
 #import <mbgl/util/default_thread_pool.hpp>
-#import <mbgl/map/backend.hpp>
-#import <mbgl/map/backend_scope.hpp>
 #import <mbgl/style/image.hpp>
 #import <mbgl/renderer/renderer.hpp>
+#import <mbgl/renderer/renderer_backend.hpp>
+#import <mbgl/renderer/backend_scope.hpp>
 #import <mbgl/storage/default_file_source.hpp>
 #import <mbgl/storage/network_status.hpp>
 #import <mbgl/math/wrap.hpp>
@@ -2763,7 +2763,7 @@ public:
 }
 
 /// Adapter responsible for bridging calls from mbgl to MGLMapView and Cocoa.
-class MGLMapViewImpl : public mbgl::View, public mbgl::Backend, public mbgl::MapObserver {
+class MGLMapViewImpl : public mbgl::View, public mbgl::RendererBackend, public mbgl::MapObserver {
 public:
     MGLMapViewImpl(MGLMapView *nativeView_) : nativeView(nativeView_) {}
 
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
index bb0080271e..b4e93455ea 100644
--- a/platform/node/src/node_map.cpp
+++ b/platform/node/src/node_map.cpp
@@ -8,12 +8,12 @@
 #include <mbgl/gl/headless_display.hpp>
 #include <mbgl/util/exception.hpp>
 #include <mbgl/renderer/renderer.hpp>
+#include <mbgl/renderer/backend_scope.hpp>
 #include <mbgl/style/conversion/source.hpp>
 #include <mbgl/style/conversion/layer.hpp>
 #include <mbgl/style/conversion/filter.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/image.hpp>
-#include <mbgl/map/backend_scope.hpp>
 #include <mbgl/map/map_observer.hpp>
 #include <mbgl/util/premultiply.hpp>
 
diff --git a/platform/node/src/node_renderer_frontend.cpp b/platform/node/src/node_renderer_frontend.cpp
index 4722b45351..ca9d0af7e6 100644
--- a/platform/node/src/node_renderer_frontend.cpp
+++ b/platform/node/src/node_renderer_frontend.cpp
@@ -1,6 +1,6 @@
 #include "node_renderer_frontend.hpp"
 #include <mbgl/renderer/renderer.hpp>
-#include <mbgl/map/backend_scope.hpp>
+#include <mbgl/renderer/backend_scope.hpp>
 
 namespace node_mbgl {
 
diff --git a/platform/node/src/node_renderer_frontend.hpp b/platform/node/src/node_renderer_frontend.hpp
index 6410e3db57..238c7363ae 100644
--- a/platform/node/src/node_renderer_frontend.hpp
+++ b/platform/node/src/node_renderer_frontend.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <mbgl/map/backend.hpp>
+#include <mbgl/renderer/renderer_backend.hpp>
 #include <mbgl/renderer/renderer_frontend.hpp>
 #include <mbgl/renderer/query.hpp>
 #include <mbgl/util/async_task.hpp>
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index aa02900c95..06901b13ba 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -8,7 +8,6 @@
 #include <mbgl/annotation/annotation.hpp>
 #include <mbgl/map/camera.hpp>
 #include <mbgl/map/map.hpp>
-#include <mbgl/map/backend_scope.hpp>
 #include <mbgl/math/minmax.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/conversion.hpp>
@@ -19,6 +18,7 @@
 #include <mbgl/style/transition_options.hpp>
 #include <mbgl/style/image.hpp>
 #include <mbgl/renderer/renderer.hpp>
+#include <mbgl/renderer/backend_scope.hpp>
 #include <mbgl/storage/network_status.hpp>
 #include <mbgl/util/color.hpp>
 #include <mbgl/util/constants.hpp>
diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp
index b9c1124551..3afd299067 100644
--- a/platform/qt/src/qmapboxgl_p.hpp
+++ b/platform/qt/src/qmapboxgl_p.hpp
@@ -4,8 +4,8 @@
 #include "qmapboxgl_renderer_frontend_p.hpp"
 
 #include <mbgl/map/map.hpp>
-#include <mbgl/map/backend.hpp>
 #include <mbgl/map/view.hpp>
+#include <mbgl/renderer/renderer_backend.hpp>
 #include <mbgl/util/default_thread_pool.hpp>
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/util/geo.hpp>
@@ -13,7 +13,7 @@
 #include <QObject>
 #include <QSize>
 
-class QMapboxGLPrivate : public QObject, public mbgl::View, public mbgl::Backend, public mbgl::MapObserver
+class QMapboxGLPrivate : public QObject, public mbgl::View, public mbgl::RendererBackend, public mbgl::MapObserver
 {
     Q_OBJECT
 
@@ -27,7 +27,7 @@ public:
     // mbgl::View implementation.
     void bind() final;
 
-    // mbgl::Backend implementation.
+    // mbgl::RendererBackend implementation.
     void updateAssumedState() final;
     void activate() final {}
     void deactivate() final {}
diff --git a/platform/qt/src/qmapboxgl_renderer_frontend_p.cpp b/platform/qt/src/qmapboxgl_renderer_frontend_p.cpp
index 836a9431b8..fd57168df6 100644
--- a/platform/qt/src/qmapboxgl_renderer_frontend_p.cpp
+++ b/platform/qt/src/qmapboxgl_renderer_frontend_p.cpp
@@ -1,6 +1,6 @@
 #include "qmapboxgl_renderer_frontend_p.hpp"
 
-#include <mbgl/map/backend_scope.hpp>
+#include <mbgl/renderer/backend_scope.hpp>
 #include <mbgl/renderer/renderer.hpp>
 
 QMapboxGLRendererFrontend::QMapboxGLRendererFrontend(std::unique_ptr<mbgl::Renderer> renderer_, mbgl::View& view_)
diff --git a/platform/qt/src/thread_local.cpp b/platform/qt/src/thread_local.cpp
index e835a680e2..bf2103c98f 100644
--- a/platform/qt/src/thread_local.cpp
+++ b/platform/qt/src/thread_local.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/util/thread_local.hpp>
 
 #include <mbgl/util/run_loop.hpp>
-#include <mbgl/map/backend_scope.hpp>
+#include <mbgl/renderer/backend_scope.hpp>
 
 #include <array>
 #include <cassert>
-- 
cgit v1.2.1