diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-11 15:00:56 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-13 13:40:31 -0800 |
commit | 5a7d2fd60ec4bd1639a1223ec5d2c54c534d0392 (patch) | |
tree | d37991995bd21955379e690b677fc288109aa2c1 /include | |
parent | 86c8446d3a4390ff6577d070ac8b5fa3ad3c5cd1 (diff) | |
download | qtlocation-mapboxgl-5a7d2fd60ec4bd1639a1223ec5d2c54c534d0392.tar.gz |
[core] Eliminate platform::assetRoot()
I regenerated assets.zip so that all file paths have an `assets/` prefix, as the Android AssetFileSource implementation asserts, and removed `TEST_DATA` from the paths.
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/platform/platform.hpp | 3 | ||||
-rw-r--r-- | include/mbgl/storage/default_file_source.hpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/mbgl/platform/platform.hpp b/include/mbgl/platform/platform.hpp index f2550a3e13..087ce56f95 100644 --- a/include/mbgl/platform/platform.hpp +++ b/include/mbgl/platform/platform.hpp @@ -18,9 +18,6 @@ std::string lowercase(const std::string &string); // Returns the path to the root folder of the application. const std::string &applicationRoot(); -// Returns the path to the asset location. -const std::string &assetRoot(); - // Makes the current thread low priority. void makeThreadLowPriority(); diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp index 83ea4adf5d..bedea25bef 100644 --- a/include/mbgl/storage/default_file_source.hpp +++ b/include/mbgl/storage/default_file_source.hpp @@ -7,7 +7,7 @@ namespace mbgl { class DefaultFileSource : public FileSource { public: - DefaultFileSource(const std::string& cachePath = ":memory:", const std::string& root = ""); + DefaultFileSource(const std::string& cachePath, const std::string& assetRoot); ~DefaultFileSource() override; void setAccessToken(const std::string&); |