Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsentiy Milchakov <milcars@mapswithme.com>2018-10-25 16:21:58 +0300
committerTatiana Yan <tatiana.kondakova@gmail.com>2018-10-26 17:10:18 +0300
commit424354cf3d2c92e3d8e77692c2cd929188894535 (patch)
tree930ed745e31cc47b48c893f70e282240cf765a07 /metrics
parentc7e389f38c269d2998ddf047bb198b82ae430e02 (diff)
[eye] clang-format
Diffstat (limited to 'metrics')
-rw-r--r--metrics/eye.cpp8
-rw-r--r--metrics/eye.hpp16
-rw-r--r--metrics/eye_info.hpp10
-rw-r--r--metrics/eye_serdes.cpp5
-rw-r--r--metrics/metrics_tests/eye_tests.cpp5
5 files changed, 20 insertions, 24 deletions
diff --git a/metrics/eye.cpp b/metrics/eye.cpp
index fe707f38ca..882b07f2fa 100644
--- a/metrics/eye.cpp
+++ b/metrics/eye.cpp
@@ -6,8 +6,8 @@
#include "coding/file_writer.hpp"
-#include "base/logging.hpp"
#include "base/assert.hpp"
+#include "base/logging.hpp"
#include <algorithm>
#include <memory>
@@ -50,7 +50,7 @@ bool Save(Info const & info)
}
// TODO: use to trim old map object events.
-//bool SaveMapObjects(Info const & info)
+// bool SaveMapObjects(Info const & info)
//{
// std::vector<int8_t> fileData;
// Serdes::SerializeMapObjects(info.m_mapObjects, fileData);
@@ -58,7 +58,7 @@ bool Save(Info const & info)
//}
//
// TODO: use it to save map object events with append only flag.
-//bool SaveMapObjectEvent(MapObject const & mapObject, MapObject::Event const & event)
+// bool SaveMapObjectEvent(MapObject const & mapObject, MapObject::Event const & event)
//{
// std::vector<int8_t> eventData;
// Serdes::SerializeMapObjectEvent(mapObject, event, eventData);
@@ -334,7 +334,7 @@ void Eye::Event::UgcEditorOpened()
});
}
-//static
+// static
void Eye::Event::UgcSaved()
{
GetPlatform().RunTask(Platform::Thread::File, []
diff --git a/metrics/eye.hpp b/metrics/eye.hpp
index eb2e86d3a1..97c9b88d65 100644
--- a/metrics/eye.hpp
+++ b/metrics/eye.hpp
@@ -12,16 +12,16 @@ namespace eye
class Subscriber
{
public:
- virtual ~Subscriber() {};
+ virtual ~Subscriber(){};
public:
- virtual void OnTipClicked(Tip const & tip) {};
- virtual void OnBookingFilterUsed(Time const & time) {};
- virtual void OnBookmarksCatalogShown(Time const & time) {};
- virtual void OnDiscoveryShown(Time const & time) {};
- virtual void OnDiscoveryItemClicked(Discovery::Event event) {};
- virtual void OnLayerUsed(Layer const & layer) {};
- virtual void OnPlacePageOpened(MapObject const & poi) {};
+ virtual void OnTipClicked(Tip const & tip){};
+ virtual void OnBookingFilterUsed(Time const & time){};
+ virtual void OnBookmarksCatalogShown(Time const & time){};
+ virtual void OnDiscoveryShown(Time const & time){};
+ virtual void OnDiscoveryItemClicked(Discovery::Event event){};
+ virtual void OnLayerUsed(Layer const & layer){};
+ virtual void OnPlacePageOpened(MapObject const & poi){};
};
// Note This class IS thread-safe.
diff --git a/metrics/eye_info.hpp b/metrics/eye_info.hpp
index 06bc31dedd..2abe03537d 100644
--- a/metrics/eye_info.hpp
+++ b/metrics/eye_info.hpp
@@ -8,8 +8,8 @@
#include "base/visitor.hpp"
#include <array>
-#include <cstdint>
#include <chrono>
+#include <cstdint>
#include <string>
#include <type_traits>
#include <unordered_map>
@@ -185,16 +185,14 @@ struct MapObject
{
size_t operator()(MapObject const & p) const
{
- return base::Hash(
- base::Hash(p.m_pos.lat, p.m_pos.lon),
- base::Hash(p.m_bestType, p.m_bestType));
+ return base::Hash(base::Hash(p.m_pos.lat, p.m_pos.lon),
+ base::Hash(p.m_bestType, p.m_bestType));
}
};
bool operator==(MapObject const & rhs) const
{
- return m_pos.EqualDxDy(rhs.m_pos, 1e-6) &&
- m_bestType == rhs.m_bestType;
+ return m_pos.EqualDxDy(rhs.m_pos, 1e-6) && m_bestType == rhs.m_bestType;
}
std::string m_bestType;
diff --git a/metrics/eye_serdes.cpp b/metrics/eye_serdes.cpp
index 11f6243a3b..1dba3018ef 100644
--- a/metrics/eye_serdes.cpp
+++ b/metrics/eye_serdes.cpp
@@ -133,9 +133,8 @@ void Serdes::DeserializeMapObjects(std::vector<int8_t> const & bytes, MapObjects
}
catch (base::Json::Exception & ex)
{
- LOG(LERROR, ("Cannot deserialize map objects. Exception:", ex.Msg(),
- ". Event string:", eventString,
- ". Content:", std::string(bytes.begin(), bytes.end())));
+ LOG(LERROR, ("Cannot deserialize map objects. Exception:", ex.Msg(), ". Event string:",
+ eventString, ". Content:", std::string(bytes.begin(), bytes.end())));
}
}
diff --git a/metrics/metrics_tests/eye_tests.cpp b/metrics/metrics_tests/eye_tests.cpp
index 51f2f6b001..0c0ddd324e 100644
--- a/metrics/metrics_tests/eye_tests.cpp
+++ b/metrics/metrics_tests/eye_tests.cpp
@@ -35,7 +35,6 @@ Info MakeDefaultInfoForTesting()
layer.m_type = Layer::Type::PublicTransport;
info.m_layers.emplace_back(std::move(layer));
-
info.m_discovery.m_lastOpenedTime = Time(std::chrono::hours(30000));
info.m_discovery.m_eventCounters.Increment(Discovery::Event::MoreAttractionsClicked);
info.m_discovery.m_lastClickedTime = Time(std::chrono::hours(30005));
@@ -83,8 +82,8 @@ void CompareWithDefaultInfo(Info const & lhs)
auto const & lPoi = *(lhs.m_mapObjects.begin());
auto const & rPoi = *(rhs.m_mapObjects.begin());
TEST(lPoi.first.m_pos.EqualDxDy(rPoi.first.m_pos, 1e-6), ());
- TEST_EQUAL(lPoi.first.m_bestType, rPoi.first.m_bestType,());
- TEST_EQUAL(lPoi.second.size(), rPoi.second.size(),());
+ TEST_EQUAL(lPoi.first.m_bestType, rPoi.first.m_bestType, ());
+ TEST_EQUAL(lPoi.second.size(), rPoi.second.size(), ());
TEST(lPoi.second[0].m_userPos.EqualDxDy(rPoi.second[0].m_userPos, 1e-6), ());
TEST_EQUAL(lPoi.second[0].m_eventTime, rPoi.second[0].m_eventTime, ());
TEST_EQUAL(lPoi.second[0].m_type, rPoi.second[0].m_type, ());