Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove C style char buffer in favor of QByteArray

Browse Source
This commit is contained in:
windrammer 2019-07-22 18:21:27 -06:00 committed by oldmud0
parent 16947224a2
commit 2dbd0c1482
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/networkmanager.h
View File

@ -50,9 +50,6 @@ public:
// in seconds // in seconds
const int ms_reconnect_delay = 7; const int ms_reconnect_delay = 7;
// kind of arbitrary max buffer size
#define BUFFER_MAX_SIZE 16384
bool ms_partial_packet = false; bool ms_partial_packet = false;
QString ms_temp_packet = ""; QString ms_temp_packet = "";

15
src/networkmanager.cpp
View File

@ -78,11 +78,8 @@ void NetworkManager::ship_server_packet(QString p_packet)
void NetworkManager::handle_ms_packet() void NetworkManager::handle_ms_packet()
{ {
char buffer[BUFFER_MAX_SIZE]; QByteArray buffer = ms_socket->readAll();
std::memset(buffer, 0, BUFFER_MAX_SIZE); QString in_data = QString::fromUtf8(buffer, buffer.size());
ms_socket->read(buffer, BUFFER_MAX_SIZE);
QString in_data = buffer;
if (!in_data.endsWith("%")) if (!in_data.endsWith("%"))
{ {
@ -219,11 +216,8 @@ void NetworkManager::retry_ms_connect()
void NetworkManager::handle_server_packet() void NetworkManager::handle_server_packet()
{ {
char buffer[BUFFER_MAX_SIZE]; QByteArray buffer = server_socket->readAll();
std::memset(buffer, 0, BUFFER_MAX_SIZE); QString in_data = QString::fromUtf8(buffer, buffer.size());
server_socket->read(buffer, BUFFER_MAX_SIZE);
QString in_data = buffer;
if (!in_data.endsWith("%")) if (!in_data.endsWith("%"))
{ {
@ -251,4 +245,3 @@ void NetworkManager::handle_server_packet()
ao_app->server_packet_received(f_packet); ao_app->server_packet_received(f_packet);
} }
} }