Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

add m_ prefix to class members

Browse Source 
Signed-off-by: iTrooz <hey@itrooz.fr>
This commit is contained in:
iTrooz
2024-11-29 14:14:24 +01:00
parent 4aaf7b9b09
commit 1477d64400
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
launcher/ui/pages/instance/McClient.cpp
View File

@ -13,19 +13,19 @@
// last bit
#define CONTINUE_BIT 0x80
McClient::McClient(QObject *parent, QString domain, QString ip, short port): QObject(parent), domain(domain), ip(ip), port(port) {}
McClient::McClient(QObject *parent, QString domain, QString ip, short port): QObject(parent), m_domain(domain), m_ip(ip), m_port(port) {}
QJsonObject McClient::getStatusDataBlocking() {
qDebug() << "Connecting to socket..";
socket.connectToHost(ip, port);
m_socket.connectToHost(m_ip, m_port);
if (!socket.waitForConnected()) {
if (!m_socket.waitForConnected()) {
throw Exception("Failed to connect to socket");
}
qDebug() << "Connected to socket successfully";
sendRequest();
if (!socket.waitForReadyRead()) {
if (!m_socket.waitForReadyRead()) {
throw Exception("Socket didn't send anything to read");
}
return readResponse();
@ -48,9 +48,9 @@ void McClient::sendRequest() {
QByteArray data;
writeVarInt(data, 0x00); // packet ID
writeVarInt(data, 0x760); // protocol version
writeVarInt(data, domain.size()); // server address length
writeString(data, domain.toStdString()); // server address
writeFixedInt(data, port, 2); // server port
writeVarInt(data, m_domain.size()); // server address length
writeString(data, m_domain.toStdString()); // server address
writeFixedInt(data, m_port, 2); // server port
writeVarInt(data, 0x01); // next state
writePacketToSocket(data); // send handshake packet
@ -61,18 +61,18 @@ void McClient::sendRequest() {
void McClient::readBytesExactFromSocket(QByteArray &resp, int bytesToRead) {
while (bytesToRead > 0) {
qDebug() << bytesToRead << " bytes left to read";
if (!socket.waitForReadyRead()) {
if (!m_socket.waitForReadyRead()) {
throw Exception("Read timeout or error");
}
QByteArray chunk = socket.read(bytesToRead);
QByteArray chunk = m_socket.read(bytesToRead);
resp.append(chunk);
bytesToRead -= chunk.size();
}
}
QJsonObject McClient::readResponse() {
auto resp = socket.readAll();
auto resp = m_socket.readAll();
int length = readVarInt(resp);
// finish ready response
@ -159,8 +159,8 @@ void McClient::writePacketToSocket(QByteArray &data) {
dataWithSize.append(data);
// write it to the socket
socket.write(dataWithSize);
socket.flush();
m_socket.write(dataWithSize);
m_socket.flush();
data.clear();
}