[core, node, darwin, android, qt] Make image ID part of Image

More like Source and Layer.

1 files changed, 5 insertions, 5 deletions

diff --git a/test/sprite/sprite_loader.test.cpp b/test/sprite/sprite_loader.test.cpp
index 99f44e57e4..3691572265 100644
--- a/test/sprite/sprite_loader.test.cpp
+++ b/test/sprite/sprite_loader.test.cpp
@@ -18,7 +18,7 @@ using namespace mbgl::style;
 
 class StubSpriteLoaderObserver : public SpriteLoaderObserver {
 public:
-    void onSpriteLoaded(Images&& images) override {
+    void onSpriteLoaded(std::vector<std::unique_ptr<style::Image>>&& images) override {
         if (spriteLoaded) spriteLoaded(std::move(images));
     }
 
@@ -26,7 +26,7 @@ public:
         if (spriteError) spriteError(error);
     }
 
-    std::function<void (Images&&)> spriteLoaded;
+    std::function<void (std::vector<std::unique_ptr<style::Image>>&&)> spriteLoaded;
     std::function<void (std::exception_ptr)> spriteError;
 };
 
@@ -94,8 +94,8 @@ TEST(SpriteLoader, LoadingSuccess) {
         test.end();
     };
 
-    test.observer.spriteLoaded = [&] (SpriteLoaderObserver::Images&& images) {
-        EXPECT_EQ(images.size(), Images::size_type(367));
+    test.observer.spriteLoaded = [&] (std::vector<std::unique_ptr<style::Image>>&& images) {
+        EXPECT_EQ(images.size(), 367u);
         test.end();
     };
 
@@ -171,7 +171,7 @@ TEST(SpriteLoader, LoadingCancel) {
         return optional<Response>();
     };
 
-    test.observer.spriteLoaded = [&] (const SpriteLoaderObserver::Images&) {
+    test.observer.spriteLoaded = [&] (const std::vector<std::unique_ptr<style::Image>>&) {
         FAIL() << "Should never be called";
     };