From 4954da23e76d1dcf87c65804d154ca034193cb4b Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 19 Jul 2017 18:45:04 +0300 Subject: [core] No need for default ctor in {Update,Tile}Parameters --- include/mbgl/renderer/renderer.hpp | 2 +- include/mbgl/renderer/renderer_frontend.hpp | 2 +- src/mbgl/annotation/annotation_tile.hpp | 2 +- src/mbgl/renderer/render_source.hpp | 2 +- src/mbgl/renderer/render_style.hpp | 2 +- src/mbgl/renderer/tile_parameters.hpp | 24 +---------------- src/mbgl/renderer/tile_pyramid.hpp | 2 +- src/mbgl/renderer/update_parameters.hpp | 40 +---------------------------- src/mbgl/tile/geojson_tile.hpp | 2 +- src/mbgl/tile/geometry_tile.hpp | 2 +- src/mbgl/tile/raster_tile.hpp | 2 +- src/mbgl/tile/tile_loader.hpp | 2 +- src/mbgl/tile/vector_tile.hpp | 2 +- 13 files changed, 13 insertions(+), 73 deletions(-) diff --git a/include/mbgl/renderer/renderer.hpp b/include/mbgl/renderer/renderer.hpp index 083102acbe..e6cbef02f3 100644 --- a/include/mbgl/renderer/renderer.hpp +++ b/include/mbgl/renderer/renderer.hpp @@ -19,7 +19,7 @@ class RendererObserver; class RenderedQueryOptions; class Scheduler; class SourceQueryOptions; -class UpdateParameters; +struct UpdateParameters; class View; class Renderer { diff --git a/include/mbgl/renderer/renderer_frontend.hpp b/include/mbgl/renderer/renderer_frontend.hpp index f72b0ccdde..2eac1a55c3 100644 --- a/include/mbgl/renderer/renderer_frontend.hpp +++ b/include/mbgl/renderer/renderer_frontend.hpp @@ -5,7 +5,7 @@ namespace mbgl { class RendererObserver; -class UpdateParameters; +struct UpdateParameters; // The RenderFrontend is the bridge between the Map and // platform used to update and observer the Renderer diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index 88505c50e3..b268db611d 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -7,7 +7,7 @@ namespace mbgl { class AnnotationManager; -class TileParameters; +struct TileParameters; class AnnotationTile : public GeometryTile { public: diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp index 9d2e74b50b..f7c9a4e86f 100644 --- a/src/mbgl/renderer/render_source.hpp +++ b/src/mbgl/renderer/render_source.hpp @@ -24,7 +24,7 @@ class RenderedQueryOptions; class SourceQueryOptions; class Tile; class RenderSourceObserver; -class TileParameters; +struct TileParameters; class RenderSource : protected TileObserver { public: diff --git a/src/mbgl/renderer/render_style.hpp b/src/mbgl/renderer/render_style.hpp index 23a640c482..85d8091d12 100644 --- a/src/mbgl/renderer/render_style.hpp +++ b/src/mbgl/renderer/render_style.hpp @@ -23,7 +23,7 @@ class RenderData; class TransformState; class RenderedQueryOptions; class Scheduler; -class UpdateParameters; +struct UpdateParameters; class RenderStyleObserver; namespace style { diff --git a/src/mbgl/renderer/tile_parameters.hpp b/src/mbgl/renderer/tile_parameters.hpp index 333f796331..dac320db12 100644 --- a/src/mbgl/renderer/tile_parameters.hpp +++ b/src/mbgl/renderer/tile_parameters.hpp @@ -11,29 +11,7 @@ class AnnotationManager; class ImageManager; class GlyphManager; -class TileParameters { -public: - TileParameters(const float pixelRatio_, - const MapDebugOptions debugOptions_, - const TransformState& transformState_, - Scheduler& workerScheduler_, - FileSource& fileSource_, - const MapMode mode_, - AnnotationManager& annotationManager_, - ImageManager& imageManager_, - GlyphManager& glyphManager_, - const uint8_t prefetchZoomDelta_) - : pixelRatio(pixelRatio_), - debugOptions(debugOptions_), - transformState(std::move(transformState_)), - workerScheduler(workerScheduler_), - fileSource(fileSource_), - mode(mode_), - annotationManager(annotationManager_), - imageManager(imageManager_), - glyphManager(glyphManager_), - prefetchZoomDelta(prefetchZoomDelta_) {} - +struct TileParameters { const float pixelRatio; const MapDebugOptions debugOptions; const TransformState& transformState; diff --git a/src/mbgl/renderer/tile_pyramid.hpp b/src/mbgl/renderer/tile_pyramid.hpp index a3db65b460..ad2f5e1d52 100644 --- a/src/mbgl/renderer/tile_pyramid.hpp +++ b/src/mbgl/renderer/tile_pyramid.hpp @@ -24,7 +24,7 @@ class RenderTile; class RenderStyle; class RenderedQueryOptions; class SourceQueryOptions; -class TileParameters; +struct TileParameters; class TilePyramid { public: diff --git a/src/mbgl/renderer/update_parameters.hpp b/src/mbgl/renderer/update_parameters.hpp index 9fe8afcd89..bb7b7894cb 100644 --- a/src/mbgl/renderer/update_parameters.hpp +++ b/src/mbgl/renderer/update_parameters.hpp @@ -17,45 +17,7 @@ class Scheduler; class FileSource; class AnnotationManager; -class UpdateParameters { -public: - UpdateParameters(const bool styleLoaded_, - const MapMode mode_, - const float pixelRatio_, - const MapDebugOptions debugOptions_, - const TimePoint timePoint_, - const TransformState TransformState_, - const std::string glyphURL_, - const bool spriteLoaded_, - const style::TransitionOptions transitionOptions_, - const Immutable light_, - const Immutable>> images_, - const Immutable>> sources_, - const Immutable>> layers_, - Scheduler& scheduler_, - FileSource& fileSource_, - AnnotationManager& annotationManager_, - const uint8_t prefetchZoomDelta_, - const bool stillImageRequest_) - : styleLoaded(styleLoaded_), - mode(mode_), - pixelRatio(pixelRatio_), - debugOptions(debugOptions_), - timePoint(std::move(timePoint_)), - transformState(std::move(TransformState_)), - glyphURL(std::move(glyphURL_)), - spriteLoaded(spriteLoaded_), - transitionOptions(std::move(transitionOptions_)), - light(std::move(light_)), - images(std::move(images_)), - sources(std::move(sources_)), - layers(std::move(layers_)), - scheduler(scheduler_), - fileSource(fileSource_), - annotationManager(annotationManager_), - prefetchZoomDelta(prefetchZoomDelta_), - stillImageRequest(stillImageRequest_) {} - +struct UpdateParameters { const bool styleLoaded; const MapMode mode; const float pixelRatio; diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp index d8a0a379d7..2ba459da21 100644 --- a/src/mbgl/tile/geojson_tile.hpp +++ b/src/mbgl/tile/geojson_tile.hpp @@ -5,7 +5,7 @@ namespace mbgl { -class TileParameters; +struct TileParameters; class GeoJSONTile : public GeometryTile { public: diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index c45762742b..1ffc354de6 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -22,7 +22,7 @@ class GeometryTileData; class RenderStyle; class RenderLayer; class SourceQueryOptions; -class TileParameters; +struct TileParameters; class GlyphAtlas; class ImageAtlas; diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp index 51075a2dbc..d8b057c4ac 100644 --- a/src/mbgl/tile/raster_tile.hpp +++ b/src/mbgl/tile/raster_tile.hpp @@ -8,7 +8,7 @@ namespace mbgl { class Tileset; -class TileParameters; +struct TileParameters; namespace style { class Layer; diff --git a/src/mbgl/tile/tile_loader.hpp b/src/mbgl/tile/tile_loader.hpp index bc408ebaf6..b81121a27e 100644 --- a/src/mbgl/tile/tile_loader.hpp +++ b/src/mbgl/tile/tile_loader.hpp @@ -10,7 +10,7 @@ class FileSource; class AsyncRequest; class Response; class Tileset; -class TileParameters; +struct TileParameters; template class TileLoader : private util::noncopyable { diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp index 566cde4f37..d6d3c54e34 100644 --- a/src/mbgl/tile/vector_tile.hpp +++ b/src/mbgl/tile/vector_tile.hpp @@ -6,7 +6,7 @@ namespace mbgl { class Tileset; -class TileParameters; +struct TileParameters; class VectorTile : public GeometryTile { public: -- cgit v1.2.1