diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/util/enriched_string.cpp | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/util/enriched_string.cpp')
| -rw-r--r-- | src/util/enriched_string.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/util/enriched_string.cpp b/src/util/enriched_string.cpp index 762d094eb..133c5930f 100644 --- a/src/util/enriched_string.cpp +++ b/src/util/enriched_string.cpp @@ -29,8 +29,8 @@ EnrichedString::EnrichedString() clear(); } -EnrichedString::EnrichedString(const std::wstring &string, - const std::vector<SColor> &colors) +EnrichedString::EnrichedString( + const std::wstring &string, const std::vector<SColor> &colors) { clear(); m_string = string; @@ -68,8 +68,8 @@ void EnrichedString::operator=(const wchar_t *str) void EnrichedString::addAtEnd(const std::wstring &s, const SColor &initial_color) { SColor color(initial_color); - bool use_default = (m_default_length == m_string.size() && - color == m_default_color); + bool use_default = + (m_default_length == m_string.size() && color == m_default_color); size_t i = 0; while (i < s.length()) { @@ -171,10 +171,9 @@ EnrichedString EnrichedString::substr(size_t pos, size_t len) const if (len == std::string::npos || pos + len > m_string.length()) len = m_string.length() - pos; - EnrichedString str( - m_string.substr(pos, len), - std::vector<SColor>(m_colors.begin() + pos, m_colors.begin() + pos + len) - ); + EnrichedString str(m_string.substr(pos, len), + std::vector<SColor>(m_colors.begin() + pos, + m_colors.begin() + pos + len)); str.m_has_background = m_has_background; str.m_background = m_background; |