summaryrefslogtreecommitdiff
path: root/test/src
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-22 10:38:42 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-22 15:53:18 -0700
commit5939dd5b412fcc1ef857711a137589aa865bd442 (patch)
tree4bd4e021ea564ee262cff56ab7b6f76e98b29471 /test/src
parentd77e35b6866e461c3cb05de2112d548be4ef7780 (diff)
downloadqtlocation-mapboxgl-5939dd5b412fcc1ef857711a137589aa865bd442.tar.gz
[core] Use the proper type for font stacks
Diffstat (limited to 'test/src')
-rw-r--r--test/src/mbgl/test/stub_style_observer.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp
index 7236ca74f5..f428b4fda7 100644
--- a/test/src/mbgl/test/stub_style_observer.hpp
+++ b/test/src/mbgl/test/stub_style_observer.hpp
@@ -10,11 +10,11 @@ namespace mbgl {
*/
class StubStyleObserver : public Style::Observer {
public:
- void onGlyphsLoaded(const std::string& fontStack, const GlyphRange& glyphRange) override {
+ void onGlyphsLoaded(const FontStack& fontStack, const GlyphRange& glyphRange) override {
if (glyphsLoaded) glyphsLoaded(fontStack, glyphRange);
}
- void onGlyphsError(const std::string& fontStack, const GlyphRange& glyphRange, std::exception_ptr error) override {
+ void onGlyphsError(const FontStack& fontStack, const GlyphRange& glyphRange, std::exception_ptr error) override {
if (glyphsError) glyphsError(fontStack, glyphRange, error);
}
@@ -50,8 +50,8 @@ public:
if (resourceError) resourceError(error);
};
- std::function<void (const std::string& fontStack, const GlyphRange&)> glyphsLoaded;
- std::function<void (const std::string& fontStack, const GlyphRange&, std::exception_ptr)> glyphsError;
+ std::function<void (const FontStack&, const GlyphRange&)> glyphsLoaded;
+ std::function<void (const FontStack&, const GlyphRange&, std::exception_ptr)> glyphsError;
std::function<void ()> spriteLoaded;
std::function<void (std::exception_ptr)> spriteError;
std::function<void (Source&)> sourceLoaded;