mirror of
https://github.com/86Box/86Box.git
synced 2026-02-23 18:08:20 -07:00
clang-format in src/qt
This commit is contained in:
@@ -23,10 +23,10 @@ extern "C" {
|
||||
#include "86box/config.h"
|
||||
}
|
||||
|
||||
VMManagerClientSocket::VMManagerClientSocket(QObject* obj) : server_connected(false)
|
||||
VMManagerClientSocket::VMManagerClientSocket(QObject *obj)
|
||||
: server_connected(false)
|
||||
{
|
||||
socket = new QLocalSocket;
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
@@ -44,7 +44,7 @@ VMManagerClientSocket::dataReady()
|
||||
if (stream.commitTransaction()) {
|
||||
// first try to successfully read some data
|
||||
// need to also make sure it's valid json
|
||||
QJsonParseError parse_error{};
|
||||
QJsonParseError parse_error {};
|
||||
// try to create a document with the data received
|
||||
const QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData, &parse_error);
|
||||
if (parse_error.error == QJsonParseError::NoError) {
|
||||
@@ -63,7 +63,6 @@ VMManagerClientSocket::dataReady()
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
bool
|
||||
@@ -77,7 +76,7 @@ VMManagerClientSocket::IPCConnect(const QString &server)
|
||||
|
||||
socket->connectToServer(server_name);
|
||||
|
||||
if(!socket->isValid()) {
|
||||
if (!socket->isValid()) {
|
||||
qInfo("Could not connect to server: %s", qPrintable(socket->errorString()));
|
||||
return false;
|
||||
}
|
||||
@@ -123,13 +122,13 @@ VMManagerClientSocket::sendMessageFull(const VMManagerProtocol::ClientMessage pr
|
||||
{
|
||||
QDataStream clientStream(socket);
|
||||
clientStream.setVersion(QDataStream::Qt_5_7);
|
||||
auto packet = new VMManagerProtocol(VMManagerProtocol::Sender::Client);
|
||||
auto packet = new VMManagerProtocol(VMManagerProtocol::Sender::Client);
|
||||
auto jsonMessage = packet->protocolClientMessage(protocol_message);
|
||||
if (!list.isEmpty()) {
|
||||
jsonMessage["list"] = QJsonArray::fromStringList(list);
|
||||
}
|
||||
// TODO: Add the logic for including objects
|
||||
if(!json.isEmpty()) {
|
||||
if (!json.isEmpty()) {
|
||||
jsonMessage["params"] = json;
|
||||
}
|
||||
clientStream << QJsonDocument(jsonMessage).toJson(QJsonDocument::Compact);
|
||||
@@ -228,7 +227,7 @@ VMManagerClientSocket::eventFilter(QObject *obj, QEvent *event)
|
||||
window_blocked = true;
|
||||
} else if (event->type() == QEvent::WindowUnblocked) {
|
||||
window_blocked = false;
|
||||
running_state = dopause ? VMManagerProtocol::RunningState::Paused : VMManagerProtocol::RunningState::Running;
|
||||
running_state = dopause ? VMManagerProtocol::RunningState::Paused : VMManagerProtocol::RunningState::Running;
|
||||
clientRunningStateChanged(running_state);
|
||||
}
|
||||
}
|
||||
@@ -248,7 +247,8 @@ VMManagerClientSocket::clientRunningStateChanged(VMManagerProtocol::RunningState
|
||||
{
|
||||
QJsonObject extra_object;
|
||||
if ((state == VMManagerProtocol::RunningState::Paused
|
||||
|| state == VMManagerProtocol::RunningState::Running) && window_blocked) {
|
||||
|| state == VMManagerProtocol::RunningState::Running)
|
||||
&& window_blocked) {
|
||||
state = (state == VMManagerProtocol::RunningState::Paused) ? VMManagerProtocol::RunningState::PausedWaiting : VMManagerProtocol::RunningState::RunningWaiting;
|
||||
}
|
||||
extra_object["status"] = static_cast<int>(state);
|
||||
|
||||
Reference in New Issue
Block a user