summaryrefslogtreecommitdiff
path: root/platform/android/src
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2018-11-06 11:31:37 +0200
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2018-11-07 16:34:20 +0200
commit6f34e69b2e7bfb61ae4a1c88799397f18d4175a3 (patch)
tree82ec7a4e37bea4589466da5447712dfcad13de7b /platform/android/src
parent80ec05cf47feb9f225d46222980d6942b9a4038f (diff)
downloadqtlocation-mapboxgl-6f34e69b2e7bfb61ae4a1c88799397f18d4175a3.tar.gz
[android] layers.cpp/hpp -> layer_manager.cpp/hpp
Diffstat (limited to 'platform/android/src')
-rwxr-xr-xplatform/android/src/jni.cpp2
-rwxr-xr-xplatform/android/src/native_map_view.hpp2
-rw-r--r--platform/android/src/style/layers/layer_manager.cpp (renamed from platform/android/src/style/layers/layers.cpp)2
-rw-r--r--platform/android/src/style/layers/layer_manager.hpp (renamed from platform/android/src/style/layers/layers.hpp)0
4 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index 4e9cc2af07..8c1e45f7d3 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -43,7 +43,7 @@
#include "offline/offline_region_error.hpp"
#include "offline/offline_region_status.hpp"
#include "style/transition_options.hpp"
-#include "style/layers/layers.hpp"
+#include "style/layers/layer_manager.hpp"
#include "style/sources/source.hpp"
#include "style/light.hpp"
#include "snapshotter/map_snapshotter.hpp"
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
index 08f1efa46d..704331d8e2 100755
--- a/platform/android/src/native_map_view.hpp
+++ b/platform/android/src/native_map_view.hpp
@@ -18,7 +18,7 @@
#include "geojson/geometry.hpp"
#include "geometry/lat_lng.hpp"
#include "geometry/projected_meters.hpp"
-#include "style/layers/layers.hpp"
+#include "style/layers/layer_manager.hpp"
#include "style/sources/source.hpp"
#include "geometry/lat_lng_bounds.hpp"
#include "map/camera_position.hpp"
diff --git a/platform/android/src/style/layers/layers.cpp b/platform/android/src/style/layers/layer_manager.cpp
index 30421d31dd..ed553bc8e6 100644
--- a/platform/android/src/style/layers/layers.cpp
+++ b/platform/android/src/style/layers/layer_manager.cpp
@@ -1,4 +1,4 @@
-#include "layers.hpp"
+#include "layer_manager.hpp"
#include <mbgl/style/layer.hpp>
#include <mbgl/style/layer_impl.hpp>
diff --git a/platform/android/src/style/layers/layers.hpp b/platform/android/src/style/layers/layer_manager.hpp
index 7684108555..7684108555 100644
--- a/platform/android/src/style/layers/layers.hpp
+++ b/platform/android/src/style/layers/layer_manager.hpp