flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 11:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify (remove duplicate spaces) text messages

Browse Source
This commit is contained in:
Klaus Basan
2018-01-21 01:49:02 +01:00
parent 2da4b2719a
commit a3bbb72185
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -264,10 +264,10 @@ namespace BlackCore
CLogMessage(this).validationError("Incorrect message"); CLogMessage(this).validationError("Incorrect message");
return false; return false;
} }
QString receiver = parser.part(1).trimmed(); // receiver
// set receiver // set receiver
CSimulatedAircraft ownAircraft(this->getIContextOwnAircraft()->getOwnAircraft()); const QString receiver = parser.part(1).trimmed(); // receiver
const CSimulatedAircraft ownAircraft(this->getIContextOwnAircraft()->getOwnAircraft());
if (ownAircraft.getCallsign().isEmpty()) if (ownAircraft.getCallsign().isEmpty())
{ {
CLogMessage(this).validationError("No own callsign"); CLogMessage(this).validationError("No own callsign");

2
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -1108,7 +1108,7 @@ namespace BlackCore
// Wait maximum 3 seconds for the reply and release as text message after // Wait maximum 3 seconds for the reply and release as text message after
if (pendingQuery.m_queryTime.secsTo(QDateTime::currentDateTimeUtc()) > 3) if (pendingQuery.m_queryTime.secsTo(QDateTime::currentDateTimeUtc()) > 3)
{ {
QString atisMessage(pendingQuery.m_atisMessage.join(QChar::LineFeed)); const QString atisMessage(pendingQuery.m_atisMessage.join(QChar::LineFeed));
CTextMessage tm(atisMessage, sender, receiver); CTextMessage tm(atisMessage, sender, receiver);
tm.setCurrentUtcTime(); tm.setCurrentUtcTime();
consolidateTextMessage(tm); consolidateTextMessage(tm);

4
src/blackmisc/network/textmessage.cpp
View File

@@ -27,13 +27,13 @@ namespace BlackMisc
namespace Network namespace Network
{ {
CTextMessage::CTextMessage(const QString &message, const CFrequency &frequency, const CCallsign &senderCallsign) CTextMessage::CTextMessage(const QString &message, const CFrequency &frequency, const CCallsign &senderCallsign)
: m_message(message), m_senderCallsign(senderCallsign), m_frequency(frequency) : m_message(message.trimmed().simplified()), m_senderCallsign(senderCallsign), m_frequency(frequency)
{ {
m_frequency.switchUnit(PhysicalQuantities::CFrequencyUnit::MHz()); m_frequency.switchUnit(PhysicalQuantities::CFrequencyUnit::MHz());
} }
CTextMessage::CTextMessage(const QString &message, const CCallsign &senderCallsign, const CCallsign &recipientCallsign) CTextMessage::CTextMessage(const QString &message, const CCallsign &senderCallsign, const CCallsign &recipientCallsign)
: m_message(message), m_senderCallsign(senderCallsign), m_recipientCallsign(recipientCallsign), m_frequency(0, nullptr) : m_message(message.trimmed().simplified()), m_senderCallsign(senderCallsign), m_recipientCallsign(recipientCallsign), m_frequency(0, nullptr)
{} {}
QString CTextMessage::convertToQString(bool i18n) const QString CTextMessage::convertToQString(bool i18n) const

2
src/blackmisc/network/textmessage.h
View File

@@ -89,7 +89,7 @@ namespace BlackMisc
bool isEmpty() const { return m_message.isEmpty(); } bool isEmpty() const { return m_message.isEmpty(); }
//! Set message //! Set message
void setMessage(const QString &message) { m_message = message.trimmed(); } void setMessage(const QString &message) { m_message = message.trimmed().simplified(); }
//! Get frequency //! Get frequency
const PhysicalQuantities::CFrequency &getFrequency() const { return m_frequency; } const PhysicalQuantities::CFrequency &getFrequency() const { return m_frequency; }