diff options
author | Leith Bade <leith@mapbox.com> | 2015-01-02 10:14:00 +1300 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2015-01-02 10:14:00 +1300 |
commit | e6b8c4c0478f0f2c062dc962f51fcfe9ab2190ee (patch) | |
tree | f5d15776561fbee022c6a5c24fc189723aa31d4e /include | |
parent | 937d8ef8d6a5f5aca6a3a2ad0189aed18fd0bfa3 (diff) | |
download | qtlocation-mapboxgl-e6b8c4c0478f0f2c062dc962f51fcfe9ab2190ee.tar.gz |
Clang-format on Android code
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/android/jni.hpp | 4 | ||||
-rw-r--r-- | include/mbgl/android/native_map_view.hpp | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/include/mbgl/android/jni.hpp b/include/mbgl/android/jni.hpp index 883f691cb2..17275b8964 100644 --- a/include/mbgl/android/jni.hpp +++ b/include/mbgl/android/jni.hpp @@ -27,14 +27,14 @@ extern jfieldID lonLatZoomLatId; extern jfieldID lonLatZoomZoomId; extern jclass runtimeExceptionClass; -extern jclass nullPointerExceptionClass;; +extern jclass nullPointerExceptionClass; +; extern jmethodID listToArrayId; extern jclass arrayListClass; extern jmethodID arrayListConstructorId; extern jmethodID arrayListAddId; - } } diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp index 2f0bde4b0e..fae21212ca 100644 --- a/include/mbgl/android/native_map_view.hpp +++ b/include/mbgl/android/native_map_view.hpp @@ -16,7 +16,7 @@ namespace android { class NativeMapView : public mbgl::View, private mbgl::util::noncopyable { public: - NativeMapView(JNIEnv* env, jobject obj); + NativeMapView(JNIEnv *env, jobject obj); virtual ~NativeMapView(); void activate() override; @@ -27,8 +27,8 @@ public: void notify() override; void notifyMapChange(mbgl::MapChange change, mbgl::timestamp delay) override; - mbgl::Map& getMap(); - mbgl::CachingHTTPFileSource& getFileSource(); + mbgl::Map &getMap(); + mbgl::CachingHTTPFileSource &getFileSource(); bool initializeDisplay(); void terminateDisplay(); @@ -36,7 +36,7 @@ public: bool initializeContext(); void terminateContext(); - bool createSurface(ANativeWindow* window); + bool createSurface(ANativeWindow *window); void destroySurface(); void start(); @@ -54,10 +54,10 @@ private: void loadExtensions(); private: - JavaVM* vm = nullptr; + JavaVM *vm = nullptr; jobject obj = nullptr; - ANativeWindow* window = nullptr; + ANativeWindow *window = nullptr; mbgl::CachingHTTPFileSource fileSource; mbgl::Map map; @@ -79,7 +79,6 @@ private: bool fpsEnabled = false; double fps = 0.0; }; - } } |