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
path: root/search
diff options
context:
space:
mode:
authorMaxim Pimenov <m@maps.me>2019-04-15 17:47:05 +0300
committerArsentiy Milchakov <milcars@mapswithme.com>2019-04-15 21:01:06 +0300
commit1d0428d056aa2e6b0024f991991f5c513cff9f73 (patch)
treecff44256529314ec8fcc9ea22fab87520a76e33a /search
parent25087ac0bf7e8c41e0d0684e43b5285a8b8be47c (diff)
Several explicit constructors per the Cppcheck report.
Diffstat (limited to 'search')
-rw-r--r--search/geocoder.cpp2
-rw-r--r--search/house_detector.cpp12
-rw-r--r--search/house_detector.hpp2
-rw-r--r--search/locality_finder.cpp2
-rw-r--r--search/retrieval.cpp2
-rw-r--r--search/search_tests/highlighting_tests.cpp2
-rw-r--r--search/search_tests/keyword_matcher_test.cpp6
7 files changed, 15 insertions, 13 deletions
diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index 411feb7769..773f875f6d 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -113,7 +113,7 @@ BaseContext::TokenType constexpr ScopedMarkTokens::kUnused;
class LazyRankTable : public RankTable
{
public:
- LazyRankTable(MwmValue const & value) : m_value(value) {}
+ explicit LazyRankTable(MwmValue const & value) : m_value(value) {}
uint8_t Get(uint64_t i) const override
{
diff --git a/search/house_detector.cpp b/search/house_detector.cpp
index 8f807433c9..7bdb069bf8 100644
--- a/search/house_detector.cpp
+++ b/search/house_detector.cpp
@@ -113,7 +113,7 @@ double const HN_MAX_CONNECTION_DIST_M = 300.0;
class StreetCreator
{
public:
- StreetCreator(Street * st) : m_street(st) {}
+ explicit StreetCreator(Street * st) : m_street(st) {}
void operator () (m2::PointD const & pt) const
{
m_street->m_points.push_back(pt);
@@ -149,7 +149,8 @@ pair<double, double> GetConnectionAngleAndDistance(bool & isBeg, Street const *
class HasSecond
{
public:
- HasSecond(set<Street *> const & streets) : m_streets(streets) {}
+ explicit HasSecond(set<Street *> const & streets) : m_streets(streets) {}
+
template <typename T>
bool operator()(T const & t) const
{
@@ -163,7 +164,8 @@ private:
class HasStreet
{
public:
- HasStreet(set<Street *> const & streets) : m_streets(streets) {}
+ explicit HasStreet(set<Street *> const & streets) : m_streets(streets) {}
+
bool operator()(MergedStreet const & st) const
{
for (size_t i = 0; i < st.m_cont.size(); ++i)
@@ -189,7 +191,7 @@ struct ScoredHouse
class ResultAccumulator
{
public:
- ResultAccumulator(string const & houseNumber) : m_number(houseNumber) {}
+ explicit ResultAccumulator(string const & houseNumber) : m_number(houseNumber) {}
string const & GetFullNumber() const { return m_number.GetNumber(); }
bool UseOdd() const { return m_useOdd; }
@@ -340,7 +342,7 @@ struct HouseChain
maxHouseNumber = numeric_limits<int>::max();
}
- HouseChain(HouseProjection const * h)
+ explicit HouseChain(HouseProjection const * h)
{
minHouseNumber = maxHouseNumber = h->m_house->GetIntNumber();
Add(h);
diff --git a/search/house_detector.hpp b/search/house_detector.hpp
index 91a6415049..ab7f2052c3 100644
--- a/search/house_detector.hpp
+++ b/search/house_detector.hpp
@@ -212,7 +212,7 @@ public:
static int const DEFAULT_OFFSET_M = 200;
- HouseDetector(DataSource const & dataSource);
+ explicit HouseDetector(DataSource const & dataSource);
~HouseDetector();
int LoadStreets(std::vector<FeatureID> const & ids);
diff --git a/search/locality_finder.cpp b/search/locality_finder.cpp
index 4aefe7be4f..7b1f7f17f4 100644
--- a/search/locality_finder.cpp
+++ b/search/locality_finder.cpp
@@ -34,7 +34,7 @@ public:
class CityFilter : public Filter
{
public:
- CityFilter(RankTable const & ranks) : m_ranks(ranks) {}
+ explicit CityFilter(RankTable const & ranks) : m_ranks(ranks) {}
// Filter overrides:
bool IsGood(uint32_t id) const override { return m_ranks.Get(id) != 0; }
diff --git a/search/retrieval.cpp b/search/retrieval.cpp
index f9c24f4f56..9f65bc68af 100644
--- a/search/retrieval.cpp
+++ b/search/retrieval.cpp
@@ -73,7 +73,7 @@ private:
class EditedFeaturesHolder
{
public:
- EditedFeaturesHolder(MwmSet::MwmId const & id) : m_id(id)
+ explicit EditedFeaturesHolder(MwmSet::MwmId const & id) : m_id(id)
{
auto & editor = Editor::Instance();
m_deleted = editor.GetFeaturesByStatus(id, FeatureStatus::Deleted);
diff --git a/search/search_tests/highlighting_tests.cpp b/search/search_tests/highlighting_tests.cpp
index 49756bd9e1..22cc4b5343 100644
--- a/search/search_tests/highlighting_tests.cpp
+++ b/search/search_tests/highlighting_tests.cpp
@@ -53,7 +53,7 @@ class CheckRange
TestResultVector const & m_results;
public:
- CheckRange(TestResultVector const & results) : m_idx(0), m_results(results) {}
+ explicit CheckRange(TestResultVector const & results) : m_idx(0), m_results(results) {}
~CheckRange() { TEST_EQUAL(m_idx, m_results.size(), ()); }
diff --git a/search/search_tests/keyword_matcher_test.cpp b/search/search_tests/keyword_matcher_test.cpp
index 5beaf338c0..f655a4d929 100644
--- a/search/search_tests/keyword_matcher_test.cpp
+++ b/search/search_tests/keyword_matcher_test.cpp
@@ -62,7 +62,7 @@ class TestScore
public:
TestScore() {}
- TestScore(Score const & score) : m_score(score) {}
+ explicit TestScore(Score const & score) : m_score(score) {}
bool operator<(TestScore const & s) const
{
@@ -92,14 +92,14 @@ void TestKeywordMatcher(char const * const query, KeywordMatcherTestCase const (
{
char const * const name = testCases[i].m_name;
char const * const prevName = (i == 0 ? "N/A" : testCases[i-1].m_name);
- TestScore const testScore = matcher.CalcScore(name);
+ TestScore const testScore(matcher.CalcScore(name));
// Test that a newly created matcher returns the same result
{
KeywordMatcher freshMatcher;
InitMatcher(query, freshMatcher);
- TestScore const freshScore = freshMatcher.CalcScore(name);
+ TestScore const freshScore(freshMatcher.CalcScore(name));
// TEST_EQUAL(testScore, freshScore, (query, name));
TEST(!(testScore < freshScore), (query, name));
TEST(!(freshScore < testScore), (query, name));