diff options
| author | Alex Zolotarev <alex@mapswithme.com> | 2014-08-08 07:52:11 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:25:04 +0300 |
| commit | 1c8675c1d55fdf66b64b06f7e736b557ae533298 (patch) | |
| tree | c6e849c39bfaaae29d11956bdbdf3a77f17173b7 /qt_tstfrm | |
| parent | baf239aef8bfbc76b2e1b09c5dc59b8463160a3b (diff) | |
[cpp11] make_shared_ptr -> std::make_shared
Diffstat (limited to 'qt_tstfrm')
| -rw-r--r-- | qt_tstfrm/gui_test_widget.hpp | 2 | ||||
| -rw-r--r-- | qt_tstfrm/tstwidgets.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qt_tstfrm/gui_test_widget.hpp b/qt_tstfrm/gui_test_widget.hpp index e52eb9909a..f4d017f367 100644 --- a/qt_tstfrm/gui_test_widget.hpp +++ b/qt_tstfrm/gui_test_widget.hpp @@ -66,7 +66,7 @@ public: cp.m_resourceManager = base_t::m_resourceManager; cp.m_renderContext = base_t::m_primaryContext; - m_cacheScreen = make_shared_ptr(new graphics::Screen(cp)); + m_cacheScreen.reset(new graphics::Screen(cp)); rp.m_CacheScreen = m_cacheScreen.get(); rp.m_GlyphCache = base_t::m_resourceManager->glyphCache(0); diff --git a/qt_tstfrm/tstwidgets.cpp b/qt_tstfrm/tstwidgets.cpp index 7be9eee3e5..37679e3541 100644 --- a/qt_tstfrm/tstwidgets.cpp +++ b/qt_tstfrm/tstwidgets.cpp @@ -24,7 +24,7 @@ namespace tst /// TODO: Show "Please Update Drivers" dialog and close the program. } - m_primaryContext = make_shared_ptr(new qt::gl::RenderContext(this)); + m_primaryContext.reset(new qt::gl::RenderContext(this)); graphics::ResourceManager::Params rmp; rmp.m_texFormat = graphics::Data8Bpp; @@ -125,14 +125,14 @@ namespace tst Drawer::Params params; - m_primaryFrameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer(true)); + m_primaryFrameBuffer.reset(new graphics::gl::FrameBuffer(true)); params.m_frameBuffer = m_primaryFrameBuffer; params.m_resourceManager = m_resourceManager; params.m_threadSlot = m_resourceManager->guiThreadSlot(); params.m_renderContext = m_primaryContext; - m_primaryScreen = make_shared_ptr(new graphics::Screen(params)); + m_primaryScreen.reset(new graphics::Screen(params)); } void GLDrawWidget::resizeGL(int w, int h) |