From 9423b25bf55fb17c5d02f7c248edac8d70ecf877 Mon Sep 17 00:00:00 2001 From: Cerapter Date: Tue, 4 May 2021 22:38:39 +0200 Subject: [PATCH] Fix remaining `clazy-writing-to-temporary` issues --- core/include/area_data.h | 10 +++++++++- core/src/area_data.cpp | 26 +++++++++++++++++++++++++- core/src/packets.cpp | 13 ++++--------- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/core/include/area_data.h b/core/include/area_data.h index c4dbbf4..eaf888f 100644 --- a/core/include/area_data.h +++ b/core/include/area_data.h @@ -253,6 +253,12 @@ class AreaData : public QObject { void swapEvidence(int f_eviId1, int f_eviId2); + void appendEvidence(const Evidence& f_evi_r); + + void deleteEvidence(int f_eviId); + + void replaceEvidence(int f_eviId, const Evidence& f_newEvi_r); + Status status() const; bool changeStatus(const QString& f_newStatus_r); @@ -324,7 +330,9 @@ class AreaData : public QObject { QStringList judgelog() const; - QStringList lastICMessage() const; + void appendJudgelog(const QString& f_newLog_r); + + const QStringList& lastICMessage() const; void updateLastICMessage(const QStringList& f_lastMessage); diff --git a/core/src/area_data.cpp b/core/src/area_data.cpp index 30e04f9..f24e807 100644 --- a/core/src/area_data.cpp +++ b/core/src/area_data.cpp @@ -240,6 +240,21 @@ void AreaData::swapEvidence(int f_eviId1, int f_eviId2) #endif } +void AreaData::appendEvidence(const AreaData::Evidence &f_evi_r) +{ + m_evidence.append(f_evi_r); +} + +void AreaData::deleteEvidence(int f_eviId) +{ + m_evidence.removeAt(f_eviId); +} + +void AreaData::replaceEvidence(int f_eviId, const AreaData::Evidence &f_newEvi_r) +{ + m_evidence.replace(f_eviId, f_newEvi_r); +} + AreaData::Status AreaData::status() const { return m_status; @@ -331,7 +346,7 @@ void AreaData::toggleImmediate() m_forceImmediate = !m_forceImmediate; } -QStringList AreaData::lastICMessage() const +const QStringList& AreaData::lastICMessage() const { return m_lastICMessage; } @@ -346,6 +361,15 @@ QStringList AreaData::judgelog() const return m_judgelog; } +void AreaData::appendJudgelog(const QString &f_newLog_r) +{ + if (m_judgelog.size() == 10) { + m_judgelog.removeFirst(); + } + + m_judgelog.append(f_newLog_r); +} + int AreaData::statement() const { return m_statement; diff --git a/core/src/packets.cpp b/core/src/packets.cpp index 07fd2cb..323672a 100644 --- a/core/src/packets.cpp +++ b/core/src/packets.cpp @@ -347,7 +347,7 @@ void AOClient::pktAddEvidence(AreaData* area, int argc, QStringList argv, AOPack if (!checkEvidenceAccess(area)) return; AreaData::Evidence evi = {argv[0], argv[1], argv[2]}; - area->evidence().append(evi); + area->appendEvidence(evi); sendEvidenceList(area); } @@ -358,7 +358,7 @@ void AOClient::pktRemoveEvidence(AreaData* area, int argc, QStringList argv, AOP bool is_int = false; int idx = argv[0].toInt(&is_int); if (is_int && idx <= area->evidence().size() && idx >= 0) { - area->evidence().removeAt(idx); + area->deleteEvidence(idx); } sendEvidenceList(area); } @@ -371,7 +371,7 @@ void AOClient::pktEditEvidence(AreaData* area, int argc, QStringList argv, AOPac int idx = argv[0].toInt(&is_int); AreaData::Evidence evi = {argv[1], argv[2], argv[3]}; if (is_int && idx <= area->evidence().size() && idx >= 0) { - area->evidence().replace(idx, evi); + area->replaceEvidence(idx, evi); } sendEvidenceList(area); } @@ -828,12 +828,7 @@ void AOClient::updateJudgeLog(AreaData* area, AOClient* client, QString action) QString ipid = client->getIpid(); QString message = action; QString logmessage = QString("[%1]: [%2] %3 (%4) %5").arg(timestamp, uid, char_name, ipid, message); - int size = area->judgelog().size(); - if (size == 10) { - area->judgelog().removeFirst(); - area->judgelog().append(logmessage); - } - else area->judgelog().append(logmessage); + area->appendJudgelog(logmessage); } QString AOClient::decodeMessage(QString incoming_message)