diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-26 16:39:56 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-02 14:51:39 -0700 |
commit | c902f9098b331302aaa1baac77d1575db624a132 (patch) | |
tree | 211901cd04454aedbac40c469198438e46d7038c /test/src | |
parent | 18149cbcc27a926f280b08d8d0e09104b2147688 (diff) | |
download | qtlocation-mapboxgl-c902f9098b331302aaa1baac77d1575db624a132.tar.gz |
[core] Rationalize naming for style-related code
Diffstat (limited to 'test/src')
-rw-r--r-- | test/src/mbgl/test/stub_style_observer.hpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp index 45af1edf9d..d70fc5e44c 100644 --- a/test/src/mbgl/test/stub_style_observer.hpp +++ b/test/src/mbgl/test/stub_style_observer.hpp @@ -1,13 +1,14 @@ #pragma once -#include <mbgl/style/style_observer.hpp> +#include <mbgl/style/observer.hpp> -namespace mbgl { +using namespace mbgl; +using namespace mbgl::style; /** - * An implementation of StyleObserver that forwards all methods to dynamically-settable lambas. + * An implementation of style::Observer that forwards all methods to dynamically-settable lambas. */ -class StubStyleObserver : public StyleObserver { +class StubStyleObserver : public style::Observer { public: void onGlyphsLoaded(const FontStack& fontStack, const GlyphRange& glyphRange) override { if (glyphsLoaded) glyphsLoaded(fontStack, glyphRange); @@ -61,5 +62,3 @@ public: std::function<void ()> resourceLoaded; std::function<void (std::exception_ptr)> resourceError; }; - -} // namespace mbgl |