forked from organicmaps/organicmaps
Add strings::Trim.
This commit is contained in:
parent
f8679434b8
commit
339f1a2919
3 changed files with 10 additions and 3 deletions
|
@ -4,6 +4,9 @@
|
|||
#include "../std/target_os.hpp"
|
||||
#include "../std/iterator.hpp"
|
||||
|
||||
#include <boost/algorithm/string.hpp> // boost::trim
|
||||
|
||||
|
||||
namespace strings
|
||||
{
|
||||
|
||||
|
@ -120,6 +123,11 @@ void AsciiToLower(string & s)
|
|||
transform(s.begin(), s.end(), s.begin(), &ascii_to_lower);
|
||||
}
|
||||
|
||||
void Trim(string & s)
|
||||
{
|
||||
boost::trim(s);
|
||||
}
|
||||
|
||||
bool EqualNoCase(string const & s1, string const & s2)
|
||||
{
|
||||
return MakeLowerCase(s1) == MakeLowerCase(s2);
|
||||
|
|
|
@ -32,6 +32,7 @@ UniString Normalize(UniString const & s);
|
|||
void Normalize(UniString & s);
|
||||
|
||||
void AsciiToLower(string & s);
|
||||
void Trim(string & s);
|
||||
|
||||
void MakeLowerCase(string & s);
|
||||
string MakeLowerCase(string const & s);
|
||||
|
|
|
@ -9,8 +9,6 @@
|
|||
|
||||
#include "../std/algorithm.hpp"
|
||||
|
||||
#include <boost/algorithm/string.hpp> // boost::trim
|
||||
|
||||
|
||||
void BookmarkCategory::AddBookmark(Bookmark const & bm)
|
||||
{
|
||||
|
@ -143,7 +141,7 @@ namespace
|
|||
|
||||
void CharData(string value)
|
||||
{
|
||||
boost::trim(value);
|
||||
strings::Trim(value);
|
||||
|
||||
if (!value.empty())
|
||||
switch (m_level)
|
||||
|
|
Loading…
Add table
Reference in a new issue