From 4a8d2270c087aef94fbd0b7d19df6dec05441edf Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Wed, 9 Jan 2013 15:29:45 +0200 Subject: merged with miranda_ng main repo --- utilities.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'utilities.cpp') diff --git a/utilities.cpp b/utilities.cpp index 2bf86af..d23853f 100755 --- a/utilities.cpp +++ b/utilities.cpp @@ -1928,30 +1928,24 @@ INT_PTR ImportGpGKeys(WPARAM w, LPARAM l) void fix_line_term(std::string &s) { - for(std::string::size_type s1 = s.find("\r\r", 0); s1 != string::npos; s1 = s.find("\r\r", s1)) - s.erase(s1, 1); + boost::algorithm::erase_all(s, "\r\r"); } void fix_line_term(std::wstring &s) { - for(std::wstring::size_type s1 = s.find(_T("\r\r"), 0); s1 != wstring::npos; s1 = s.find(_T("\r\r"), s1)) - s.erase(s1, 1); + boost::algorithm::erase_all(s, _T("\r\r")); } void strip_line_term(std::wstring &s) { - for(std::wstring::size_type i = s.find(_T("\r")); i != std::wstring::npos; i = s.find(_T("\r"), i+1)) - s.erase(i, 1); - for(std::wstring::size_type i = s.find(_T("\n")); i != std::wstring::npos; i = s.find(_T("\n"), i+1)) - s.erase(i, 1); + boost::algorithm::erase_all(s, _T("\r")); + boost::algorithm::erase_all(s, _T("\n")); } void strip_line_term(std::string &s) { - for(std::string::size_type i = s.find("\r"); i != std::string::npos; i = s.find("\r", i+1)) - s.erase(i, 1); - for(std::string::size_type i = s.find("\n"); i != std::string::npos; i = s.find("\n", i+1)) - s.erase(i, 1); + boost::algorithm::erase_all(s, "\r"); + boost::algorithm::erase_all(s, "\n"); } void strip_tags(std::wstring &str) -- cgit v1.2.3