diff options
| author | windrammer <31085911+likeawindrammer@users.noreply.github.com> | 2019-07-22 18:21:27 -0600 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2019-07-22 21:39:37 -0500 |
| commit | 2dbd0c148224bfb7bdd7538136df917e7d1f3a6a (patch) | |
| tree | 975322d9d04c753b633ee31932fefdeb8640e042 /src | |
| parent | 16947224a2ced1d1a8767996388feb9ad2a46ebd (diff) | |
Remove C style char buffer in favor of QByteArray
Diffstat (limited to 'src')
| -rw-r--r-- | src/networkmanager.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp index 5b16db40..a9810d49 100644 --- a/src/networkmanager.cpp +++ b/src/networkmanager.cpp @@ -78,11 +78,8 @@ void NetworkManager::ship_server_packet(QString p_packet) void NetworkManager::handle_ms_packet() { - char buffer[BUFFER_MAX_SIZE]; - std::memset(buffer, 0, BUFFER_MAX_SIZE); - ms_socket->read(buffer, BUFFER_MAX_SIZE); - - QString in_data = buffer; + QByteArray buffer = ms_socket->readAll(); + QString in_data = QString::fromUtf8(buffer, buffer.size()); if (!in_data.endsWith("%")) { @@ -219,11 +216,8 @@ void NetworkManager::retry_ms_connect() void NetworkManager::handle_server_packet() { - char buffer[BUFFER_MAX_SIZE]; - std::memset(buffer, 0, BUFFER_MAX_SIZE); - server_socket->read(buffer, BUFFER_MAX_SIZE); - - QString in_data = buffer; + QByteArray buffer = server_socket->readAll(); + QString in_data = QString::fromUtf8(buffer, buffer.size()); if (!in_data.endsWith("%")) { @@ -251,4 +245,3 @@ void NetworkManager::handle_server_packet() ao_app->server_packet_received(f_packet); } } - |
