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

[FSD] Style

Browse Source
This commit is contained in:
Klaus Basan
2019-11-13 22:16:39 +01:00
committed by Mat Sutcliffe
parent 59c6a7ad93
commit f38bfc5cf9
6 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/fsd/addatc.cpp
View File

@@ -25,8 +25,7 @@ namespace BlackCore
m_rating(rating), m_rating(rating),
m_protocolRevision(protocolRevision), m_protocolRevision(protocolRevision),
m_realName(realName) m_realName(realName)
{ { }
}
QStringList AddAtc::toTokens() const QStringList AddAtc::toTokens() const
{ {

6
src/blackcore/fsd/atcdataupdate.cpp
View File

@@ -21,7 +21,7 @@ namespace BlackCore
{ } { }
AtcDataUpdate::AtcDataUpdate(const QString &sender, int frequencykHz, CFacilityType facility, int visibleRange, AtcRating rating, AtcDataUpdate::AtcDataUpdate(const QString &sender, int frequencykHz, CFacilityType facility, int visibleRange, AtcRating rating,
double latitude, double longitude, int elevation) : double latitude, double longitude, int elevation) :
MessageBase(sender, {}), MessageBase(sender, {}),
m_frequencykHz(frequencykHz), m_frequencykHz(frequencykHz),
m_facility(facility), m_facility(facility),
@@ -40,7 +40,7 @@ namespace BlackCore
tokens.push_back(toQString(m_facility)); tokens.push_back(toQString(m_facility));
tokens.push_back(QString::number(m_visibleRange)); tokens.push_back(QString::number(m_visibleRange));
tokens.push_back(toQString(m_rating)); tokens.push_back(toQString(m_rating));
tokens.push_back(QString::number(m_latitude, 'f', 5)); tokens.push_back(QString::number(m_latitude, 'f', 5));
tokens.push_back(QString::number(m_longitude, 'f', 5)); tokens.push_back(QString::number(m_longitude, 'f', 5));
tokens.push_back(QString::number(m_elevation)); tokens.push_back(QString::number(m_elevation));
return tokens; return tokens;
@@ -55,7 +55,7 @@ namespace BlackCore
} }
AtcDataUpdate packet(tokens[0], tokens[1].toInt() + 100000, fromQString<CFacilityType>(tokens[2]), tokens[3].toInt(), fromQString<AtcRating>(tokens[4]), AtcDataUpdate packet(tokens[0], tokens[1].toInt() + 100000, fromQString<CFacilityType>(tokens[2]), tokens[3].toInt(), fromQString<AtcRating>(tokens[4]),
tokens[5].toDouble(), tokens[6].toDouble(), tokens[7].toInt()); tokens[5].toDouble(), tokens[6].toDouble(), tokens[7].toInt());
return packet; return packet;
} }
} }

2
src/blackcore/fsd/authchallenge.cpp
View File

@@ -37,7 +37,7 @@ namespace BlackCore
{ {
BlackMisc::CLogMessage(static_cast<AuthChallenge *>(nullptr)).warning(u"Wrong number of arguments."); BlackMisc::CLogMessage(static_cast<AuthChallenge *>(nullptr)).warning(u"Wrong number of arguments.");
return {}; return {};
}; }
return AuthChallenge(tokens[0], tokens[1], tokens[2]); return AuthChallenge(tokens[0], tokens[1], tokens[2]);
} }
} }

6
src/blackcore/fsd/fsdclient.cpp
View File

@@ -451,7 +451,7 @@ namespace BlackCore
sendMessage(clientQuery); sendMessage(clientQuery);
} }
this->increaseStatisticsValue(QStringLiteral("sendClientQuery"), toQString(queryType)); increaseStatisticsValue(QStringLiteral("sendClientQuery"), toQString(queryType));
} }
void CFSDClient::sendTextMessages(const CTextMessageList &messages) void CFSDClient::sendTextMessages(const CTextMessageList &messages)
@@ -504,7 +504,7 @@ namespace BlackCore
else { return; } else { return; }
const TextMessage textMessage(m_ownCallsign.asString(), receiver, message); const TextMessage textMessage(m_ownCallsign.asString(), receiver, message);
sendMessage(textMessage); sendMessage(textMessage);
this->increaseStatisticsValue(QStringLiteral("sendTextMessages")); increaseStatisticsValue(QStringLiteral("sendTextMessages"));
} }
void CFSDClient::sendTextMessage(const QString &receiver, const QString &message) void CFSDClient::sendTextMessage(const QString &receiver, const QString &message)
@@ -576,7 +576,7 @@ namespace BlackCore
void CFSDClient::sendPlaneInfoRequest(const CCallsign &receiver) void CFSDClient::sendPlaneInfoRequest(const CCallsign &receiver)
{ {
PlaneInfoRequest planeInfoRequest(m_ownCallsign.asString(), receiver.toQString()); const PlaneInfoRequest planeInfoRequest(m_ownCallsign.asString(), receiver.toQString());
sendMessage(planeInfoRequest); sendMessage(planeInfoRequest);
increaseStatisticsValue(QStringLiteral("sendPlaneInfoRequest")); increaseStatisticsValue(QStringLiteral("sendPlaneInfoRequest"));
} }

