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

style changes and removals of typeid

Browse Source 
refs #81
This commit is contained in:
Klaus Basan
2013-12-22 20:28:56 +00:00
committed by Mathew Sutcliffe
parent 229d7c6068
commit 978f3c88e5
73 changed files with 7356 additions and 7130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
samples/cli_client/client.cpp
View File

@@ -90,7 +90,7 @@ Client::Client(BlackMisc::IContext &ctx)
void Client::command(QString line)
{
QTextStream stream (&line, QIODevice::ReadOnly);
QTextStream stream(&line, QIODevice::ReadOnly);
QString cmd;
stream >> cmd;
stream.skipWhiteSpace();
@@ -110,7 +110,7 @@ void Client::command(QString line)
/************ Commands *************/
/****************************************************************************/
void Client::help(QTextStream&)
void Client::help(QTextStream &)
{
std::cout << "Commands:" << std::endl;
auto keys = m_commands.keys();
@@ -120,17 +120,17 @@ void Client::help(QTextStream&)
}
}
void Client::echo(QTextStream& line)
void Client::echo(QTextStream &line)
{
std::cout << "echo: " << line.readAll().toStdString() << std::endl;
}
void Client::exit(QTextStream&)
void Client::exit(QTextStream &)
{
emit quit();
}
void Client::setServerDetailsCmd(QTextStream& args)
void Client::setServerDetailsCmd(QTextStream &args)
{
QString hostname;
quint16 port;
@@ -138,7 +138,7 @@ void Client::setServerDetailsCmd(QTextStream& args)
emit setServerDetails(hostname, port);
}
void Client::setUserCredentialsCmd(QTextStream& args)
void Client::setUserCredentialsCmd(QTextStream &args)
{
QString username;
QString password;
@@ -146,29 +146,29 @@ void Client::setUserCredentialsCmd(QTextStream& args)
emit setUserCredentials(username, password);
}
void Client::setCallsignCmd(QTextStream& args)
void Client::setCallsignCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
emit setCallsign(callsign);
}
void Client::setRealNameCmd(QTextStream& args)
void Client::setRealNameCmd(QTextStream &args)
{
emit setRealName(args.readAll());
}
void Client::initiateConnectionCmd(QTextStream&)
void Client::initiateConnectionCmd(QTextStream &)
{
emit initiateConnection();
}
void Client::terminateConnectionCmd(QTextStream&)
void Client::terminateConnectionCmd(QTextStream &)
{
emit terminateConnection();
}
void Client::sendPrivateTextMessageCmd(QTextStream& args)
void Client::sendPrivateTextMessageCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
@@ -176,7 +176,7 @@ void Client::sendPrivateTextMessageCmd(QTextStream& args)
emit sendPrivateTextMessage(callsign, args.readAll());
}
void Client::sendRadioTextMessageCmd(QTextStream& args)
void Client::sendRadioTextMessageCmd(QTextStream &args)
{
QString freqsBlob;
args >> freqsBlob;
@@ -189,63 +189,63 @@ void Client::sendRadioTextMessageCmd(QTextStream& args)
emit sendRadioTextMessage(freqs, args.readAll());
}
void Client::sendIpQueryCmd(QTextStream&)
void Client::sendIpQueryCmd(QTextStream &)
{
emit sendIpQuery();
}
void Client::sendFreqQueryCmd(QTextStream& args)
void Client::sendFreqQueryCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
emit sendFreqQuery(callsign);
}
void Client::sendServerQueryCmd(QTextStream& args)
void Client::sendServerQueryCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
emit sendServerQuery(callsign);
}
void Client::sendAtcQueryCmd(QTextStream& args)
void Client::sendAtcQueryCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
emit sendAtcQuery(callsign);
}
void Client::sendAtisQueryCmd(QTextStream& args)
void Client::sendAtisQueryCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
emit sendAtisQuery(callsign);
}
void Client::sendNameQueryCmd(QTextStream& args)
void Client::sendNameQueryCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
emit sendNameQuery(callsign);
}
void Client::sendCapabilitiesQueryCmd(QTextStream& args)
void Client::sendCapabilitiesQueryCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
emit sendCapabilitiesQuery(callsign);
}
void Client::replyToFreqQueryCmd(QTextStream& args)
void Client::replyToFreqQueryCmd(QTextStream &args)
{
QString callsign;
double num;
args >> callsign >> num;
BlackMisc::PhysicalQuantities::CFrequency freq (num, BlackMisc::PhysicalQuantities::CFrequencyUnit::kHz());
BlackMisc::PhysicalQuantities::CFrequency freq(num, BlackMisc::PhysicalQuantities::CFrequencyUnit::kHz());
emit replyToFreqQuery(callsign, freq);
}
void Client::replyToNameQueryCmd(QTextStream& args)
void Client::replyToNameQueryCmd(QTextStream &args)
{
QString callsign;
QString realname;
@@ -270,21 +270,21 @@ void Client::sendPlaneInfoCmd(QTextStream& args)
emit sendPlaneInfo(callsign, acTypeICAO, airlineICAO, livery);
}
void Client::pingCmd(QTextStream& args)
void Client::pingCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
emit ping(callsign);
}
void Client::requestMetarCmd(QTextStream& args)
void Client::requestMetarCmd(QTextStream &args)
{
QString airportICAO;
args >> airportICAO;
emit requestMetar(airportICAO);
}
void Client::requestWeatherDataCmd(QTextStream& args)
void Client::requestWeatherDataCmd(QTextStream &args)
{
QString airportICAO;
args >> airportICAO;
@@ -331,7 +331,7 @@ void Client::connectionStatusError()
std::cout << "CONN_STATUS_ERROR" << std::endl;
}
void Client::ipQueryReplyReceived(const QString& ip)
void Client::ipQueryReplyReceived(const QString &ip)
{
std::cout << "IP_REPLY " << ip.toStdString() << std::endl;
}
@@ -376,12 +376,12 @@ void Client::nameQueryRequestReceived(const QString& callsign)
std::cout << "NAME_QUERY " << callsign.toStdString() << std::endl;
}
void Client::kicked(const QString& msg)
void Client::kicked(const QString &msg)
{
std::cout << "KICKED " << msg.toStdString() << std::endl;
}
void Client::metarReceived(const QString& data)
void Client::metarReceived(const QString &data)
{
std::cout << "METAR " << data.toStdString() << std::endl;
}

