diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-23 14:55:12 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-23 14:55:12 -0800 |
commit | 7a6076ea9df72f34565d8f316f8c5c19279677b8 (patch) | |
tree | 0018a698e9fa97273c5b515b71ccf0b8f7398253 /platform/default | |
parent | d238e00d9b1e78e98392ac2cab30f8a2fcd3c1fd (diff) | |
download | qtlocation-mapboxgl-7a6076ea9df72f34565d8f316f8c5c19279677b8.tar.gz |
[tests] Test with OnlineFileSource
When we introduce OfflineFileSource, the behavior of existing tests should
not change.
Diffstat (limited to 'platform/default')
-rw-r--r-- | platform/default/default_file_source.cpp | 3 | ||||
-rw-r--r-- | platform/default/online_file_source.cpp | 2 | ||||
-rw-r--r-- | platform/default/online_file_source.hpp | 34 |
3 files changed, 2 insertions, 37 deletions
diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp index 47af6c3140..b2ab5abd6c 100644 --- a/platform/default/default_file_source.cpp +++ b/platform/default/default_file_source.cpp @@ -1,6 +1,5 @@ #include <mbgl/storage/default_file_source.hpp> - -#include "online_file_source.hpp" +#include <mbgl/storage/online_file_source.hpp> namespace mbgl { diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp index 59cebbe543..871bd36d43 100644 --- a/platform/default/online_file_source.cpp +++ b/platform/default/online_file_source.cpp @@ -1,4 +1,4 @@ -#include "online_file_source.hpp" +#include <mbgl/storage/online_file_source.hpp> #include <mbgl/storage/asset_context_base.hpp> #include <mbgl/storage/http_context_base.hpp> #include <mbgl/storage/network_status.hpp> diff --git a/platform/default/online_file_source.hpp b/platform/default/online_file_source.hpp deleted file mode 100644 index 357b1773d7..0000000000 --- a/platform/default/online_file_source.hpp +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef MBGL_STORAGE_ONLINE_FILE_SOURCE -#define MBGL_STORAGE_ONLINE_FILE_SOURCE - -#include <mbgl/storage/file_source.hpp> -#include <mbgl/storage/file_cache.hpp> - -namespace mbgl { - -namespace util { -template <typename T> class Thread; -} // namespace util - -class OnlineFileSource : public FileSource { -public: - OnlineFileSource(FileCache *cache, const std::string &root = ""); - ~OnlineFileSource() override; - - void setAccessToken(const std::string& t) { accessToken = t; } - std::string getAccessToken() const { return accessToken; } - - std::unique_ptr<FileRequest> request(const Resource&, Callback) override; - -private: - friend class OnlineFileRequest; - void cancel(const Resource&, FileRequest*); - - class Impl; - const std::unique_ptr<util::Thread<Impl>> thread; - std::string accessToken; -}; - -} // namespace mbgl - -#endif |