diff options
author | Alex Zolotarev <deathbaba@gmail.com> | 2011-10-21 19:39:00 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:26:32 +0300 |
commit | 946bf7b727cce9dbc8a0c1b0f7f7ddec2d2d16cb (patch) | |
tree | 1750b08be8882e1d656ca42253085b3fc7909230 /qt/draw_widget.hpp | |
parent | 43a0bd87f5856a303d552ca895dd0fea72a1ecda (diff) |
[qt][ios] Refactored location manager
Diffstat (limited to 'qt/draw_widget.hpp')
-rw-r--r-- | qt/draw_widget.hpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp index 5e95e9ef93..f93a0340ed 100644 --- a/qt/draw_widget.hpp +++ b/qt/draw_widget.hpp @@ -9,7 +9,7 @@ #include "../platform/video_timer.hpp" -#include "../std/auto_ptr.hpp" +#include "../std/scoped_ptr.hpp" #include <QtCore/QTimer> @@ -38,9 +38,9 @@ namespace qt typedef model::FeaturesFetcher model_t; - auto_ptr<Framework<model_t> > m_framework; + scoped_ptr<Framework<model_t> > m_framework; - auto_ptr<VideoTimer> m_videoTimer; + scoped_ptr<VideoTimer> m_videoTimer; bool m_isDrag; bool m_isRotate; @@ -76,9 +76,6 @@ namespace qt void SetScaleControl(QScaleSlider * pScale); - void OnEnableMyPosition(LocationRetrievedCallbackT observer); - void OnDisableMyPosition(); - void Search(string const & text, SearchCallbackT callback); void ShowFeature(m2::RectD const & rect); @@ -90,6 +87,8 @@ namespace qt void PrepareShutdown(); + Framework<model_t> & Framework() { return *m_framework.get(); } + protected: static const uint32_t ini_file_version = 0; |