diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-23 17:31:14 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-24 10:54:32 -0700 |
commit | 169755e89a72b103fab100ccd101013e8eef1481 (patch) | |
tree | 5716e13519fe2b7f5c91cccbdbf14635a1ef117d /platform/default/asset_file_source.cpp | |
parent | 7ff074889e826f766028ba582beb677b39d16bec (diff) | |
download | qtlocation-mapboxgl-169755e89a72b103fab100ccd101013e8eef1481.tar.gz |
[core] Unify FileRequest and WorkRequest
Diffstat (limited to 'platform/default/asset_file_source.cpp')
-rw-r--r-- | platform/default/asset_file_source.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/platform/default/asset_file_source.cpp b/platform/default/asset_file_source.cpp index 2573966c72..b9b52b7b86 100644 --- a/platform/default/asset_file_source.cpp +++ b/platform/default/asset_file_source.cpp @@ -12,15 +12,6 @@ namespace mbgl { -class AssetFileRequest : public FileRequest { -public: - AssetFileRequest(std::unique_ptr<WorkRequest> workRequest_) - : workRequest(std::move(workRequest_)) { - } - - std::unique_ptr<WorkRequest> workRequest; -}; - class AssetFileSource::Impl { public: Impl(const std::string& root_) @@ -72,8 +63,8 @@ AssetFileSource::AssetFileSource(const std::string& root) AssetFileSource::~AssetFileSource() = default; -std::unique_ptr<FileRequest> AssetFileSource::request(const Resource& resource, Callback callback) { - return std::make_unique<AssetFileRequest>(thread->invokeWithCallback(&Impl::request, callback, resource.url)); +std::unique_ptr<AsyncRequest> AssetFileSource::request(const Resource& resource, Callback callback) { + return thread->invokeWithCallback(&Impl::request, callback, resource.url); } } // namespace mbgl |