summaryrefslogtreecommitdiff
path: root/platform/default
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-06-14 15:03:13 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-06-18 16:26:51 +0300
commit59e7b9a8780e282cf90ede7ae8e3b1affe1e684e (patch)
treee5f7fd8a74f4a9495d872acdcdf4eb2b44f123f2 /platform/default
parent9beb740fb747e721b6a678bbe63399c70e132881 (diff)
downloadqtlocation-mapboxgl-59e7b9a8780e282cf90ede7ae8e3b1affe1e684e.tar.gz
[core] Rename resetCache to resetDatabase
Avoid confusion about what is being reset. In this case, the whole database and not only the ambient cache.
Diffstat (limited to 'platform/default')
-rw-r--r--platform/default/include/mbgl/storage/offline_database.hpp2
-rw-r--r--platform/default/src/mbgl/storage/default_file_source.cpp8
-rw-r--r--platform/default/src/mbgl/storage/offline_database.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/platform/default/include/mbgl/storage/offline_database.hpp b/platform/default/include/mbgl/storage/offline_database.hpp
index 4e9ffcf028..f9c03dc35d 100644
--- a/platform/default/include/mbgl/storage/offline_database.hpp
+++ b/platform/default/include/mbgl/storage/offline_database.hpp
@@ -44,7 +44,7 @@ public:
~OfflineDatabase();
void changePath(const std::string&);
- std::exception_ptr resetCache();
+ std::exception_ptr resetDatabase();
optional<Response> get(const Resource&);
diff --git a/platform/default/src/mbgl/storage/default_file_source.cpp b/platform/default/src/mbgl/storage/default_file_source.cpp
index 92e86b25d0..0f786f3868 100644
--- a/platform/default/src/mbgl/storage/default_file_source.cpp
+++ b/platform/default/src/mbgl/storage/default_file_source.cpp
@@ -184,8 +184,8 @@ public:
offlineDatabase->put(resource, response);
}
- void resetCache(std::function<void (std::exception_ptr)> callback) {
- callback(offlineDatabase->resetCache());
+ void resetDatabase(std::function<void (std::exception_ptr)> callback) {
+ callback(offlineDatabase->resetDatabase());
}
void invalidateTileCache(std::function<void (std::exception_ptr)> callback) {
@@ -339,8 +339,8 @@ void DefaultFileSource::put(const Resource& resource, const Response& response)
impl->actor().invoke(&Impl::put, resource, response);
}
-void DefaultFileSource::resetCache(std::function<void (std::exception_ptr)> callback) {
- impl->actor().invoke(&Impl::resetCache, callback);
+void DefaultFileSource::resetDatabase(std::function<void (std::exception_ptr)> callback) {
+ impl->actor().invoke(&Impl::resetDatabase, std::move(callback));
}
void DefaultFileSource::invalidateTileCache(std::function<void (std::exception_ptr)> callback) {
diff --git a/platform/default/src/mbgl/storage/offline_database.cpp b/platform/default/src/mbgl/storage/offline_database.cpp
index 8c16ebf078..ab04cde5ed 100644
--- a/platform/default/src/mbgl/storage/offline_database.cpp
+++ b/platform/default/src/mbgl/storage/offline_database.cpp
@@ -1195,7 +1195,7 @@ bool OfflineDatabase::exceedsOfflineMapboxTileCountLimit(const Resource& resourc
&& offlineMapboxTileCountLimitExceeded();
}
-std::exception_ptr OfflineDatabase::resetCache() try {
+std::exception_ptr OfflineDatabase::resetDatabase() try {
removeExisting();
initialize();
return nullptr;