diff options
Diffstat (limited to 'src/util/enriched_string.cpp')
| -rw-r--r-- | src/util/enriched_string.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/util/enriched_string.cpp b/src/util/enriched_string.cpp index 05d7b8c25..f79e77d5a 100644 --- a/src/util/enriched_string.cpp +++ b/src/util/enriched_string.cpp @@ -97,7 +97,6 @@ void EnrichedString::addAtEnd(const std::wstring &s, const SColor &initial_color parseColorString(wide_to_utf8(parts[1]), m_background, true); m_has_background = true; } - continue; } } @@ -111,7 +110,7 @@ void EnrichedString::addCharNoColor(wchar_t c) { m_string += c; if (m_colors.empty()) { - m_colors.push_back(SColor(255, 255, 255, 255)); + m_colors.emplace_back(255, 255, 255, 255); } else { m_colors.push_back(m_colors[m_colors.size() - 1]); } @@ -138,15 +137,16 @@ EnrichedString EnrichedString::substr(size_t pos, size_t len) const } if (len == std::string::npos || pos + len > m_string.length()) { return EnrichedString( - m_string.substr(pos, std::string::npos), - std::vector<SColor>(m_colors.begin() + pos, m_colors.end()) - ); - } else { - return EnrichedString( - m_string.substr(pos, len), - std::vector<SColor>(m_colors.begin() + pos, m_colors.begin() + pos + len) - ); + m_string.substr(pos, std::string::npos), + std::vector<SColor>(m_colors.begin() + pos, m_colors.end()) + ); } + + return EnrichedString( + m_string.substr(pos, len), + std::vector<SColor>(m_colors.begin() + pos, m_colors.begin() + pos + len) + ); + } const wchar_t *EnrichedString::c_str() const |