From ae9fb18a8d5bd3ed21d2a6d7d48519a93c9f1086 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Tue, 23 Dec 2014 11:34:27 +1300
Subject: [PATCH] Rename View functions

---
 android/cpp/native_map_view.cpp          | 14 +++++++-------
 include/mbgl/android/native_map_view.hpp |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/android/cpp/native_map_view.cpp b/android/cpp/native_map_view.cpp
index bf4b8a757..7b91af0fd 100644
--- a/android/cpp/native_map_view.cpp
+++ b/android/cpp/native_map_view.cpp
@@ -86,8 +86,8 @@ NativeMapView::~NativeMapView() {
     vm = nullptr;
 }
 
-void NativeMapView::make_active() {
-    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::make_active");
+void NativeMapView::activate() {
+    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::activate");
     if ((display != EGL_NO_DISPLAY) && (surface != EGL_NO_SURFACE) && (context != EGL_NO_CONTEXT)) {
         if (!eglMakeCurrent(display, surface, surface, context)) {
             mbgl::Log::Error(mbgl::Event::OpenGL, "eglMakeCurrent() returned error %d", eglGetError());
@@ -97,8 +97,8 @@ void NativeMapView::make_active() {
     }
 }
 
-void NativeMapView::make_inactive() {
-    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::make_inactive");
+void NativeMapView::deactivate() {
+    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::deactivate");
     if (!eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) {
         mbgl::Log::Error(mbgl::Event::OpenGL, "eglMakeCurrent(EGL_NO_CONTEXT) returned error %d", eglGetError());
     }
@@ -674,15 +674,15 @@ void NativeMapView::resume() {
     }
 }
 
-void NativeMapView::notify_map_change(mbgl::MapChange, mbgl::timestamp) {
-    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::notify_map_change()");
+void NativeMapView::notifyMapChange(mbgl::MapChange, mbgl::timestamp) {
+    mbgl::Log::Debug(mbgl::Event::Android, "NativeMapView::notifyMapChange()");
 
     assert(vm != nullptr);
     assert(obj != nullptr);
 
     JavaVMAttachArgs args = {
         JNI_VERSION_1_2,
-        "NativeMapView::notify_map_change()",
+        "NativeMapView::notifyMapChange()",
         NULL
     };
 
diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp
index f8cf34d3b..2f0bde4b0 100644
--- a/include/mbgl/android/native_map_view.hpp
+++ b/include/mbgl/android/native_map_view.hpp
@@ -19,13 +19,13 @@ public:
     NativeMapView(JNIEnv* env, jobject obj);
     virtual ~NativeMapView();
 
-    void make_active() override;
-    void make_inactive() override;
+    void activate() override;
+    void deactivate() override;
 
     void swap() override;
 
     void notify() override;
-    void notify_map_change(mbgl::MapChange change, mbgl::timestamp delay) override;
+    void notifyMapChange(mbgl::MapChange change, mbgl::timestamp delay) override;
 
     mbgl::Map& getMap();
     mbgl::CachingHTTPFileSource& getFileSource();