diff -r 20ca0a6be175 -r 9b6a0daedfc0 sources/network/rconsession.cpp --- a/sources/network/rconsession.cpp Wed Jan 27 14:04:53 2021 +0200 +++ b/sources/network/rconsession.cpp Wed Jan 27 14:05:39 2021 +0200 @@ -157,7 +157,7 @@ case SVRC_MESSAGE: { - String message = stream.readString(); + std::string message = stream.readString(); normalize(message); m_interface->printText("%s\n", message.data()); } @@ -177,7 +177,7 @@ for (int i = stream.readByte(); i > 0; --i) { - String message = stream.readString(); + std::string message = stream.readString(); normalize(message); m_interface->printText("--- %s\n", message.data()); } @@ -199,10 +199,10 @@ case SVRC_TABCOMPLETE: { - StringList completes; + std::vector completes; completes.resize(stream.readByte()); - for (String& completion : completes) + for (std::string& completion : completes) completion = stream.readString(); if (completes.size() == 1) @@ -216,7 +216,7 @@ for (int i : range(0, static_cast(completes.size()), 8)) { const int end = min(i + 8, static_cast(completes.size())); - StringList splices = splice(completes, i, end); + std::vector splices = splice(completes, i, end); m_interface->print("- %s\n", join_string_list(splices, ", ").data()); } } @@ -241,7 +241,7 @@ { case SVRCU_PLAYERDATA: { - StringList players; + std::vector players; for (int i = packet.readByte(); i > 0; --i) players.push_back(packet.readString()); @@ -297,7 +297,7 @@ // ------------------------------------------------------------------------------------------------- // -void RCONSession::setPassword(const String& password) +void RCONSession::setPassword(const std::string& password) { m_password = password; } @@ -321,7 +321,7 @@ // ------------------------------------------------------------------------------------------------- // Returns true if the message was successfully sent. // -bool RCONSession::sendCommand(const String& commandString) +bool RCONSession::sendCommand(const std::string& commandString) { if (m_state != RCON_CONNECTED or commandString.empty()) return false; @@ -358,14 +358,14 @@ // ------------------------------------------------------------------------------------------------- // -const String& RCONSession::getLevel() const +const std::string& RCONSession::getLevel() const { return m_level; } // ------------------------------------------------------------------------------------------------- // -void RCONSession::requestTabCompletion(const String& part) +void RCONSession::requestTabCompletion(const std::string& part) { if (m_serverProtocol >= 4) {