From fa36110dfbdc05b511a3f85461eaca4a29e446a1 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 10 May 2017 18:51:04 +0300 Subject: [tidy] modernize-use-auto --- platform/default/async_task.cpp | 2 +- platform/default/image.cpp | 2 +- platform/default/jpeg_reader.cpp | 8 ++++---- platform/default/mbgl/storage/offline_download.cpp | 11 +++++------ platform/default/png_reader.cpp | 2 +- platform/default/sqlite3.cpp | 2 +- platform/default/timer.cpp | 2 +- platform/glfw/glfw_view.cpp | 12 ++++++------ platform/linux/src/headless_backend_glx.cpp | 4 ++-- platform/linux/src/headless_display_glx.cpp | 2 +- 10 files changed, 23 insertions(+), 24 deletions(-) (limited to 'platform') diff --git a/platform/default/async_task.cpp b/platform/default/async_task.cpp index 5fa9db8d33..50891056d8 100644 --- a/platform/default/async_task.cpp +++ b/platform/default/async_task.cpp @@ -16,7 +16,7 @@ public: : async(new uv_async_t), task(std::move(fn)) { - uv_loop_t* loop = reinterpret_cast(RunLoop::getLoopHandle()); + auto* loop = reinterpret_cast(RunLoop::getLoopHandle()); if (uv_async_init(loop, async, asyncCallback) != 0) { throw std::runtime_error("Failed to initialize async."); } diff --git a/platform/default/image.cpp b/platform/default/image.cpp index ad9d83a08d..447c6bcd66 100644 --- a/platform/default/image.cpp +++ b/platform/default/image.cpp @@ -12,7 +12,7 @@ PremultipliedImage decodePNG(const uint8_t*, size_t); PremultipliedImage decodeJPEG(const uint8_t*, size_t); PremultipliedImage decodeImage(const std::string& string) { - const uint8_t* data = reinterpret_cast(string.data()); + const auto* data = reinterpret_cast(string.data()); const size_t size = string.size(); #if !defined(__ANDROID__) && !defined(__APPLE__) diff --git a/platform/default/jpeg_reader.cpp b/platform/default/jpeg_reader.cpp index c5e9d880c0..5f613f9423 100644 --- a/platform/default/jpeg_reader.cpp +++ b/platform/default/jpeg_reader.cpp @@ -21,12 +21,12 @@ struct jpeg_stream_wrapper { }; static void init_source(j_decompress_ptr cinfo) { - jpeg_stream_wrapper* wrap = reinterpret_cast(cinfo->src); + auto* wrap = reinterpret_cast(cinfo->src); wrap->stream->seekg(0, std::ios_base::beg); } static boolean fill_input_buffer(j_decompress_ptr cinfo) { - jpeg_stream_wrapper* wrap = reinterpret_cast(cinfo->src); + auto* wrap = reinterpret_cast(cinfo->src); wrap->stream->read(reinterpret_cast(&wrap->buffer[0]), BUF_SIZE); std::streamsize size = wrap->stream->gcount(); wrap->manager.next_input_byte = wrap->buffer.data(); @@ -36,7 +36,7 @@ static boolean fill_input_buffer(j_decompress_ptr cinfo) { static void skip(j_decompress_ptr cinfo, long count) { if (count <= 0) return; // A zero or negative skip count should be treated as a no-op. - jpeg_stream_wrapper* wrap = reinterpret_cast(cinfo->src); + auto* wrap = reinterpret_cast(cinfo->src); if (wrap->manager.bytes_in_buffer > 0 && count < static_cast(wrap->manager.bytes_in_buffer)) { @@ -59,7 +59,7 @@ static void attach_stream(j_decompress_ptr cinfo, std::istream* in) { cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(jpeg_stream_wrapper)); } - jpeg_stream_wrapper * src = reinterpret_cast (cinfo->src); + auto * src = reinterpret_cast (cinfo->src); src->manager.init_source = init_source; src->manager.fill_input_buffer = fill_input_buffer; src->manager.skip_input_data = skip; diff --git a/platform/default/mbgl/storage/offline_download.cpp b/platform/default/mbgl/storage/offline_download.cpp index 901f996a4f..5a487b3534 100644 --- a/platform/default/mbgl/storage/offline_download.cpp +++ b/platform/default/mbgl/storage/offline_download.cpp @@ -76,8 +76,7 @@ OfflineRegionStatus OfflineDownload::getStatus() const { switch (type) { case SourceType::Vector: case SourceType::Raster: { - style::TileSourceImpl* tileSource = - static_cast(source->baseImpl.get()); + auto* tileSource = static_cast(source->baseImpl.get()); const variant& urlOrTileset = tileSource->getURLOrTileset(); const uint16_t tileSize = tileSource->getTileSize(); @@ -86,7 +85,7 @@ OfflineRegionStatus OfflineDownload::getStatus() const { definition.tileCover(type, tileSize, urlOrTileset.get().zoomRange).size(); } else { result.requiredResourceCount += 1; - const std::string& url = urlOrTileset.get(); + const auto& url = urlOrTileset.get(); optional sourceResponse = offlineDatabase.get(Resource::source(url)); if (sourceResponse) { style::conversion::Error error; @@ -103,7 +102,7 @@ OfflineRegionStatus OfflineDownload::getStatus() const { } case SourceType::GeoJSON: { - style::GeoJSONSource* geojsonSource = source->as(); + auto* geojsonSource = source->as(); if (geojsonSource->getURL()) { result.requiredResourceCount += 1; } @@ -151,7 +150,7 @@ void OfflineDownload::activateDownload() { if (urlOrTileset.is()) { queueTiles(type, tileSize, urlOrTileset.get()); } else { - const std::string& url = urlOrTileset.get(); + const auto& url = urlOrTileset.get(); status.requiredResourceCountIsPrecise = false; status.requiredResourceCount++; requiredSourceURLs.insert(url); @@ -174,7 +173,7 @@ void OfflineDownload::activateDownload() { } case SourceType::GeoJSON: { - style::GeoJSONSource::Impl* geojsonSource = + auto* geojsonSource = static_cast(source->baseImpl.get()); if (geojsonSource->getURL()) { diff --git a/platform/default/png_reader.cpp b/platform/default/png_reader.cpp index 29ef3058e1..4d4ee29d1f 100644 --- a/platform/default/png_reader.cpp +++ b/platform/default/png_reader.cpp @@ -40,7 +40,7 @@ static void user_warning_fn(png_structp, png_const_charp warning_msg) { } static void png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) { - std::istream* fin = reinterpret_cast(png_get_io_ptr(png_ptr)); + auto* fin = reinterpret_cast(png_get_io_ptr(png_ptr)); fin->read(reinterpret_cast(data), length); std::streamsize read_count = fin->gcount(); if (read_count < 0 || static_cast(read_count) != length) diff --git a/platform/default/sqlite3.cpp b/platform/default/sqlite3.cpp index 304d5e9aba..4cbe1df775 100644 --- a/platform/default/sqlite3.cpp +++ b/platform/default/sqlite3.cpp @@ -314,7 +314,7 @@ template <> std::string Statement::get(int offset) { template <> std::vector Statement::get(int offset) { assert(impl); - const uint8_t* begin = reinterpret_cast(sqlite3_column_blob(impl->stmt, offset)); + const auto* begin = reinterpret_cast(sqlite3_column_blob(impl->stmt, offset)); const uint8_t* end = begin + sqlite3_column_bytes(impl->stmt, offset); return { begin, end }; } diff --git a/platform/default/timer.cpp b/platform/default/timer.cpp index cd0e6da6aa..90a85bfc1f 100644 --- a/platform/default/timer.cpp +++ b/platform/default/timer.cpp @@ -10,7 +10,7 @@ namespace util { class Timer::Impl { public: Impl() : timer(new uv_timer_t) { - uv_loop_t* loop = reinterpret_cast(RunLoop::getLoopHandle()); + auto* loop = reinterpret_cast(RunLoop::getLoopHandle()); if (uv_timer_init(loop, timer) != 0) { throw std::runtime_error("Failed to initialize timer."); } diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index 31b0b92c58..1be38e5e4a 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -145,7 +145,7 @@ void GLFWView::bind() { } void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, int mods) { - GLFWView *view = reinterpret_cast(glfwGetWindowUserPointer(window)); + auto *view = reinterpret_cast(glfwGetWindowUserPointer(window)); if (action == GLFW_RELEASE) { switch (key) { @@ -356,7 +356,7 @@ void GLFWView::popAnnotation() { } void GLFWView::onScroll(GLFWwindow *window, double /*xOffset*/, double yOffset) { - GLFWView *view = reinterpret_cast(glfwGetWindowUserPointer(window)); + auto *view = reinterpret_cast(glfwGetWindowUserPointer(window)); double delta = yOffset * 40; bool isWheel = delta != 0 && std::fmod(delta, 4.000244140625) == 0; @@ -378,14 +378,14 @@ void GLFWView::onScroll(GLFWwindow *window, double /*xOffset*/, double yOffset) } void GLFWView::onWindowResize(GLFWwindow *window, int width, int height) { - GLFWView *view = reinterpret_cast(glfwGetWindowUserPointer(window)); + auto *view = reinterpret_cast(glfwGetWindowUserPointer(window)); view->width = width; view->height = height; view->map->setSize({ static_cast(view->width), static_cast(view->height) }); } void GLFWView::onFramebufferResize(GLFWwindow *window, int width, int height) { - GLFWView *view = reinterpret_cast(glfwGetWindowUserPointer(window)); + auto *view = reinterpret_cast(glfwGetWindowUserPointer(window)); view->fbWidth = width; view->fbHeight = height; view->bind(); @@ -398,7 +398,7 @@ void GLFWView::onFramebufferResize(GLFWwindow *window, int width, int height) { } void GLFWView::onMouseClick(GLFWwindow *window, int button, int action, int modifiers) { - GLFWView *view = reinterpret_cast(glfwGetWindowUserPointer(window)); + auto *view = reinterpret_cast(glfwGetWindowUserPointer(window)); if (button == GLFW_MOUSE_BUTTON_RIGHT || (button == GLFW_MOUSE_BUTTON_LEFT && modifiers & GLFW_MOD_CONTROL)) { @@ -426,7 +426,7 @@ void GLFWView::onMouseClick(GLFWwindow *window, int button, int action, int modi } void GLFWView::onMouseMove(GLFWwindow *window, double x, double y) { - GLFWView *view = reinterpret_cast(glfwGetWindowUserPointer(window)); + auto *view = reinterpret_cast(glfwGetWindowUserPointer(window)); if (view->tracking) { double dx = x - view->lastX; double dy = y - view->lastY; diff --git a/platform/linux/src/headless_backend_glx.cpp b/platform/linux/src/headless_backend_glx.cpp index 36a60ec06b..1c1592ac75 100644 --- a/platform/linux/src/headless_backend_glx.cpp +++ b/platform/linux/src/headless_backend_glx.cpp @@ -58,8 +58,8 @@ bool HeadlessBackend::hasDisplay() { void HeadlessBackend::createContext() { assert(!hasContext()); - Display* xDisplay = display->attribute(); - GLXFBConfig* fbConfigs = display->attribute(); + auto* xDisplay = display->attribute(); + auto* fbConfigs = display->attribute(); // Try to create a legacy context. GLXContext glContext = glXCreateNewContext(xDisplay, fbConfigs[0], GLX_RGBA_TYPE, None, True); diff --git a/platform/linux/src/headless_display_glx.cpp b/platform/linux/src/headless_display_glx.cpp index 4275ebb646..963a5234cb 100644 --- a/platform/linux/src/headless_display_glx.cpp +++ b/platform/linux/src/headless_display_glx.cpp @@ -27,7 +27,7 @@ HeadlessDisplay::Impl::Impl() { throw std::runtime_error("Failed to open X display."); } - const char *extensions = reinterpret_cast(glXQueryServerString(xDisplay, DefaultScreen(xDisplay), GLX_EXTENSIONS)); + const auto *extensions = reinterpret_cast(glXQueryServerString(xDisplay, DefaultScreen(xDisplay), GLX_EXTENSIONS)); if (!extensions) { throw std::runtime_error("Cannot read GLX extensions."); } -- cgit v1.2.1