jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-09 17:44:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename fields

Browse source
This commit is contained in:
RickyRister 2026-01-05 01:38:01 -08:00 • committed by Lukas Brübach
parent 001ed0d7d9
commit 0922d75d1e
4 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

68
cockatrice/src/interface/recording.cpp
View file

@ -6,32 +6,32 @@
XMLEventObserver::XMLEventObserver(QObject *p) : pqEventObserver(p) XMLEventObserver::XMLEventObserver(QObject *p) : pqEventObserver(p)
{ {
XMLStream = nullptr; xmlStream = nullptr;
} }
XMLEventObserver::~XMLEventObserver() XMLEventObserver::~XMLEventObserver()
{ {
delete XMLStream; delete xmlStream;
} }
void XMLEventObserver::setStream(QTextStream *stream) void XMLEventObserver::setStream(QTextStream *stream)
{ {
if (XMLStream) { if (xmlStream) {
XMLStream->writeEndElement(); xmlStream->writeEndElement();
XMLStream->writeEndDocument(); xmlStream->writeEndDocument();
delete XMLStream; delete xmlStream;
XMLStream = nullptr; xmlStream = nullptr;
} }
if (Stream) { if (Stream) {
*Stream << XMLString; *Stream << xmlString;
} }
XMLString = QString(); xmlString = QString();
pqEventObserver::setStream(stream); pqEventObserver::setStream(stream);
if (Stream) { if (Stream) {
XMLStream = new QXmlStreamWriter(&XMLString); xmlStream = new QXmlStreamWriter(&xmlString);
XMLStream->setAutoFormatting(true); xmlStream->setAutoFormatting(true);
XMLStream->writeStartDocument(); xmlStream->writeStartDocument();
XMLStream->writeStartElement("events"); xmlStream->writeStartElement("events");
} }
} }
@ -40,34 +40,34 @@ void XMLEventObserver::onRecordEvent(const QString &widget,
const QString &arguments, const QString &arguments,
const int &eventType) const int &eventType)
{ {
if (XMLStream) { if (xmlStream) {
XMLStream->writeStartElement("event"); xmlStream->writeStartElement("event");
XMLStream->writeAttribute("widget", widget); xmlStream->writeAttribute("widget", widget);
if (eventType == pqEventTypes::ACTION_EVENT) { if (eventType == pqEventTypes::ACTION_EVENT) {
XMLStream->writeAttribute("command", command); xmlStream->writeAttribute("command", command);
} else // if(eventType == pqEventTypes::CHECK_EVENT) } else // if(eventType == pqEventTypes::CHECK_EVENT)
{ {
XMLStream->writeAttribute("property", command); xmlStream->writeAttribute("property", command);
} }
XMLStream->writeAttribute("arguments", arguments); xmlStream->writeAttribute("arguments", arguments);
XMLStream->writeEndElement(); xmlStream->writeEndElement();
} }
} }
XMLEventSource::XMLEventSource(QObject *p) : pqEventSource(p) XMLEventSource::XMLEventSource(QObject *p) : pqEventSource(p)
{ {
XMLStream = nullptr; xmlStream = nullptr;
} }
XMLEventSource::~XMLEventSource() XMLEventSource::~XMLEventSource()
{ {
delete XMLStream; delete xmlStream;
} }
void XMLEventSource::setContent(const QString &xmlFileName) void XMLEventSource::setContent(const QString &xmlFileName)
{ {
delete XMLStream; delete xmlStream;
XMLStream = nullptr; xmlStream = nullptr;
QFile xml(xmlFileName); QFile xml(xmlFileName);
if (!xml.open(QIODevice::ReadOnly)) { if (!xml.open(QIODevice::ReadOnly)) {
@ -75,7 +75,7 @@ void XMLEventSource::setContent(const QString &xmlFileName)
return; return;
} }
QByteArray data = xml.readAll(); QByteArray data = xml.readAll();
XMLStream = new QXmlStreamReader(data); xmlStream = new QXmlStreamReader(data);
/* This checked for valid event objects, but also caused the first event /* This checked for valid event objects, but also caused the first event
* to get dropped. Commenting this out in the example. If you wish to report * to get dropped. Commenting this out in the example. If you wish to report
* empty XML test files a flag indicating whether valid events were found is * empty XML test files a flag indicating whether valid events were found is
@ -91,30 +91,30 @@ void XMLEventSource::setContent(const QString &xmlFileName)
} }
} }
} */ } */
if (XMLStream->atEnd()) { if (xmlStream->atEnd()) {
qCWarning(RecordingLog) << "Invalid xml from" << xmlFileName; qCWarning(RecordingLog) << "Invalid xml from" << xmlFileName;
} }
} }
int XMLEventSource::getNextEvent(QString &widget, QString &command, QString &arguments, int &eventType) int XMLEventSource::getNextEvent(QString &widget, QString &command, QString &arguments, int &eventType)
{ {
if (XMLStream->atEnd()) { if (xmlStream->atEnd()) {
return DONE; return DONE;
} }
while (!XMLStream->atEnd()) { while (!xmlStream->atEnd()) {
QXmlStreamReader::TokenType token = XMLStream->readNext(); QXmlStreamReader::TokenType token = xmlStream->readNext();
if (token == QXmlStreamReader::StartElement) { if (token == QXmlStreamReader::StartElement) {
if (XMLStream->name() == "event") { if (xmlStream->name() == "event") {
break; break;
} }
} }
} }
if (XMLStream->atEnd()) { if (xmlStream->atEnd()) {
return DONE; return DONE;
} }
eventType = pqEventTypes::ACTION_EVENT; eventType = pqEventTypes::ACTION_EVENT;
widget = XMLStream->attributes().value("widget").toString(); widget = xmlStream->attributes().value("widget").toString();
command = XMLStream->attributes().value("command").toString(); command = xmlStream->attributes().value("command").toString();
arguments = XMLStream->attributes().value("arguments").toString(); arguments = xmlStream->attributes().value("arguments").toString();
return SUCCESS; return SUCCESS;
} }

