summaryrefslogtreecommitdiff
path: root/include/mbgl/map/map.hpp
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2019-03-19 16:57:36 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2019-03-20 21:30:08 +0200
commitd5868d3da822f2bf3297229bd879e76853108a63 (patch)
treeb3d28aab92b938cf541f917f1027d2bbd06d9780 /include/mbgl/map/map.hpp
parentd1762d7111b39d45430bd7bb75ea60b7a5d85bd2 (diff)
downloadqtlocation-mapboxgl-d5868d3da822f2bf3297229bd879e76853108a63.tar.gz
[core] Remove file source from public Map ctor
Diffstat (limited to 'include/mbgl/map/map.hpp')
-rw-r--r--include/mbgl/map/map.hpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index b4f60a19ba..be8bf45142 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -12,6 +12,7 @@
#include <mbgl/map/camera.hpp>
#include <mbgl/util/geometry.hpp>
#include <mbgl/map/projection_mode.hpp>
+#include <mbgl/storage/resource_options.hpp>
#include <cstdint>
#include <string>
@@ -21,7 +22,6 @@
namespace mbgl {
-class FileSource;
class Scheduler;
class RendererFrontend;
@@ -36,9 +36,9 @@ public:
MapObserver&,
Size size,
float pixelRatio,
- FileSource&,
Scheduler&,
- const MapOptions&);
+ const MapOptions&,
+ const ResourceOptions&);
~Map();
// Register a callback that will get called (on the render thread) when all resources have
@@ -137,9 +137,12 @@ public:
bool isFullyLoaded() const;
void dumpDebugLogs() const;
-private:
+protected:
class Impl;
const std::unique_ptr<Impl> impl;
+
+ // For testing only.
+ Map(std::unique_ptr<Impl>);
};
} // namespace mbgl