refs #466 Resolved TODO items in INetwork.

This commit is contained in:
Mathew Sutcliffe
2015-09-17 16:47:22 +01:00
parent f03b24022e
commit df6b5b4929
5 changed files with 16 additions and 76 deletions

View File

@@ -64,7 +64,6 @@ Client::Client(QObject *parent)
connect(this, &Client::setOwnAircraftCockpit, COwnAircraftProviderDummy::instance(), &COwnAircraftProviderDummy::updateCockpit);
connect(this, &Client::sendPing, m_net, &INetwork::sendPing);
connect(this, &Client::sendMetarQuery, m_net, &INetwork::sendMetarQuery);
connect(this, &Client::sendWeatherDataQuery, m_net, &INetwork::sendWeatherDataQuery);
connect(this, &Client::sendCustomPacket, m_net, &INetwork::sendCustomPacket);
using namespace std::placeholders;
@@ -95,7 +94,6 @@ Client::Client(QObject *parent)
m_commands["setcockpit"] = std::bind(&Client::setOwnAircraftCockpitCmd, this, _1);
m_commands["ping"] = std::bind(&Client::sendPingCmd, this, _1);
m_commands["metar"] = std::bind(&Client::sendMetarQueryCmd, this, _1);
m_commands["weather"] = std::bind(&Client::sendWeatherDataQueryCmd, this, _1);
m_commands["custom"] = std::bind(&Client::sendCustomPacketCmd, this, _1);
}
@@ -400,13 +398,6 @@ void Client::sendMetarQueryCmd(QTextStream &args)
emit sendMetarQuery(airportICAO);
}
void Client::sendWeatherDataQueryCmd(QTextStream &args)
{
QString airportICAO;
args >> airportICAO;
emit sendWeatherDataQuery(airportICAO);
}
void Client::sendCustomPacketCmd(QTextStream &args)
{
QString callsign;

View File

@@ -66,7 +66,6 @@ private: //commands
void setOwnAircraftCockpitCmd(QTextStream &args);
void sendPingCmd(QTextStream &args);
void sendMetarQueryCmd(QTextStream &args);
void sendWeatherDataQueryCmd(QTextStream &args);
void sendCustomPacketCmd(QTextStream &args);
signals: //to send to INetwork
@@ -93,7 +92,6 @@ signals: //to send to INetwork
const BlackMisc::Aviation::CTransponder &xpdr, const QString &originator);
void sendPing(const BlackMisc::Aviation::CCallsign &callsign);
void sendMetarQuery(const QString &airportICAO);
void sendWeatherDataQuery(const QString &airportICAO);
void sendCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data);
public slots: //to receive from INetwork