6
cockatrice/src/interface/recording.h
View file

@ -13,8 +13,8 @@ class QXmlStreamWriter;
class XMLEventObserver : public pqEventObserver class XMLEventObserver : public pqEventObserver
{ {
QXmlStreamWriter *XMLStream; QXmlStreamWriter *xmlStream;
QString XMLString; QString xmlString;
public: public:
explicit XMLEventObserver(QObject *p); explicit XMLEventObserver(QObject *p);
@ -30,7 +30,7 @@ protected:
class XMLEventSource : public pqEventSource class XMLEventSource : public pqEventSource
{ {
QXmlStreamReader *XMLStream; QXmlStreamReader *xmlStream;
public: public:
explicit XMLEventSource(QObject *p); explicit XMLEventSource(QObject *p);

10
cockatrice/src/interface/window_main.cpp
View file

@ -380,7 +380,7 @@ void MainWindow::actRecord()
QString filename = QFileDialog::getSaveFileName(this, "Test File Name", QString(), "XML Files (*.xml)"); QString filename = QFileDialog::getSaveFileName(this, "Test File Name", QString(), "XML Files (*.xml)");
if (!filename.isEmpty()) { if (!filename.isEmpty()) {
QApplication::activeWindow(); QApplication::activeWindow();
this->TestUtility->recordTests(filename); testUtility->recordTests(filename);
} }
} }
@ -388,7 +388,7 @@ void MainWindow::actPlayRecording()
{ {
QString filename = QFileDialog::getOpenFileName(this, "Test File Name", QString(), "XML Files (*.xml)"); QString filename = QFileDialog::getOpenFileName(this, "Test File Name", QString(), "XML Files (*.xml)");
if (!filename.isEmpty()) { if (!filename.isEmpty()) {
this->TestUtility->playTests(filename); testUtility->playTests(filename);
} }
} }
@ -940,9 +940,9 @@ MainWindow::MainWindow(QWidget *parent)
// run startup check async // run startup check async
QTimer::singleShot(0, this, &MainWindow::startupConfigCheck); QTimer::singleShot(0, this, &MainWindow::startupConfigCheck);
this->TestUtility = new pqTestUtility(this); testUtility = new pqTestUtility(this);
this->TestUtility->addEventObserver("xml", new XMLEventObserver(this)); testUtility->addEventObserver("xml", new XMLEventObserver(this));
this->TestUtility->addEventSource("xml", new XMLEventSource(this)); testUtility->addEventSource("xml", new XMLEventSource(this));
} }
void MainWindow::startupConfigCheck() void MainWindow::startupConfigCheck()

2
cockatrice/src/interface/window_main.h
View file

@ -166,7 +166,7 @@ private:
GameReplay *replay; GameReplay *replay;
DlgTipOfTheDay *tip; DlgTipOfTheDay *tip;
QUrl connectTo; QUrl connectTo;
pqTestUtility *TestUtility; pqTestUtility *testUtility;
public: public:
explicit MainWindow(QWidget *parent = nullptr); explicit MainWindow(QWidget *parent = nullptr);