diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-23 14:16:15 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-23 14:30:20 -0800 |
commit | c972a251da6e6bc5dadf243045181462ffb01700 (patch) | |
tree | f409b2cca1bbbd0fd825c98996d4c7879c5069e7 /src | |
parent | 16de579d7cfc2960793cbcb5e95741f22ab73768 (diff) | |
download | qtlocation-mapboxgl-c972a251da6e6bc5dadf243045181462ffb01700.tar.gz |
[core] Remove `Resource` dependency from low-level classes
These classes should not be coupled to domain-specific resource types.
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/storage/asset_context_base.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/storage/http_context_base.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/storage/http_request_base.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/storage/request_base.hpp | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/mbgl/storage/asset_context_base.hpp b/src/mbgl/storage/asset_context_base.hpp index 4a6ca0b6f9..92138615b5 100644 --- a/src/mbgl/storage/asset_context_base.hpp +++ b/src/mbgl/storage/asset_context_base.hpp @@ -10,7 +10,7 @@ public: static std::unique_ptr<AssetContextBase> createContext(); virtual ~AssetContextBase() = default; - virtual RequestBase* createRequest(const Resource&, + virtual RequestBase* createRequest(const std::string& url, RequestBase::Callback, const std::string& assetRoot) = 0; }; diff --git a/src/mbgl/storage/http_context_base.hpp b/src/mbgl/storage/http_context_base.hpp index 7fbef719f6..f2d15e2918 100644 --- a/src/mbgl/storage/http_context_base.hpp +++ b/src/mbgl/storage/http_context_base.hpp @@ -14,7 +14,7 @@ public: static std::unique_ptr<HTTPContextBase> createContext(); virtual ~HTTPContextBase() = default; - virtual HTTPRequestBase* createRequest(const Resource&, + virtual HTTPRequestBase* createRequest(const std::string& url, RequestBase::Callback, std::shared_ptr<const Response>) = 0; }; diff --git a/src/mbgl/storage/http_request_base.hpp b/src/mbgl/storage/http_request_base.hpp index eeefdf28d4..a17284e782 100644 --- a/src/mbgl/storage/http_request_base.hpp +++ b/src/mbgl/storage/http_request_base.hpp @@ -8,8 +8,8 @@ namespace mbgl { class HTTPRequestBase : public RequestBase { public: - HTTPRequestBase(const Resource& resource_, Callback notify_) - : RequestBase(resource_, notify_) + HTTPRequestBase(const std::string& url_, Callback notify_) + : RequestBase(url_, notify_) , cancelled(false) { } diff --git a/src/mbgl/storage/request_base.hpp b/src/mbgl/storage/request_base.hpp index 5e99041cd4..a0476d49bf 100644 --- a/src/mbgl/storage/request_base.hpp +++ b/src/mbgl/storage/request_base.hpp @@ -3,11 +3,11 @@ #include <mbgl/util/noncopyable.hpp> #include <mbgl/storage/file_cache.hpp> -#include <mbgl/storage/resource.hpp> #include <memory> #include <functional> #include <utility> +#include <string> namespace mbgl { @@ -17,8 +17,8 @@ class RequestBase : private util::noncopyable { public: using Callback = std::function<void (std::shared_ptr<const Response> response)>; - RequestBase(const Resource& resource_, Callback notify_) - : resource(resource_) + RequestBase(const std::string& url_, Callback notify_) + : url(url_) , notify(std::move(notify_)) { } @@ -26,7 +26,7 @@ public: virtual void cancel() = 0; protected: - Resource resource; + std::string url; Callback notify; }; |