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 /src | |
| parent | 0cc69b368d4290f0d6238d19fe38d02b3b925a9c (diff) | |
| download | qtlocation-mapboxgl-3c43171bc0d8aed52048ea35c6d32b5244f9e271.tar.gz | |
s/AssetContext/AssetContextBase/
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/storage/asset_context_base.hpp (renamed from src/mbgl/storage/asset_context.hpp) | 14 | ||||
| -rw-r--r-- | src/mbgl/storage/default_file_source.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/storage/default_file_source_impl.hpp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/mbgl/storage/asset_context.hpp b/src/mbgl/storage/asset_context_base.hpp index 44ebdba4ff..cd7d9ff4a1 100644 --- a/src/mbgl/storage/asset_context.hpp +++ b/src/mbgl/storage/asset_context_base.hpp @@ -1,5 +1,5 @@ -#ifndef MBGL_STORAGE_DEFAULT_ASSET_CONTEXT -#define MBGL_STORAGE_DEFAULT_ASSET_CONTEXT +#ifndef MBGL_STORAGE_ASSET_CONTEXT_BASE +#define MBGL_STORAGE_ASSET_CONTEXT_BASE #include <mbgl/storage/request_base.hpp> @@ -7,17 +7,17 @@ typedef struct uv_loop_s uv_loop_t; namespace mbgl { -class AssetContext { +class AssetContextBase { public: - static std::unique_ptr<AssetContext> createContext(uv_loop_t*); + static std::unique_ptr<AssetContextBase> createContext(uv_loop_t*); - virtual ~AssetContext() = default; + virtual ~AssetContextBase() = default; virtual RequestBase* createRequest(const Resource&, RequestBase::Callback, uv_loop_t*, const std::string& assetRoot) = 0; }; -} +} // namespace mbgl -#endif +#endif // MBGL_STORAGE_ASSET_CONTEXT_BASE diff --git a/src/mbgl/storage/default_file_source.cpp b/src/mbgl/storage/default_file_source.cpp index b3761cd5bd..12db28c981 100644 --- a/src/mbgl/storage/default_file_source.cpp +++ b/src/mbgl/storage/default_file_source.cpp @@ -1,6 +1,6 @@ #include <mbgl/storage/default_file_source_impl.hpp> #include <mbgl/storage/request.hpp> -#include <mbgl/storage/asset_context.hpp> +#include <mbgl/storage/asset_context_base.hpp> #include <mbgl/storage/http_context_base.hpp> #include <mbgl/storage/response.hpp> @@ -75,7 +75,7 @@ DefaultFileSource::Impl::Impl(FileCache* cache_, const std::string& root) : loop(util::RunLoop::getLoop()), cache(cache_), assetRoot(root.empty() ? platform::assetRoot() : root), - assetContext(AssetContext::createContext(loop)), + assetContext(AssetContextBase::createContext(loop)), httpContext(HTTPContextBase::createContext(loop)) { } diff --git a/src/mbgl/storage/default_file_source_impl.hpp b/src/mbgl/storage/default_file_source_impl.hpp index 6f3e10c557..bb28933798 100644 --- a/src/mbgl/storage/default_file_source_impl.hpp +++ b/src/mbgl/storage/default_file_source_impl.hpp @@ -2,7 +2,7 @@ #define MBGL_STORAGE_DEFAULT_DEFAULT_FILE_SOURCE_IMPL #include <mbgl/storage/default_file_source.hpp> -#include <mbgl/storage/asset_context.hpp> +#include <mbgl/storage/asset_context_base.hpp> #include <mbgl/storage/http_context_base.hpp> #include <set> @@ -47,7 +47,7 @@ private: uv_loop_t* loop = nullptr; FileCache* cache = nullptr; const std::string assetRoot; - std::unique_ptr<AssetContext> assetContext; + std::unique_ptr<AssetContextBase> assetContext; std::unique_ptr<HTTPContextBase> httpContext; }; |