diff options
Diffstat (limited to 'base')
-rw-r--r-- | base/command_line.cc | 6 | ||||
-rw-r--r-- | base/i18n/file_util_icu.cc | 2 | ||||
-rw-r--r-- | base/linux_util.cc | 2 | ||||
-rw-r--r-- | base/nix/mime_util_xdg.cc | 11 | ||||
-rw-r--r-- | base/process/process_metrics_linux.cc | 5 | ||||
-rw-r--r-- | base/strings/string_util.cc | 12 | ||||
-rw-r--r-- | base/strings/string_util.h | 22 |
7 files changed, 31 insertions, 29 deletions
diff --git a/base/command_line.cc b/base/command_line.cc index cf36cab..eb3da4b 100644 --- a/base/command_line.cc +++ b/base/command_line.cc @@ -74,7 +74,7 @@ void AppendSwitchesAndArguments(CommandLine& command_line, bool parse_switches = true; for (size_t i = 1; i < argv.size(); ++i) { CommandLine::StringType arg = argv[i]; - TrimWhitespace(arg, TRIM_ALL, &arg); + base::TrimWhitespace(arg, base::TRIM_ALL, &arg); CommandLine::StringType switch_string; CommandLine::StringType switch_value; @@ -293,7 +293,7 @@ FilePath CommandLine::GetProgram() const { } void CommandLine::SetProgram(const FilePath& program) { - TrimWhitespace(program.value(), TRIM_ALL, &argv_[0]); + base::TrimWhitespace(program.value(), base::TRIM_ALL, &argv_[0]); } bool CommandLine::HasSwitch(const std::string& switch_string) const { @@ -422,7 +422,7 @@ void CommandLine::PrependWrapper(const CommandLine::StringType& wrapper) { #if defined(OS_WIN) void CommandLine::ParseFromString(const std::wstring& command_line) { std::wstring command_line_string; - TrimWhitespace(command_line, TRIM_ALL, &command_line_string); + base::TrimWhitespace(command_line, base::TRIM_ALL, &command_line_string); if (command_line_string.empty()) return; diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc index 3864d22..e250c29 100644 --- a/base/i18n/file_util_icu.cc +++ b/base/i18n/file_util_icu.cc @@ -97,7 +97,7 @@ void ReplaceIllegalCharactersInPath(base::FilePath::StringType* file_name, DCHECK(!(IllegalCharacters::GetInstance()->contains(replace_char))); // Remove leading and trailing whitespace. - TrimWhitespace(*file_name, TRIM_ALL, file_name); + base::TrimWhitespace(*file_name, base::TRIM_ALL, file_name); IllegalCharacters* illegal = IllegalCharacters::GetInstance(); int cursor = 0; // The ICU macros expect an int. diff --git a/base/linux_util.cc b/base/linux_util.cc index f8dd2d0..1438ea2 100644 --- a/base/linux_util.cc +++ b/base/linux_util.cc @@ -176,7 +176,7 @@ std::string GetLinuxDistro() { void SetLinuxDistro(const std::string& distro) { std::string trimmed_distro; - TrimWhitespaceASCII(distro, TRIM_ALL, &trimmed_distro); + base::TrimWhitespaceASCII(distro, base::TRIM_ALL, &trimmed_distro); base::strlcpy(g_linux_distro, trimmed_distro.c_str(), kDistroSize); } diff --git a/base/nix/mime_util_xdg.cc b/base/nix/mime_util_xdg.cc index 215a4d3..51d0900 100644 --- a/base/nix/mime_util_xdg.cc +++ b/base/nix/mime_util_xdg.cc @@ -267,7 +267,7 @@ bool IconTheme::LoadIndexTheme(const FilePath& file) { break; std::string entry; - TrimWhitespaceASCII(buf, TRIM_ALL, &entry); + base::TrimWhitespaceASCII(buf, base::TRIM_ALL, &entry); if (entry.length() == 0 || entry[0] == '#') { // Blank line or Comment. continue; @@ -284,10 +284,10 @@ bool IconTheme::LoadIndexTheme(const FilePath& file) { if (r.size() < 2) continue; - TrimWhitespaceASCII(r[0], TRIM_ALL, &key); + base::TrimWhitespaceASCII(r[0], base::TRIM_ALL, &key); for (size_t i = 1; i < r.size(); i++) value.append(r[i]); - TrimWhitespaceASCII(value, TRIM_ALL, &value); + base::TrimWhitespaceASCII(value, base::TRIM_ALL, &value); if (current_info) { if (key == "Size") { @@ -366,7 +366,8 @@ bool IconTheme::SetDirectories(const std::string& dirs) { std::string::size_type pos = 0, epos; std::string dir; while ((epos = dirs.find(',', pos)) != std::string::npos) { - TrimWhitespaceASCII(dirs.substr(pos, epos - pos), TRIM_ALL, &dir); + base::TrimWhitespaceASCII(dirs.substr(pos, epos - pos), base::TRIM_ALL, + &dir); if (dir.length() == 0) { DLOG(WARNING) << "Invalid index.theme: blank subdir"; return false; @@ -374,7 +375,7 @@ bool IconTheme::SetDirectories(const std::string& dirs) { subdirs_[dir] = num++; pos = epos + 1; } - TrimWhitespaceASCII(dirs.substr(pos), TRIM_ALL, &dir); + base::TrimWhitespaceASCII(dirs.substr(pos), base::TRIM_ALL, &dir); if (dir.length() == 0) { DLOG(WARNING) << "Invalid index.theme: blank subdir"; return false; diff --git a/base/process/process_metrics_linux.cc b/base/process/process_metrics_linux.cc index f6ab819..7fa5092 100644 --- a/base/process/process_metrics_linux.cc +++ b/base/process/process_metrics_linux.cc @@ -36,7 +36,7 @@ static uint64 ReadFileToUint64(const base::FilePath file) { std::string file_as_string; if (!ReadFileToString(file, &file_as_string)) return 0; - TrimWhitespaceASCII(file_as_string, TRIM_ALL, &file_as_string); + base::TrimWhitespaceASCII(file_as_string, base::TRIM_ALL, &file_as_string); uint64 file_as_uint64 = 0; if (!base::StringToUint64(file_as_string, &file_as_uint64)) return 0; @@ -71,7 +71,8 @@ size_t ReadProcStatusAndGetFieldAsSizeT(pid_t pid, const std::string& field) { std::string value_str; tokenizer.token_piece().CopyToString(&value_str); std::string value_str_trimmed; - TrimWhitespaceASCII(value_str, TRIM_ALL, &value_str_trimmed); + base::TrimWhitespaceASCII(value_str, base::TRIM_ALL, + &value_str_trimmed); std::vector<std::string> split_value_str; SplitString(value_str_trimmed, ' ', &split_value_str); if (split_value_str.size() != 2 || split_value_str[1] != "kB") { diff --git a/base/strings/string_util.cc b/base/strings/string_util.cc index 4b102c5..c2e0e8a 100644 --- a/base/strings/string_util.cc +++ b/base/strings/string_util.cc @@ -242,18 +242,16 @@ void TruncateUTF8ToByteSize(const std::string& input, output->clear(); } -} // namespace base - -TrimPositions TrimWhitespace(const base::string16& input, +TrimPositions TrimWhitespace(const string16& input, TrimPositions positions, - base::string16* output) { - return base::TrimStringT(input, base::kWhitespaceUTF16, positions, output); + string16* output) { + return TrimStringT(input, kWhitespaceUTF16, positions, output); } TrimPositions TrimWhitespaceASCII(const std::string& input, TrimPositions positions, std::string* output) { - return base::TrimStringT(input, base::kWhitespaceASCII, positions, output); + return TrimStringT(input, kWhitespaceASCII, positions, output); } // This function is only for backward-compatibility. @@ -264,6 +262,8 @@ TrimPositions TrimWhitespace(const std::string& input, return TrimWhitespaceASCII(input, positions, output); } +} // namespace base + template<typename STR> STR CollapseWhitespaceT(const STR& text, bool trim_sequences_with_line_breaks) { diff --git a/base/strings/string_util.h b/base/strings/string_util.h index 7b4b219..35805da 100644 --- a/base/strings/string_util.h +++ b/base/strings/string_util.h @@ -188,16 +188,6 @@ BASE_EXPORT void TruncateUTF8ToByteSize(const std::string& input, const size_t byte_size, std::string* output); -} // namespace base - -#if defined(OS_WIN) -#include "base/strings/string_util_win.h" -#elif defined(OS_POSIX) -#include "base/strings/string_util_posix.h" -#else -#error Define string operations appropriately for your platform -#endif - // Trims any whitespace from either end of the input string. Returns where // whitespace was found. // The non-wide version has two functions: @@ -211,7 +201,7 @@ enum TrimPositions { TRIM_TRAILING = 1 << 1, TRIM_ALL = TRIM_LEADING | TRIM_TRAILING, }; -BASE_EXPORT TrimPositions TrimWhitespace(const base::string16& input, +BASE_EXPORT TrimPositions TrimWhitespace(const string16& input, TrimPositions positions, base::string16* output); BASE_EXPORT TrimPositions TrimWhitespaceASCII(const std::string& input, @@ -224,6 +214,16 @@ BASE_EXPORT TrimPositions TrimWhitespace(const std::string& input, TrimPositions positions, std::string* output); +} // namespace base + +#if defined(OS_WIN) +#include "base/strings/string_util_win.h" +#elif defined(OS_POSIX) +#include "base/strings/string_util_posix.h" +#else +#error Define string operations appropriately for your platform +#endif + // Searches for CR or LF characters. Removes all contiguous whitespace // strings that contain them. This is useful when trying to deal with text // copied from terminals. |