summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-03-23 17:31:14 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-03-24 10:54:32 -0700
commit169755e89a72b103fab100ccd101013e8eef1481 (patch)
tree5716e13519fe2b7f5c91cccbdbf14635a1ef117d /platform/android
parent7ff074889e826f766028ba582beb677b39d16bec (diff)
downloadqtlocation-mapboxgl-169755e89a72b103fab100ccd101013e8eef1481.tar.gz
[core] Unify FileRequest and WorkRequest
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/src/asset_file_source.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/src/asset_file_source.cpp b/platform/android/src/asset_file_source.cpp
index d2aab30a52..96a0840ef5 100644
--- a/platform/android/src/asset_file_source.cpp
+++ b/platform/android/src/asset_file_source.cpp
@@ -35,7 +35,7 @@ struct ZipFileHolder {
namespace mbgl {
-class AssetFileRequest : public FileRequest {
+class AssetFileRequest : public AsyncRequest {
public:
AssetFileRequest(std::unique_ptr<WorkRequest> workRequest_)
: workRequest(std::move(workRequest_)) {
@@ -106,8 +106,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);
}
}