diff options
| author | rachytski <siarhei.rachytski@gmail.com> | 2012-12-14 18:57:43 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:47:56 +0300 |
| commit | f151f3a004388cf1c898c0568612bc2793b1dbd1 (patch) | |
| tree | 777a5e917acd6bd1ba99eb22b60273f8dba76a64 /map | |
| parent | 0f376a46e576bdfd90f85081e343cce2561b1c37 (diff) | |
returning raw pointer instead of shared_ptr from RenderContext::createShared, allowing clients to choose lifetime handling policy by themselves.
Diffstat (limited to 'map')
| -rw-r--r-- | map/coverage_generator.cpp | 2 | ||||
| -rw-r--r-- | map/qgl_render_context.cpp | 4 | ||||
| -rw-r--r-- | map/qgl_render_context.hpp | 2 | ||||
| -rw-r--r-- | map/tile_renderer.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/map/coverage_generator.cpp b/map/coverage_generator.cpp index 75541ac37d..fe73664a56 100644 --- a/map/coverage_generator.cpp +++ b/map/coverage_generator.cpp @@ -39,7 +39,7 @@ CoverageGenerator::CoverageGenerator( m_resourceManager = rm; if (!m_glQueue) - m_renderContext = primaryRC->createShared(); + m_renderContext.reset(primaryRC->createShared()); m_queue.AddInitCommand(bind(&CoverageGenerator::InitializeThreadGL, this)); m_queue.AddFinCommand(bind(&CoverageGenerator::FinalizeThreadGL, this)); diff --git a/map/qgl_render_context.cpp b/map/qgl_render_context.cpp index f898e5e5cf..f15f7c42e4 100644 --- a/map/qgl_render_context.cpp +++ b/map/qgl_render_context.cpp @@ -31,9 +31,9 @@ namespace qt m_context->makeCurrent(); } - shared_ptr<graphics::RenderContext> RenderContext::createShared() + graphics::RenderContext * RenderContext::createShared() { - shared_ptr<graphics::gl::RenderContext> res(new RenderContext(this)); + graphics::gl::RenderContext * res = new RenderContext(this); res->setResourceManager(resourceManager()); return res; } diff --git a/map/qgl_render_context.hpp b/map/qgl_render_context.hpp index e95f73cb53..661c2d780c 100644 --- a/map/qgl_render_context.hpp +++ b/map/qgl_render_context.hpp @@ -30,7 +30,7 @@ namespace qt /// Make this rendering context current void makeCurrent(); - shared_ptr<graphics::RenderContext> createShared(); + graphics::RenderContext * createShared(); /// Leave previous logic, but fix thread widget deletion error. void endThreadDrawing(unsigned threadSlot); diff --git a/map/tile_renderer.cpp b/map/tile_renderer.cpp index 9f1034ca45..c4d23aa7da 100644 --- a/map/tile_renderer.cpp +++ b/map/tile_renderer.cpp @@ -51,7 +51,7 @@ TileRenderer::TileRenderer( for (unsigned i = 0; i < m_threadData.size(); ++i) { if (!packetsQueues) - m_threadData[i].m_renderContext = m_primaryContext->createShared(); + m_threadData[i].m_renderContext.reset(m_primaryContext->createShared()); Drawer::Params params; |