Use snake_case
This commit is contained in:
parent
51943a5123
commit
e0eba95ff4
@ -86,8 +86,8 @@ std::string Page::str() const {
|
||||
while (std::getline(stream, line))
|
||||
ret += line + "\n";
|
||||
|
||||
string_utils::limitConsecutiveWhitespace(ret, MAX_WHITESPACE);
|
||||
string_utils::removeTrailingWhitespace(ret);
|
||||
string_utils::limit_consecutive_whitespace(ret, MAX_WHITESPACE);
|
||||
string_utils::remove_trailing_whitespace(ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -14,28 +14,28 @@
|
||||
|
||||
|
||||
namespace string_utils {
|
||||
bool isAllWhitespace(const std::string &str) {
|
||||
bool is_all_whitespace(const std::string &str) {
|
||||
return std::ranges::all_of(str, [](const unsigned char c) -> bool {
|
||||
return std::isspace(c);
|
||||
});
|
||||
}
|
||||
|
||||
void removeTrailingWhitespace(std::string &str) {
|
||||
void remove_trailing_whitespace(std::string &str) {
|
||||
auto shouldRemoveTrailingWhitespace = [&str]() -> bool {
|
||||
std::size_t last_newline = str.find_last_of('\n');
|
||||
|
||||
if (last_newline == std::string::npos)
|
||||
return isAllWhitespace(str);
|
||||
return is_all_whitespace(str);
|
||||
|
||||
const std::string last_line = str.substr(last_newline + 1);
|
||||
return isAllWhitespace(last_line);
|
||||
return is_all_whitespace(last_line);
|
||||
};
|
||||
|
||||
while (shouldRemoveTrailingWhitespace()) {
|
||||
const std::size_t last_newline = str.find_last_of('\n');
|
||||
|
||||
if (last_newline == std::string::npos) {
|
||||
if (isAllWhitespace(str))
|
||||
if (is_all_whitespace(str))
|
||||
str.clear();
|
||||
break;
|
||||
}
|
||||
@ -44,11 +44,11 @@ namespace string_utils {
|
||||
}
|
||||
}
|
||||
|
||||
void removeTabs(std::string &str) {
|
||||
void remove_tabs(std::string &str) {
|
||||
std::erase(str, '\t');
|
||||
}
|
||||
|
||||
void limitConsecutiveWhitespace(std::string &str, const uint_fast8_t maxWhitespace) {
|
||||
void limit_consecutive_whitespace(std::string &str, const uint_fast8_t maxWhitespace) {
|
||||
std::istringstream stream(str);
|
||||
std::string line;
|
||||
std::ostringstream processedStream;
|
||||
@ -57,7 +57,7 @@ namespace string_utils {
|
||||
bool hasAddedRealTextJet = false;
|
||||
|
||||
while (std::getline(stream, line)) {
|
||||
const bool onlySpace = isAllWhitespace(line);
|
||||
const bool onlySpace = is_all_whitespace(line);
|
||||
|
||||
if (!hasAddedRealTextJet) {
|
||||
if (onlySpace)
|
||||
|
@ -23,7 +23,7 @@ namespace string_utils {
|
||||
* @return true If all characters in the string are whitespace.
|
||||
* @return false Otherwise.
|
||||
*/
|
||||
bool isAllWhitespace(const std::string& str);
|
||||
bool is_all_whitespace(const std::string& str);
|
||||
|
||||
/**
|
||||
* @brief Removes trailing whitespace lines from the given string.
|
||||
@ -33,14 +33,14 @@ namespace string_utils {
|
||||
*
|
||||
* @param str The string from which to remove trailing whitespace lines.
|
||||
*/
|
||||
void removeTrailingWhitespace(std::string& str);
|
||||
void remove_trailing_whitespace(std::string& str);
|
||||
|
||||
/**
|
||||
* @brief Removes all tab characters from the given string.
|
||||
*
|
||||
* @param str The string from which to remove tab characters.
|
||||
*/
|
||||
void removeTabs(std::string& str);
|
||||
void remove_tabs(std::string& str);
|
||||
|
||||
/**
|
||||
* @brief Limits the number of consecutive whitespace lines in the given string.
|
||||
@ -51,6 +51,6 @@ namespace string_utils {
|
||||
* @param str The string to process.
|
||||
* @param maxWhitespace The maximum allowed consecutive whitespace lines.
|
||||
*/
|
||||
void limitConsecutiveWhitespace(std::string& str, uint_fast8_t maxWhitespace);
|
||||
void limit_consecutive_whitespace(std::string& str, uint_fast8_t maxWhitespace);
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user