From efd712903088cd5d8dd6f473ecb7a1a7fe5f6a72 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Wed, 26 Oct 2011 12:15:32 +0300
Subject: [PATCH] Change 'FormatDistance' declaration - return bool as is and
 string as reference.

---
 map/measurement_utils.cpp | 21 +++++++++++----------
 map/measurement_utils.hpp |  6 +++---
 qt/search_panel.cpp       |  6 +++---
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/map/measurement_utils.cpp b/map/measurement_utils.cpp
index 0693d794eb..115dc08d68 100644
--- a/map/measurement_utils.cpp
+++ b/map/measurement_utils.cpp
@@ -6,24 +6,25 @@
 namespace MeasurementUtils
 {
 
-string FormatDistanceImpl(double m, bool & drawDir,
+bool FormatDistanceImpl(double m, string & res,
                           char const * high, char const * low, double highF, double lowF)
 {
   double const lowV = m / lowF;
-  drawDir = true;
   if (lowV < 1.0)
   {
-    drawDir = false;
-    return string("0") + low;
+    res = string("0") + low;
+    return false;
   }
 
   if (m >= highF)
-    return strings::to_string(m / highF) + high;
+    res = strings::to_string(m / highF) + high;
   else
-    return strings::to_string(lowV) + low;
+    res = strings::to_string(lowV) + low;
+
+  return true;
 }
 
-string FormatDistance(double m, bool & drawDir)
+bool FormatDistance(double m, string & res)
 {
   using namespace Settings;
   Units u = Metric;
@@ -31,9 +32,9 @@ string FormatDistance(double m, bool & drawDir)
 
   switch (u)
   {
-  case Yard: return FormatDistanceImpl(m, drawDir, " mi", " yd", 1609.344, 0.9144);
-  case Foot: return FormatDistanceImpl(m, drawDir, " mi", " ft", 1609.344, 0.3048);
-  default: return FormatDistanceImpl(m, drawDir, " km", " m", 1000.0, 1.0);
+  case Yard: return FormatDistanceImpl(m, res, " mi", " yd", 1609.344, 0.9144);
+  case Foot: return FormatDistanceImpl(m, res, " mi", " ft", 1609.344, 0.3048);
+  default: return FormatDistanceImpl(m, res, " km", " m", 1000.0, 1.0);
   }
 }
 
diff --git a/map/measurement_utils.hpp b/map/measurement_utils.hpp
index e6cd8e866f..4977caea06 100644
--- a/map/measurement_utils.hpp
+++ b/map/measurement_utils.hpp
@@ -16,8 +16,8 @@ inline double YardToMiles(double yd) { return yd * 1760; }
 
 /// Takes into an account user settings [metric, imperial]
 /// @param[in] m meters
-/// @param[out] drawDir should be direction arrow drawed? false if distance is < 1.0
-/// @return formatted string for search
-string FormatDistance(double m, bool & drawDir);
+/// @param[out] res formatted string for search
+/// @return should be direction arrow drawed? false if distance is to small (< 1.0)
+bool FormatDistance(double m, string & res);
 
 }
diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp
index d279d7fe6d..217285d349 100644
--- a/qt/search_panel.cpp
+++ b/qt/search_panel.cpp
@@ -136,9 +136,9 @@ void SearchPanel::OnSearchResult(ResultT * res, int queryId)
       m_pTable->setItem(rowCount, 0,
                         create_item(QString::fromUtf8(res->GetFetureTypeAsString().c_str())));
 
-      bool drawDir;
-      m_pTable->setItem(rowCount, 2,
-                        create_item(MeasurementUtils::FormatDistance(res->GetDistanceFromCenter(), drawDir).c_str()));
+      string strDist;
+      bool const drawDir = MeasurementUtils::FormatDistance(res->GetDistanceFromCenter(), strDist);
+      m_pTable->setItem(rowCount, 2, create_item(strDist.c_str()));
 
       if (drawDir)
       {