62
samples/cli_client/client.h
View File

@@ -27,37 +27,37 @@ public slots:
void command(QString line);
private: //commands
void help(QTextStream& args);
void echo(QTextStream& args);
void exit(QTextStream& args);
void setServerDetailsCmd(QTextStream& args);
void setUserCredentialsCmd(QTextStream& args);
void setCallsignCmd(QTextStream& args);
void setRealNameCmd(QTextStream& args);
void initiateConnectionCmd(QTextStream& args);
void terminateConnectionCmd(QTextStream& args);
void sendPrivateTextMessageCmd(QTextStream& args);
void sendRadioTextMessageCmd(QTextStream& args);
void sendIpQueryCmd(QTextStream& args);
void sendFreqQueryCmd(QTextStream& args);
void sendServerQueryCmd(QTextStream& args);
void sendAtcQueryCmd(QTextStream& args);
void sendAtisQueryCmd(QTextStream& args);
void sendNameQueryCmd(QTextStream& args);
void sendCapabilitiesQueryCmd(QTextStream& args);
void replyToFreqQueryCmd(QTextStream& args);
void replyToNameQueryCmd(QTextStream& args);
void requestPlaneInfoCmd(QTextStream& args);
void sendPlaneInfoCmd(QTextStream& args);
void pingCmd(QTextStream& args);
void requestMetarCmd(QTextStream& args);
void requestWeatherDataCmd(QTextStream& args);
void help(QTextStream &args);
void echo(QTextStream &args);
void exit(QTextStream &args);
void setServerDetailsCmd(QTextStream &args);
void setUserCredentialsCmd(QTextStream &args);
void setCallsignCmd(QTextStream &args);
void setRealNameCmd(QTextStream &args);
void initiateConnectionCmd(QTextStream &args);
void terminateConnectionCmd(QTextStream &args);
void sendPrivateTextMessageCmd(QTextStream &args);
void sendRadioTextMessageCmd(QTextStream &args);
void sendIpQueryCmd(QTextStream &args);
void sendFreqQueryCmd(QTextStream &args);
void sendServerQueryCmd(QTextStream &args);
void sendAtcQueryCmd(QTextStream &args);
void sendAtisQueryCmd(QTextStream &args);
void sendNameQueryCmd(QTextStream &args);
void sendCapabilitiesQueryCmd(QTextStream &args);
void replyToFreqQueryCmd(QTextStream &args);
void replyToNameQueryCmd(QTextStream &args);
void pingCmd(QTextStream &args);
void requestMetarCmd(QTextStream &args);
void requestWeatherDataCmd(QTextStream &args);
signals: //to send to INetwork
void setServerDetails(const QString& hostname, quint16 port);
void setUserCredentials(const QString& username, const QString& password);
void setCallsign(const QString& callsign);
void setRealName(const QString& name);
void setServerDetails(const QString &hostname, quint16 port);
void setUserCredentials(const QString &username, const QString &password);
void setRealName(const QString &name);
void initiateConnection();
void terminateConnection();
void sendPrivateTextMessage(const QString& callsign, const QString& msg);
@@ -86,7 +86,6 @@ public slots: //to receive from INetwork
void connectionStatusConnected();
void connectionStatusDisconnected();
void connectionStatusError();
void ipQueryReplyReceived(const QString& ip);
void freqQueryReplyReceived(const QString& callsign, const BlackMisc::PhysicalQuantities::CFrequency& freq);
void serverQueryReplyReceived(const QString& callsign, const QString& hostname);
void atcQueryReplyReceived(const QString& callsign, bool isATC);
@@ -95,18 +94,19 @@ public slots: //to receive from INetwork
void capabilitiesQueryReplyReceived(const QString& callsign, quint32 flags);
void freqQueryRequestReceived(const QString& callsign);
void nameQueryRequestReceived(const QString& callsign);
void kicked(const QString& msg);
void metarReceived(const QString& data);
void pilotDisconnected(const QString& callsign);
void planeInfoReceived(const QString& callsign, const QString& acTypeICAO, const QString& airlineICAO, const QString& livery);
void planeInfoRequestReceived(const QString& callsign);
void pong(const QString& callsign, const BlackMisc::PhysicalQuantities::CTime& elapsedTime);
void radioTextMessageReceived(const QString& callsign, const QString& msg, const QVector<BlackMisc::PhysicalQuantities::CFrequency>& freqs);
void privateTextMessageReceived(const QString& fromCallsign, const QString& toCallsign, const QString& msg);
void ipQueryReplyReceived(const QString &ip);
void kicked(const QString &msg);
void metarReceived(const QString &data);
private:
QMap<QString, std::function<void(QTextStream&)>> m_commands;
BlackCore::INetwork* m_net;
QMap<QString, std::function<void(QTextStream &)>> m_commands;
BlackCore::INetwork *m_net;
};
#endif //__BLACKSAMPLE_CLI_CLIENT_H__