History

Server side entity script messages

ksuprynowicz committed 2 years ago

Commit dfbc1d81 parent 274867b11 files · +252 −75Browse files

Showing the changes to libraries/script-engine/src/ScriptMessage.cpp (1 of 11 files). Show all

Unified · Split

libraries/script-engine/src/ScriptMessage.cpp+3−0
@@ -18,6 +18,7 @@ QJsonObject ScriptMessage::toJson() { · 17 unmodified lines
18 object["message"] = _messageContent;18 object["message"] = _messageContent;
19 object["lineNumber"] = _lineNumber;19 object["lineNumber"] = _lineNumber;
20 object["fileName"] = _fileName;20 object["fileName"] = _fileName;
21 object["entityID"] = _entityID.toString();
21 object["type"] = static_cast<int>(_scriptType);22 object["type"] = static_cast<int>(_scriptType);
22 object["severity"] = static_cast<int>(_severity);23 object["severity"] = static_cast<int>(_severity);
23 return object;24 return object;
@@ -27,6 +28,7 @@ bool ScriptMessage::fromJson(const QJsonObject &object) { · 3 unmodified lines
27 if (!object["message"].isString()28 if (!object["message"].isString()
28 || !object["lineNumber"].isDouble()29 || !object["lineNumber"].isDouble()
29 || !object["fileName"].isString()30 || !object["fileName"].isString()
31 || !object["entityID"].isString()
30 || !object["type"].isDouble()32 || !object["type"].isDouble()
31 || !object["severity"].isDouble()) {33 || !object["severity"].isDouble()) {
32 qDebug() << "ScriptMessage::fromJson failed to find required fields in JSON file";34 qDebug() << "ScriptMessage::fromJson failed to find required fields in JSON file";
@@ -35,6 +37,7 @@ bool ScriptMessage::fromJson(const QJsonObject &object) { · 2 unmodified lines
35 _messageContent = object["message"].toString();37 _messageContent = object["message"].toString();
36 _lineNumber = object["lineNumber"].toInt();38 _lineNumber = object["lineNumber"].toInt();
37 _fileName = object["fileName"].toInt();39 _fileName = object["fileName"].toInt();
40 _entityID = QUuid::fromString(object["entityID"].toString());
38 _scriptType = static_cast<ScriptMessage::ScriptType>(object["type"].toInt());41 _scriptType = static_cast<ScriptMessage::ScriptType>(object["type"].toInt());
39 _severity = static_cast<ScriptMessage::Severity>(object["severity"].toInt());42 _severity = static_cast<ScriptMessage::Severity>(object["severity"].toInt());
40}43}