From 1db044d3c09cb7e628a7320cf6111c1df9ef2f82 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 1 Apr 2015 11:19:25 -0700 Subject: [PATCH] Remove unused --- src/mbgl/map/tile_parser.cpp | 1 + src/mbgl/style/style.hpp | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp index 81706297e..bc6de4056 100644 --- a/src/mbgl/map/tile_parser.cpp +++ b/src/mbgl/map/tile_parser.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 04303b64b..e36fc4bb8 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -2,38 +2,31 @@ #define MBGL_STYLE_STYLE #include -#include #include #include #include +#include #include -#include #include -#include #include -#include #include namespace mbgl { -class Sprite; class StyleLayer; class Style : public util::noncopyable { public: - struct exception : std::runtime_error { exception(const char *msg) : std::runtime_error(msg) {} }; - Style(); ~Style(); void loadJSON(const uint8_t *const data); - size_t layerCount() const; void updateProperties(float z, std::chrono::steady_clock::time_point now); - void setDefaultTransitionDuration(std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero()); + void setDefaultTransitionDuration(std::chrono::steady_clock::duration); void cascadeClasses(const std::vector&); bool hasTransitions() const; @@ -41,7 +34,6 @@ public: const std::string &getSpriteURL() const; std::vector> layers; - std::vector appliedClasses; std::string glyph_url; std::string base;