diff options
Diffstat (limited to 'include/mbgl/storage')
-rw-r--r-- | include/mbgl/storage/offline.hpp | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/include/mbgl/storage/offline.hpp b/include/mbgl/storage/offline.hpp index baf43dc5f5..f35abbfe38 100644 --- a/include/mbgl/storage/offline.hpp +++ b/include/mbgl/storage/offline.hpp @@ -32,12 +32,12 @@ public: OfflineTilePyramidRegionDefinition(std::string, LatLngBounds, double, double, float, bool); /* Private */ - const std::string styleURL; - const LatLngBounds bounds; - const double minZoom; - const double maxZoom; - const float pixelRatio; - const bool includeIdeographs; + std::string styleURL; + LatLngBounds bounds; + double minZoom; + double maxZoom; + float pixelRatio; + bool includeIdeographs; }; /* @@ -56,12 +56,12 @@ public: OfflineGeometryRegionDefinition(std::string styleURL, Geometry<double>, double minZoom, double maxZoom, float pixelRatio, bool includeIdeographs); /* Private */ - const std::string styleURL; - const Geometry<double> geometry; - const double minZoom; - const double maxZoom; - const float pixelRatio; - const bool includeIdeographs; + std::string styleURL; + Geometry<double> geometry; + double minZoom; + double maxZoom; + float pixelRatio; + bool includeIdeographs; }; /* @@ -211,14 +211,8 @@ public: class OfflineRegion { public: - // Move-only; not publicly constructible. - OfflineRegion(OfflineRegion&&); ~OfflineRegion(); - OfflineRegion() = delete; - OfflineRegion(const OfflineRegion&) = delete; - OfflineRegion& operator=(OfflineRegion&&) = delete; - OfflineRegion& operator=(const OfflineRegion&) = delete; int64_t getID() const; const OfflineRegionDefinition& getDefinition() const; @@ -231,9 +225,9 @@ private: OfflineRegionDefinition, OfflineRegionMetadata); - const int64_t id; - const OfflineRegionDefinition definition; - const OfflineRegionMetadata metadata; + int64_t id; + OfflineRegionDefinition definition; + OfflineRegionMetadata metadata; }; using OfflineRegions = std::vector<OfflineRegion>; |