diff options
| author | Alex Zolotarev <alex@mapswithme.com> | 2014-08-07 01:45:40 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:25:03 +0300 |
| commit | baf239aef8bfbc76b2e1b09c5dc59b8463160a3b (patch) | |
| tree | c9896e450a4a8a7113b94a74809d7dbc7cb98eeb /gui | |
| parent | 180657e756fefbe5d601c64b860ee470217b4956 (diff) | |
[c++11] Migrated from scoped_ptr to unique_ptr
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/button.hpp | 4 | ||||
| -rw-r--r-- | gui/cached_text_view.hpp | 4 | ||||
| -rw-r--r-- | gui/controller.hpp | 4 | ||||
| -rw-r--r-- | gui/image_view.hpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/gui/button.hpp b/gui/button.hpp index 77a094f328..c63a510260 100644 --- a/gui/button.hpp +++ b/gui/button.hpp @@ -5,7 +5,7 @@ #include "../std/function.hpp" #include "../std/string.hpp" -#include "../std/scoped_ptr.hpp" +#include "../std/unique_ptr.hpp" namespace graphics { @@ -32,7 +32,7 @@ namespace gui unsigned m_minWidth; unsigned m_minHeight; - scoped_ptr<TextView> m_textView; + unique_ptr<TextView> m_textView; map<EState, shared_ptr<graphics::DisplayList> > m_dls; void cacheButtonBody(EState state); diff --git a/gui/cached_text_view.hpp b/gui/cached_text_view.hpp index 5afdaf5be2..90a531a49c 100644 --- a/gui/cached_text_view.hpp +++ b/gui/cached_text_view.hpp @@ -26,8 +26,8 @@ namespace gui vector<shared_ptr<graphics::DisplayList> > m_dls; vector<shared_ptr<graphics::DisplayList> > m_maskedDls; - scoped_ptr<graphics::GlyphLayout> m_layout; - scoped_ptr<graphics::GlyphLayout> m_maskedLayout; + unique_ptr<graphics::GlyphLayout> m_layout; + unique_ptr<graphics::GlyphLayout> m_maskedLayout; mutable vector<m2::AnyRectD> m_boundRects; diff --git a/gui/controller.hpp b/gui/controller.hpp index f3d288d5f3..6b9e2a54e9 100644 --- a/gui/controller.hpp +++ b/gui/controller.hpp @@ -3,7 +3,7 @@ #include "display_list_cache.hpp" #include "../std/shared_ptr.hpp" -#include "../std/scoped_ptr.hpp" +#include "../std/unique_ptr.hpp" #include "../std/function.hpp" #include "../std/list.hpp" @@ -71,7 +71,7 @@ namespace gui graphics::GlyphCache * m_GlyphCache; /// Cache for display lists for fast rendering on GUI thread - scoped_ptr<DisplayListCache> m_DisplayListCache; + unique_ptr<DisplayListCache> m_DisplayListCache; /// Localized strings for GUI. StringsBundle const * m_bundle; diff --git a/gui/image_view.hpp b/gui/image_view.hpp index 936d1093d9..73d9ebcbb0 100644 --- a/gui/image_view.hpp +++ b/gui/image_view.hpp @@ -5,7 +5,7 @@ #include "../graphics/image.hpp" #include "../graphics/display_list.hpp" -#include "../std/scoped_ptr.hpp" +#include "../std/unique_ptr.hpp" namespace graphics { @@ -22,7 +22,7 @@ namespace gui graphics::Image::Info m_image; m2::RectU m_margin; - scoped_ptr<graphics::DisplayList> m_displayList; + unique_ptr<graphics::DisplayList> m_displayList; public: |