From 1c1c97cbd1d7913ac12bf550ec02c97f843a0fd3 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Sun, 20 Aug 2017 13:30:50 +0200 Subject: Modernize source code: last part (#6285) * Modernize source code: last par * Use empty when needed * Use emplace_back instead of push_back when needed * For range-based loops * Initializers fixes * constructors, destructors default * c++ C stl includes --- src/terminal_chat_console.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/terminal_chat_console.cpp') diff --git a/src/terminal_chat_console.cpp b/src/terminal_chat_console.cpp index 222c08646..9e3d33736 100644 --- a/src/terminal_chat_console.cpp +++ b/src/terminal_chat_console.cpp @@ -348,7 +348,8 @@ void TerminalChatConsole::step(int ch) std::wstring error_message = utf8_to_wide(Logger::getLevelLabel(p.first)); if (!g_settings->getBool("disable_escape_sequences")) { - error_message = L"\x1b(c@red)" + error_message + L"\x1b(c@white)"; + error_message = std::wstring(L"\x1b(c@red)").append(error_message) + .append(L"\x1b(c@white)"); } m_chat_backend.addMessage(error_message, utf8_to_wide(p.second)); } @@ -439,8 +440,7 @@ void TerminalChatConsole::draw_text() const ChatFormattedLine& line = buf.getFormattedLine(row); if (line.fragments.empty()) continue; - for (u32 i = 0; i < line.fragments.size(); ++i) { - const ChatFormattedFragment& fragment = line.fragments[i]; + for (const ChatFormattedFragment &fragment : line.fragments) { addstr(wide_to_utf8(fragment.text.getString()).c_str()); } } -- cgit v1.2.3