From 5fa0512be289dd5a6e55d515352f9f8fb93a1b5e Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 15 Apr 2015 18:09:34 -0700 Subject: Shorten method names --- src/mbgl/storage/default_file_source.cpp | 12 ++++++------ src/mbgl/storage/default_file_source_impl.hpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/mbgl/storage') diff --git a/src/mbgl/storage/default_file_source.cpp b/src/mbgl/storage/default_file_source.cpp index d866e2353f..4055001fc4 100644 --- a/src/mbgl/storage/default_file_source.cpp +++ b/src/mbgl/storage/default_file_source.cpp @@ -60,7 +60,7 @@ Request* DefaultFileSource::request(const Resource& resource, // This function can be called from any thread. Make sure we're executing the actual call in the // file source loop by sending it over the queue. - thread->invoke(&Impl::processAdd, std::move(req), thread->get()); + thread->invoke(&Impl::add, std::move(req), thread->get()); return req; } @@ -74,14 +74,14 @@ void DefaultFileSource::cancel(Request *req) { // This function can be called from any thread. Make sure we're executing the actual call in the // file source loop by sending it over the queue. - thread->invoke(&Impl::processCancel, std::move(req)); + thread->invoke(&Impl::cancel, std::move(req)); } void DefaultFileSource::abort(const Environment &env) { - thread->invoke(&Impl::processAbort, std::ref(env)); + thread->invoke(&Impl::abort, std::ref(env)); } -void DefaultFileSource::Impl::processAdd(Request* req, uv_loop_t* loop) { +void DefaultFileSource::Impl::add(Request* req, uv_loop_t* loop) { const Resource &resource = req->resource; // We're adding a new Request. @@ -112,7 +112,7 @@ void DefaultFileSource::Impl::processAdd(Request* req, uv_loop_t* loop) { sharedRequest->subscribe(req); } -void DefaultFileSource::Impl::processCancel(Request* req) { +void DefaultFileSource::Impl::cancel(Request* req) { SharedRequestBase *sharedRequest = find(req->resource); if (sharedRequest) { // If the number of dependent requests of the SharedRequestBase drops to zero, the @@ -156,7 +156,7 @@ void DefaultFileSource::Impl::processResult(const Resource& resource, std::share } // Aborts all requests that are part of the current environment. -void DefaultFileSource::Impl::processAbort(const Environment& env) { +void DefaultFileSource::Impl::abort(const Environment& env) { // Construct a cancellation response. auto res = util::make_unique(); res->status = Response::Error; diff --git a/src/mbgl/storage/default_file_source_impl.hpp b/src/mbgl/storage/default_file_source_impl.hpp index 6383d13dce..97210dc442 100644 --- a/src/mbgl/storage/default_file_source_impl.hpp +++ b/src/mbgl/storage/default_file_source_impl.hpp @@ -18,9 +18,9 @@ public: std::shared_ptr response, FileCache::Hint hint); SharedRequestBase *find(const Resource &resource); - void processAdd(Request* request, uv_loop_t* loop); - void processCancel(Request* request); - void processAbort(const Environment& env); + void add(Request* request, uv_loop_t* loop); + void cancel(Request* request); + void abort(const Environment& env); const std::string assetRoot; -- cgit v1.2.1