[core] change bool to enum class bool TileLoadState

This commit is contained in:
Konstantin Käfer
2016-09-06 12:23:35 +02:00
parent 8edf995946
commit 426242fe41
10 changed files with 28 additions and 21 deletions

View File

@@ -34,8 +34,8 @@ public:
if (sourceError) sourceError(source, error);
}
void onTileLoaded(Source& source, const OverscaledTileID& tileID, bool isNewTile) override {
if (tileLoaded) tileLoaded(source, tileID, isNewTile);
void onTileLoaded(Source& source, const OverscaledTileID& tileID, TileLoadState loadState) override {
if (tileLoaded) tileLoaded(source, tileID, loadState);
}
void
@@ -57,7 +57,7 @@ public:
std::function<void (std::exception_ptr)> spriteError;
std::function<void (Source&)> sourceLoaded;
std::function<void (Source&, std::exception_ptr)> sourceError;
std::function<void (Source&, const OverscaledTileID&, bool isNewTile)> tileLoaded;
std::function<void (Source&, const OverscaledTileID&, TileLoadState)> tileLoaded;
std::function<void (Source&, const OverscaledTileID&, std::exception_ptr)> tileError;
std::function<void (Source&, const OverscaledTileID&)> tileUpdated;
std::function<void (std::exception_ptr)> resourceError;

View File

@@ -123,7 +123,7 @@ TEST(Source, RasterTileEmpty) {
return response;
};
test.observer.tileLoaded = [&] (Source& source, const OverscaledTileID&, bool) {
test.observer.tileLoaded = [&] (Source& source, const OverscaledTileID&, TileLoadState) {
EXPECT_EQ("source", source.getID());
test.end();
};
@@ -152,7 +152,7 @@ TEST(Source, VectorTileEmpty) {
return response;
};
test.observer.tileLoaded = [&] (Source& source, const OverscaledTileID&, bool) {
test.observer.tileLoaded = [&] (Source& source, const OverscaledTileID&, TileLoadState) {
EXPECT_EQ("source", source.getID());
test.end();
};
@@ -298,7 +298,7 @@ TEST(Source, RasterTileCancel) {
return optional<Response>();
};
test.observer.tileLoaded = [&] (Source&, const OverscaledTileID&, bool) {
test.observer.tileLoaded = [&] (Source&, const OverscaledTileID&, TileLoadState) {
FAIL() << "Should never be called";
};
@@ -325,7 +325,7 @@ TEST(Source, VectorTileCancel) {
return optional<Response>();
};
test.observer.tileLoaded = [&] (Source&, const OverscaledTileID&, bool) {
test.observer.tileLoaded = [&] (Source&, const OverscaledTileID&, TileLoadState) {
FAIL() << "Should never be called";
};