summaryrefslogtreecommitdiff
path: root/src/mbgl/sprite/sprite_store.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-05-23 11:53:21 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-05-23 18:04:31 +0200
commit7272d7c84cf6e874b417ecd165f46f26ae7729c9 (patch)
tree76470dd1536ea632f6a75adde02bbc7af9513141 /src/mbgl/sprite/sprite_store.hpp
parentb9f23661f88ad1982a913ff78ed39a398b53b7e3 (diff)
downloadqtlocation-mapboxgl-7272d7c84cf6e874b417ecd165f46f26ae7729c9.tar.gz
[core] move *Observers to their own files
Diffstat (limited to 'src/mbgl/sprite/sprite_store.hpp')
-rw-r--r--src/mbgl/sprite/sprite_store.hpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mbgl/sprite/sprite_store.hpp b/src/mbgl/sprite/sprite_store.hpp
index 995cb81900..50f74e174d 100644
--- a/src/mbgl/sprite/sprite_store.hpp
+++ b/src/mbgl/sprite/sprite_store.hpp
@@ -11,19 +11,12 @@
namespace mbgl {
class FileSource;
+class SpriteStoreObserver;
class SpriteStore : private util::noncopyable {
public:
using Sprites = std::map<std::string, std::shared_ptr<const SpriteImage>>;
- class Observer {
- public:
- virtual ~Observer() = default;
-
- virtual void onSpriteLoaded() {};
- virtual void onSpriteError(std::exception_ptr) {};
- };
-
SpriteStore(float pixelRatio);
~SpriteStore();
@@ -35,7 +28,7 @@ public:
void dumpDebugLogs() const;
- void setObserver(Observer* observer);
+ void setObserver(SpriteStoreObserver* observer);
// Adds/replaces a Sprite image.
void setSprite(const std::string&, std::shared_ptr<const SpriteImage> = nullptr);
@@ -63,8 +56,7 @@ private:
bool loaded = false;
- Observer nullObserver;
- Observer* observer = &nullObserver;
+ SpriteStoreObserver* observer = nullptr;
// Lock for sprites and dirty maps.
std::mutex mutex;