diff options
Diffstat (limited to 'platform')
45 files changed, 53 insertions, 53 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 5e37d13e60..9156054de0 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -44,7 +44,7 @@ macro(mbgl_platform_core) PRIVATE platform/default/sqlite3.hpp # Misc - PRIVATE platform/android/src/log_android.cpp + PRIVATE platform/android/src/logging_android.cpp PRIVATE platform/default/string_stdlib.cpp # Image handling diff --git a/platform/android/src/connectivity_listener.cpp b/platform/android/src/connectivity_listener.cpp index df5c60a485..cc2f0a4a81 100644 --- a/platform/android/src/connectivity_listener.cpp +++ b/platform/android/src/connectivity_listener.cpp @@ -1,7 +1,7 @@ #include "connectivity_listener.hpp" #include <mbgl/storage/network_status.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <jni/jni.hpp> diff --git a/platform/android/src/example_custom_layer.cpp b/platform/android/src/example_custom_layer.cpp index 0fb0287f3d..c55c9c3527 100644 --- a/platform/android/src/example_custom_layer.cpp +++ b/platform/android/src/example_custom_layer.cpp @@ -1,7 +1,7 @@ #include <jni.h> #include <GLES2/gl2.h> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/style/layers/custom_layer.hpp> diff --git a/platform/android/src/geometry/conversion/feature.hpp b/platform/android/src/geometry/conversion/feature.hpp index 9f75b9c8f1..f0c77c3389 100644 --- a/platform/android/src/geometry/conversion/feature.hpp +++ b/platform/android/src/geometry/conversion/feature.hpp @@ -16,7 +16,7 @@ #include <vector> #include <sstream> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> namespace mbgl { namespace android { diff --git a/platform/android/src/http_file_source.cpp b/platform/android/src/http_file_source.cpp index ed4d81391f..ee1429bd74 100644 --- a/platform/android/src/http_file_source.cpp +++ b/platform/android/src/http_file_source.cpp @@ -1,7 +1,7 @@ #include <mbgl/storage/http_file_source.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/async_task.hpp> #include <mbgl/util/util.hpp> diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index c7f53d028b..0c740d7fdd 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -25,8 +25,8 @@ #include <mbgl/style/layer.hpp> #include <mbgl/style/source.hpp> #include <mbgl/sprite/sprite_image.hpp> -#include <mbgl/platform/event.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/event.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/storage/network_status.hpp> #include <mbgl/util/exception.hpp> #include <mbgl/util/optional.hpp> diff --git a/platform/android/src/log_android.cpp b/platform/android/src/logging_android.cpp index e5c8cfd812..2e025c059f 100644 --- a/platform/android/src/log_android.cpp +++ b/platform/android/src/logging_android.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <android/log.h> diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 984fe9d382..83f351b7b3 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -10,9 +10,9 @@ #include <sys/system_properties.h> -#include <mbgl/platform/platform.hpp> -#include <mbgl/platform/event.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/platform.hpp> +#include <mbgl/util/event.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/gl/extension.hpp> #include <mbgl/gl/context.hpp> #include <mbgl/util/constants.hpp> diff --git a/platform/android/src/run_loop.cpp b/platform/android/src/run_loop.cpp index 1e5fc9b4ba..170b05c23c 100644 --- a/platform/android/src/run_loop.cpp +++ b/platform/android/src/run_loop.cpp @@ -1,6 +1,6 @@ #include "run_loop_impl.hpp" -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/platform.hpp> #include <mbgl/util/thread_context.hpp> #include <mbgl/util/thread_local.hpp> #include <mbgl/util/timer.hpp> diff --git a/platform/android/src/style/android_conversion.hpp b/platform/android/src/style/android_conversion.hpp index cea7ce6d2a..de0ac91502 100644 --- a/platform/android/src/style/android_conversion.hpp +++ b/platform/android/src/style/android_conversion.hpp @@ -2,7 +2,7 @@ #include "value.hpp" -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/style/conversion.hpp> #include <mbgl/util/feature.hpp> #include <mbgl/util/optional.hpp> diff --git a/platform/android/src/style/conversion/geojson.hpp b/platform/android/src/style/conversion/geojson.hpp index 920c670fcb..6bc48b3700 100644 --- a/platform/android/src/style/conversion/geojson.hpp +++ b/platform/android/src/style/conversion/geojson.hpp @@ -6,7 +6,7 @@ #include <mbgl/style/conversion.hpp> #include <mbgl/style/conversion/geojson.hpp> #include <mbgl/util/rapidjson.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <jni/jni.hpp> #include <sstream> diff --git a/platform/android/src/style/layers/custom_layer.cpp b/platform/android/src/style/layers/custom_layer.cpp index 6568455c67..d5d330a019 100644 --- a/platform/android/src/style/layers/custom_layer.cpp +++ b/platform/android/src/style/layers/custom_layer.cpp @@ -2,7 +2,7 @@ #include <string> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> namespace mbgl { namespace android { diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp index 00a52147b8..c0c57c839d 100644 --- a/platform/android/src/style/layers/layer.cpp +++ b/platform/android/src/style/layers/layer.cpp @@ -3,7 +3,7 @@ #include <jni/jni.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> //Java -> C++ conversion #include <mbgl/style/conversion.hpp> diff --git a/platform/android/src/style/sources/source.cpp b/platform/android/src/style/sources/source.cpp index 36023d2ff7..aca7bd6a84 100644 --- a/platform/android/src/style/sources/source.cpp +++ b/platform/android/src/style/sources/source.cpp @@ -3,7 +3,7 @@ #include <jni/jni.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> //Java -> C++ conversion #include <mbgl/style/conversion.hpp> diff --git a/platform/android/src/thread.cpp b/platform/android/src/thread.cpp index 77f9815866..c708dfdceb 100644 --- a/platform/android/src/thread.cpp +++ b/platform/android/src/thread.cpp @@ -1,5 +1,5 @@ -#include <mbgl/platform/log.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/logging.hpp> +#include <mbgl/util/platform.hpp> #include <sys/prctl.h> #include <sys/resource.h> diff --git a/platform/darwin/src/log_nslog.mm b/platform/darwin/src/logging_nslog.mm index 49583ae3c4..dd428f56b1 100644 --- a/platform/darwin/src/log_nslog.mm +++ b/platform/darwin/src/logging_nslog.mm @@ -1,4 +1,4 @@ -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/enum.hpp> #import <Foundation/Foundation.h> diff --git a/platform/darwin/src/nsthread.mm b/platform/darwin/src/nsthread.mm index eee6d6991b..6caa1be43e 100644 --- a/platform/darwin/src/nsthread.mm +++ b/platform/darwin/src/nsthread.mm @@ -1,6 +1,6 @@ #import <Foundation/Foundation.h> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/platform.hpp> #include <pthread.h> diff --git a/platform/darwin/src/string_nsstring.mm b/platform/darwin/src/string_nsstring.mm index 9bf199afc0..08f9aeccef 100644 --- a/platform/darwin/src/string_nsstring.mm +++ b/platform/darwin/src/string_nsstring.mm @@ -1,6 +1,6 @@ #import <Foundation/Foundation.h> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/platform.hpp> namespace mbgl { namespace platform { diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp index 7b52637c15..c4222b5a12 100644 --- a/platform/default/default_file_source.cpp +++ b/platform/default/default_file_source.cpp @@ -5,7 +5,7 @@ #include <mbgl/storage/offline_database.hpp> #include <mbgl/storage/offline_download.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/platform.hpp> #include <mbgl/util/url.hpp> #include <mbgl/util/thread.hpp> #include <mbgl/util/work_request.hpp> diff --git a/platform/default/headless_backend_osmesa.cpp b/platform/default/headless_backend_osmesa.cpp index 3dac5913ac..081bddf170 100644 --- a/platform/default/headless_backend_osmesa.cpp +++ b/platform/default/headless_backend_osmesa.cpp @@ -1,5 +1,5 @@ #include <mbgl/gl/headless_backend.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <GL/osmesa.h> diff --git a/platform/default/http_file_source.cpp b/platform/default/http_file_source.cpp index ce6987fbdd..867d85fa4d 100644 --- a/platform/default/http_file_source.cpp +++ b/platform/default/http_file_source.cpp @@ -1,7 +1,7 @@ #include <mbgl/storage/http_file_source.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/util.hpp> #include <mbgl/util/optional.hpp> diff --git a/platform/default/log_stderr.cpp b/platform/default/logging_stderr.cpp index 145cdeda03..41585fb7bb 100644 --- a/platform/default/log_stderr.cpp +++ b/platform/default/logging_stderr.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/enum.hpp> #include <iostream> diff --git a/platform/default/mbgl/storage/offline_database.cpp b/platform/default/mbgl/storage/offline_database.cpp index 4bcc9ad711..73364b042f 100644 --- a/platform/default/mbgl/storage/offline_database.cpp +++ b/platform/default/mbgl/storage/offline_database.cpp @@ -4,7 +4,7 @@ #include <mbgl/util/io.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/chrono.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include "sqlite3.hpp" #include <sqlite3.h> diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp index 4f191f6cf7..0f2bc5ff56 100644 --- a/platform/default/online_file_source.cpp +++ b/platform/default/online_file_source.cpp @@ -3,7 +3,7 @@ #include <mbgl/storage/network_status.hpp> #include <mbgl/storage/response.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/thread.hpp> diff --git a/platform/default/png_reader.cpp b/platform/default/png_reader.cpp index 7c10f20667..5ae74d74db 100644 --- a/platform/default/png_reader.cpp +++ b/platform/default/png_reader.cpp @@ -1,7 +1,7 @@ #include <mbgl/util/image.hpp> #include <mbgl/util/premultiply.hpp> #include <mbgl/util/char_array_buffer.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <istream> #include <sstream> diff --git a/platform/default/sqlite3.cpp b/platform/default/sqlite3.cpp index 578e407739..670b7b84cc 100644 --- a/platform/default/sqlite3.cpp +++ b/platform/default/sqlite3.cpp @@ -7,7 +7,7 @@ #include <chrono> #include <experimental/optional> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> namespace mapbox { namespace sqlite { diff --git a/platform/default/string_stdlib.cpp b/platform/default/string_stdlib.cpp index 0e97fc54d5..2642e88aff 100644 --- a/platform/default/string_stdlib.cpp +++ b/platform/default/string_stdlib.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/platform.hpp> #define NU_WITH_TOUPPER #define NU_WITH_TOLOWER #define NU_WITH_UTF8_WRITER diff --git a/platform/default/thread.cpp b/platform/default/thread.cpp index f4d0b9a855..c7c79b4fb0 100644 --- a/platform/default/thread.cpp +++ b/platform/default/thread.cpp @@ -1,5 +1,5 @@ -#include <mbgl/platform/platform.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/platform.hpp> +#include <mbgl/util/logging.hpp> #include <string> diff --git a/platform/default/webp_reader.cpp b/platform/default/webp_reader.cpp index a56632157f..2c01fb4479 100644 --- a/platform/default/webp_reader.cpp +++ b/platform/default/webp_reader.cpp @@ -1,6 +1,6 @@ #include <mbgl/util/image.hpp> #include <mbgl/util/premultiply.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> extern "C" { diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index ecc5e73da1..fdf82fda8f 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -6,8 +6,8 @@ #include <mbgl/gl/gl.hpp> #include <mbgl/gl/extension.hpp> #include <mbgl/gl/context.hpp> -#include <mbgl/platform/log.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/logging.hpp> +#include <mbgl/util/platform.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/chrono.hpp> #include <mbgl/map/camera.hpp> diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp index e3c36dfbb8..1f683b185f 100644 --- a/platform/glfw/main.cpp +++ b/platform/glfw/main.cpp @@ -2,8 +2,8 @@ #include "settings_json.hpp" #include <mbgl/util/default_styles.hpp> -#include <mbgl/platform/log.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/logging.hpp> +#include <mbgl/util/platform.hpp> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index 565cfc8a13..f9a24964f6 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -34,7 +34,7 @@ macro(mbgl_platform_core) # Misc PRIVATE platform/darwin/mbgl/storage/reachability.h PRIVATE platform/darwin/mbgl/storage/reachability.m - PRIVATE platform/darwin/src/log_nslog.mm + PRIVATE platform/darwin/src/logging_nslog.mm PRIVATE platform/darwin/src/nsthread.mm PRIVATE platform/darwin/src/string_nsstring.mm diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index be4e25b46e..98a1f768f7 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -1,6 +1,6 @@ #import "MGLMapView_Private.h" -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/gl/extension.hpp> #include <mbgl/gl/context.hpp> @@ -12,7 +12,7 @@ #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/map/camera.hpp> #include <mbgl/map/mode.hpp> -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/platform.hpp> #include <mbgl/storage/reachability.h> #include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 20679f53e9..1d440645b5 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -67,7 +67,7 @@ macro(mbgl_platform_core) PRIVATE platform/default/sqlite3.hpp # Misc - PRIVATE platform/default/log_stderr.cpp + PRIVATE platform/default/logging_stderr.cpp PRIVATE platform/default/string_stdlib.cpp PRIVATE platform/default/thread.cpp diff --git a/platform/linux/src/headless_backend_egl.cpp b/platform/linux/src/headless_backend_egl.cpp index 6288cf3805..38bd3e0a20 100644 --- a/platform/linux/src/headless_backend_egl.cpp +++ b/platform/linux/src/headless_backend_egl.cpp @@ -1,7 +1,7 @@ #include <mbgl/gl/headless_backend.hpp> #include <mbgl/gl/headless_display.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <EGL/egl.h> diff --git a/platform/linux/src/headless_backend_glx.cpp b/platform/linux/src/headless_backend_glx.cpp index 79e3fe1390..5791f1892f 100644 --- a/platform/linux/src/headless_backend_glx.cpp +++ b/platform/linux/src/headless_backend_glx.cpp @@ -1,7 +1,7 @@ #include <mbgl/gl/headless_backend.hpp> #include <mbgl/gl/headless_display.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <cassert> diff --git a/platform/linux/src/headless_display_egl.cpp b/platform/linux/src/headless_display_egl.cpp index 95c2ebb6a6..e1ba0aef13 100644 --- a/platform/linux/src/headless_display_egl.cpp +++ b/platform/linux/src/headless_display_egl.cpp @@ -1,5 +1,5 @@ #include <mbgl/gl/headless_display.hpp> -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/string.hpp> #include <EGL/egl.h> diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index 6c518becf2..f602f79d62 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -34,7 +34,7 @@ macro(mbgl_platform_core) # Misc PRIVATE platform/darwin/mbgl/storage/reachability.h PRIVATE platform/darwin/mbgl/storage/reachability.m - PRIVATE platform/darwin/src/log_nslog.mm + PRIVATE platform/darwin/src/logging_nslog.mm PRIVATE platform/darwin/src/nsthread.mm PRIVATE platform/darwin/src/string_nsstring.mm diff --git a/platform/node/src/node_log.cpp b/platform/node/src/node_logging.cpp index 0a97ebce36..5e7326e90a 100644 --- a/platform/node/src/node_log.cpp +++ b/platform/node/src/node_logging.cpp @@ -1,4 +1,4 @@ -#include "node_log.hpp" +#include "node_logging.hpp" #include <mbgl/util/enum.hpp> diff --git a/platform/node/src/node_log.hpp b/platform/node/src/node_logging.hpp index a19c61284b..a12603ba6e 100644 --- a/platform/node/src/node_log.hpp +++ b/platform/node/src/node_logging.hpp @@ -2,7 +2,7 @@ #include "util/async_queue.hpp" -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/platform/node/src/node_mapbox_gl_native.cpp b/platform/node/src/node_mapbox_gl_native.cpp index 042def9fdd..cdcc982220 100644 --- a/platform/node/src/node_mapbox_gl_native.cpp +++ b/platform/node/src/node_mapbox_gl_native.cpp @@ -8,7 +8,7 @@ #include <mbgl/util/run_loop.hpp> #include "node_map.hpp" -#include "node_log.hpp" +#include "node_logging.hpp" #include "node_request.hpp" void RegisterModule(v8::Local<v8::Object> target, v8::Local<v8::Object> module) { diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index cb284afcf3..3efdf6cad8 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -28,7 +28,7 @@ set(MBGL_QT_FILES PRIVATE platform/default/sqlite3.hpp # Misc - PRIVATE platform/default/log_stderr.cpp + PRIVATE platform/default/logging_stderr.cpp # Thread pool PRIVATE platform/default/mbgl/util/default_thread_pool.cpp diff --git a/platform/qt/src/http_file_source.cpp b/platform/qt/src/http_file_source.cpp index 61fa1ca612..9bf2cc5fac 100644 --- a/platform/qt/src/http_file_source.cpp +++ b/platform/qt/src/http_file_source.cpp @@ -1,7 +1,7 @@ #include "http_file_source.hpp" #include "http_request.hpp" -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <QByteArray> #include <QDir> diff --git a/platform/qt/src/run_loop_impl.hpp b/platform/qt/src/run_loop_impl.hpp index ea64e4b977..c1fe8578e3 100644 --- a/platform/qt/src/run_loop_impl.hpp +++ b/platform/qt/src/run_loop_impl.hpp @@ -1,6 +1,6 @@ #pragma once -#include <mbgl/platform/log.hpp> +#include <mbgl/util/logging.hpp> #include <mbgl/util/async_task.hpp> #include <mbgl/util/run_loop.hpp> diff --git a/platform/qt/src/string_stdlib.cpp b/platform/qt/src/string_stdlib.cpp index c4adecea06..635a01352e 100644 --- a/platform/qt/src/string_stdlib.cpp +++ b/platform/qt/src/string_stdlib.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/platform.hpp> +#include <mbgl/util/platform.hpp> #include <QByteArray> #include <QString> |