From d86c0a6b28d1c54db01c4ce0c1a5e2696db50636 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Fri, 5 Jul 2013 20:28:06 +0300
Subject: [PATCH] Fix according to code review.

---
 android/jni/com/mapswithme/maps/Framework.hpp | 2 +-
 base/scheduled_task.cpp                       | 2 +-
 graphics/overlay.cpp                          | 8 --------
 graphics/overlay.hpp                          | 1 -
 map/framework.cpp                             | 6 +++---
 qt/draw_widget.hpp                            | 2 +-
 6 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp
index a668109017..47f79cf2a3 100644
--- a/android/jni/com/mapswithme/maps/Framework.hpp
+++ b/android/jni/com/mapswithme/maps/Framework.hpp
@@ -48,7 +48,7 @@ namespace android
 
     math::AvgVector<float, 3> m_sensors[2];
 
-    shared_ptr<ScheduledTask> m_scheduledTask;
+    scoped_ptr<ScheduledTask> m_scheduledTask;
     bool m_wasLongClick;
 
     void StartTouchTask(double x, double y, unsigned ms);
diff --git a/base/scheduled_task.cpp b/base/scheduled_task.cpp
index e96f9ad01e..56643778b1 100644
--- a/base/scheduled_task.cpp
+++ b/base/scheduled_task.cpp
@@ -32,8 +32,8 @@ void ScheduledTask::Routine::Do()
 }
 
 ScheduledTask::ScheduledTask(fn_t const & fn, unsigned ms)
+  : m_routine(new Routine(fn, ms, &m_cond))
 {
-  m_routine.reset(new Routine(fn, ms, &m_cond));
   m_thread.Create(m_routine.get());
 }
 
diff --git a/graphics/overlay.cpp b/graphics/overlay.cpp
index 99dfcf194c..5a8f341829 100644
--- a/graphics/overlay.cpp
+++ b/graphics/overlay.cpp
@@ -242,14 +242,6 @@ namespace graphics
     m_tree.ForEachInRect(rect, fn);
   }
 
-  /*
-  void Overlay::selectOverlayElements(m2::PointD const & pt, list<shared_ptr<OverlayElement> > & res) const
-  {
-    DoPreciseSelectByPoint fn(pt, &res);
-    m_tree.ForEachInRect(m2::RectD(pt - m2::PointD(1, 1), pt + m2::PointD(1, 1)), fn);
-  }
-  */
-
   void Overlay::replaceOverlayElement(shared_ptr<OverlayElement> const & oe)
   {
     bool isIntersect = false;
diff --git a/graphics/overlay.hpp b/graphics/overlay.hpp
index 0132252c35..86b3762a5b 100644
--- a/graphics/overlay.hpp
+++ b/graphics/overlay.hpp
@@ -41,7 +41,6 @@ namespace graphics
 
     void draw(OverlayRenderer * r, math::Matrix<double, 3, 3> const & m);
 
-    //void selectOverlayElements(m2::PointD const & pt, list<shared_ptr<OverlayElement> > & res) const;
     void selectOverlayElements(m2::RectD const & rect, list<shared_ptr<OverlayElement> > & res) const;
 
     void removeOverlayElement(shared_ptr<OverlayElement> const & oe, m2::RectD const & r);
diff --git a/map/framework.cpp b/map/framework.cpp
index 6d1dc5806e..a6af08795d 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1514,15 +1514,15 @@ bool Framework::GetVisiblePOI(m2::PointD const & pxPoint, m2::PointD & pxPivot,
 
   {
     // It seems like we don't need to lock frame here.
-    // Locking of overlay and storing items as shared_ptr is enough here.
+    // Overlay locking and storing items as shared_ptr is enough here.
     //m_renderPolicy->FrameLock();
 
     m2::PointD const pt = m_navigator.ShiftPoint(pxPoint);
     double const halfSize = TOUCH_PIXEL_RADIUS * GetVisualScale();
 
     list<OEPointerT> candidates;
-    m2::RectD rect(pt.x - halfSize, pt.y - halfSize,
-                   pt.x + halfSize, pt.y + halfSize);
+    m2::RectD const rect(pt.x - halfSize, pt.y - halfSize,
+                         pt.x + halfSize, pt.y + halfSize);
 
     graphics::Overlay * frameOverlay = m_renderPolicy->FrameOverlay();
     frameOverlay->lock();
diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp
index ec3f1f3266..7c67194a31 100644
--- a/qt/draw_widget.hpp
+++ b/qt/draw_widget.hpp
@@ -142,7 +142,7 @@ namespace qt
 
     QScaleSlider * m_pScale;
 
-    shared_ptr<ScheduledTask> m_scheduledTasks;
+    scoped_ptr<ScheduledTask> m_scheduledTasks;
     m2::PointD m_taskPoint;
     bool m_wasLongClick, m_isCleanSingleClick;