diff -r d9073c13dc98 -r 37db42ad451a sources/interface.cpp --- a/sources/interface.cpp Wed Jul 20 15:03:37 2016 +0300 +++ b/sources/interface.cpp Wed Jul 20 17:56:40 2016 +0300 @@ -513,7 +513,7 @@ break; } - if (not text.is_empty()) + if (not text.isEmpty()) text += " | "; text += "Ctrl+N to connect, Ctrl+Q to "; @@ -717,7 +717,7 @@ case '\b': if (m_cursorPosition > 0) { - getEditableInput().remove_at(--m_cursorPosition); + getEditableInput().removeAt(--m_cursorPosition); m_needInputRender = true; } break; @@ -726,7 +726,7 @@ case 'D' - 'A' + 1: // readline ^D if (m_cursorPosition < getCurrentInput().length()) { - getEditableInput().remove_at(m_cursorPosition); + getEditableInput().removeAt(m_cursorPosition); m_needInputRender = true; } break; @@ -758,7 +758,7 @@ break; case 'Y' - 'A' + 1: // readline ^Y - paste previously deleted text - if (not m_pasteBuffer.is_empty()) + if (not m_pasteBuffer.isEmpty()) { getEditableInput().insert(m_cursorPosition, m_pasteBuffer); m_cursorPosition += m_pasteBuffer.length(); @@ -806,7 +806,7 @@ break; case INPUTSTATE_PASSWORD: - if (m_inputState == INPUTSTATE_PASSWORD and not getCurrentInput().is_empty()) + if (m_inputState == INPUTSTATE_PASSWORD and not getCurrentInput().isEmpty()) { m_session.disconnect(); m_session.set_password(getCurrentInput()); @@ -976,14 +976,14 @@ strftime(timestamp, sizeof timestamp, "[%H:%M:%S] ", localtime(&now)); for (char ch : String(timestamp)) - m_outputLines.last().add_char(ch); + m_outputLines.last().addChar(ch); } // Remove some lines if there's too many of them. 20,000 should be enough, I hope. while (m_outputLines.size() > 20000) m_outputLines.remove_at(0); - m_outputLines.last().add_char(ch); + m_outputLines.last().addChar(ch); } m_needOutputRender = true; @@ -1020,7 +1020,7 @@ for (const String& name : names) { ColoredLine coloredname; - coloredname.add_string(name); + coloredname.addString(name); coloredname.finalize(); m_playerNames.append(coloredname); } @@ -1034,7 +1034,7 @@ { String& input = getEditableInput(); - if (input.starts_with(part)) + if (input.startsWith(part)) { if (input[part.length()] != ' ') complete += ' '; @@ -1053,7 +1053,7 @@ return; StringList args = input.right(input.length() - 1).split(" "); - String command = args[0].to_lowercase(); + String command = args[0].toLowerCase(); args.remove_at(0); if (command == "connect")