6
src/blackcore/fsd/messagebase.h
View File

@@ -80,16 +80,10 @@ namespace BlackCore
void setValid(bool isValid) { m_isValid = isValid; } void setValid(bool isValid) { m_isValid = isValid; }
protected: protected:
// Meta data
// MessageType messageType = MessageType::Unknown;
QString m_sender; //!< message sender QString m_sender; //!< message sender
QString m_receiver; //!< message receiver QString m_receiver; //!< message receiver
bool m_isValid = true; //!< is valid? bool m_isValid = true; //!< is valid?
}; };
}
}
#endif // guard #endif // guard

14
tests/blackcore/fsd/testfsdmessages/testfsdmessages.cpp
View File

@@ -165,11 +165,11 @@ namespace BlackMiscTest
QCOMPARE(message.receiver(), QString("SERVER")); QCOMPARE(message.receiver(), QString("SERVER"));
QCOMPARE(QString("7a57f2dd9d360d347b"), message.m_challengeKey); QCOMPARE(QString("7a57f2dd9d360d347b"), message.m_challengeKey);
QString stringRef("ABCD:SERVER:7a57f2dd9d360d347b"); const QString stringRef("ABCD:SERVER:7a57f2dd9d360d347b");
QString str = message.toTokens().join(":"); const QString str = message.toTokens().join(":");
QCOMPARE(str, stringRef); QCOMPARE(str, stringRef);
QStringList tokens = QString("ABCD:SERVER:7a57f2dd9d360d347b").split(':'); const QStringList tokens = QString("ABCD:SERVER:7a57f2dd9d360d347b").split(':');
const AuthChallenge messageFromTokens = AuthChallenge::fromTokens(tokens); const AuthChallenge messageFromTokens = AuthChallenge::fromTokens(tokens);
QCOMPARE(messageFromTokens, message); QCOMPARE(messageFromTokens, message);
} }
@@ -181,13 +181,13 @@ namespace BlackMiscTest
QCOMPARE(message.receiver(), QString("SERVER")); QCOMPARE(message.receiver(), QString("SERVER"));
QCOMPARE(QString("7a57f2dd9d360d347b"), message.m_response); QCOMPARE(QString("7a57f2dd9d360d347b"), message.m_response);
QString stringRef("ABCD:SERVER:7a57f2dd9d360d347b"); const QString stringRef("ABCD:SERVER:7a57f2dd9d360d347b");
QString str = message.toTokens().join(":"); const QString str = message.toTokens().join(":");
QCOMPARE(str, stringRef); QCOMPARE(str, stringRef);
const AuthResponse reference("ABCD", "SERVER", "7a57f2dd9d360d347b"); const AuthResponse reference("ABCD", "SERVER", "7a57f2dd9d360d347b");
QStringList tokens = QString("ABCD:SERVER:7a57f2dd9d360d347b").split(':'); const QStringList tokens = QString("ABCD:SERVER:7a57f2dd9d360d347b").split(':');
const AuthResponse messageFromTokens = AuthResponse::fromTokens(tokens); const AuthResponse messageFromTokens = AuthResponse::fromTokens(tokens);
QCOMPARE(messageFromTokens, message); QCOMPARE(messageFromTokens, message);
@@ -212,7 +212,7 @@ namespace BlackMiscTest
const ClientIdentification reference("ABCD", 0xe410, "Client", 1, 5, "1234567", "1108540872", "29bbc8b1398eb38e0139"); const ClientIdentification reference("ABCD", 0xe410, "Client", 1, 5, "1234567", "1108540872", "29bbc8b1398eb38e0139");
QStringList tokens = QString("ABCD:SERVER:e410:Client:1:5:1234567:1108540872:29bbc8b1398eb38e0139").split(':'); const QStringList tokens = QString("ABCD:SERVER:e410:Client:1:5:1234567:1108540872:29bbc8b1398eb38e0139").split(':');
const ClientIdentification messageFromTokens = ClientIdentification::fromTokens(tokens); const ClientIdentification messageFromTokens = ClientIdentification::fromTokens(tokens);
QCOMPARE(messageFromTokens, message); QCOMPARE(messageFromTokens, message);
} }