diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-07-28 18:09:34 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-07-28 19:27:13 +0300 |
commit | 3c43171bc0d8aed52048ea35c6d32b5244f9e271 (patch) | |
tree | 2ef9424605c0fa242df1ec59358d4c54a626ba39 /platform | |
parent | 0cc69b368d4290f0d6238d19fe38d02b3b925a9c (diff) | |
download | qtlocation-mapboxgl-3c43171bc0d8aed52048ea35c6d32b5244f9e271.tar.gz |
s/AssetContext/AssetContextBase/
Diffstat (limited to 'platform')
-rw-r--r-- | platform/default/asset_request_fs.cpp | 6 | ||||
-rw-r--r-- | platform/default/asset_request_zip.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/platform/default/asset_request_fs.cpp b/platform/default/asset_request_fs.cpp index f5f0b2a0df..4511cf882a 100644 --- a/platform/default/asset_request_fs.cpp +++ b/platform/default/asset_request_fs.cpp @@ -1,4 +1,4 @@ -#include <mbgl/storage/asset_context.hpp> +#include <mbgl/storage/asset_context_base.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> #include <mbgl/util/util.hpp> @@ -36,7 +36,7 @@ public: std::unique_ptr<Response> response; }; -class AssetFSContext : public AssetContext { +class AssetFSContext : public AssetContextBase { RequestBase* createRequest(const Resource& resource, RequestBase::Callback callback, uv_loop_t* loop, @@ -206,7 +206,7 @@ void AssetRequest::cancel() { uv_cancel((uv_req_t *)&req); } -std::unique_ptr<AssetContext> AssetContext::createContext(uv_loop_t*) { +std::unique_ptr<AssetContextBase> AssetContextBase::createContext(uv_loop_t*) { return std::make_unique<AssetFSContext>(); } diff --git a/platform/default/asset_request_zip.cpp b/platform/default/asset_request_zip.cpp index aa22ca18d7..13c7df4cc8 100644 --- a/platform/default/asset_request_zip.cpp +++ b/platform/default/asset_request_zip.cpp @@ -1,4 +1,4 @@ -#include <mbgl/storage/asset_context.hpp> +#include <mbgl/storage/asset_context_base.hpp> #include <mbgl/android/jni.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> @@ -15,7 +15,7 @@ namespace mbgl { -class AssetZipContext : public AssetContext { +class AssetZipContext : public AssetContextBase { public: explicit AssetZipContext(uv_loop_t *loop); ~AssetZipContext(); @@ -259,7 +259,7 @@ void AssetRequest::cancel() { cancelled = true; } -std::unique_ptr<AssetContext> AssetContext::createContext(uv_loop_t* loop) { +std::unique_ptr<AssetContextBase> AssetContextBase::createContext(uv_loop_t* loop) { return std::make_unique<AssetZipContext>(loop); } |