suppressing various GCC warnings

This commit is contained in:
Mathew Sutcliffe
2013-09-24 01:01:07 +01:00
parent 0a6fbb8aac
commit dc436735cc
2 changed files with 14 additions and 6 deletions

View File

@@ -427,12 +427,12 @@ namespace BlackCore
emit cbvar_cast(cbvar)->atcDisconnected(cbvar_cast(cbvar)->fromFSD(callsign));
}
void NetworkVatlib::onPilotPositionUpdate(Cvatlib_Network*, const char* callsign, Cvatlib_Network::PilotPosUpdate pos, void* cbvar)
void NetworkVatlib::onPilotPositionUpdate(Cvatlib_Network*, const char* /*callsign*/, Cvatlib_Network::PilotPosUpdate /*pos*/, void* /*cbvar*/)
{
//TODO
}
void NetworkVatlib::onInterimPilotPositionUpdate(Cvatlib_Network*, const char* callsign, Cvatlib_Network::PilotPosUpdate pos, void* cbvar)
void NetworkVatlib::onInterimPilotPositionUpdate(Cvatlib_Network*, const char* /*callsign*/, Cvatlib_Network::PilotPosUpdate /*pos*/, void* /*cbvar*/)
{
//TODO
}
@@ -499,7 +499,7 @@ namespace BlackCore
emit cbvar_cast(cbvar)->atisQueryReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), cbvar_cast(cbvar)->fromFSD(data));
}
void NetworkVatlib::onTemperatureDataReceived(Cvatlib_Network*, Cvatlib_Network::TempLayer layers[4], INT pressure, void* cbvar)
void NetworkVatlib::onTemperatureDataReceived(Cvatlib_Network*, Cvatlib_Network::TempLayer /*layers*/[4], INT /*pressure*/, void* /*cbvar*/)
{
//TODO
}
@@ -537,12 +537,12 @@ namespace BlackCore
emit cbvar_cast(cbvar)->terminate();
}
void NetworkVatlib::onWindDataReceived(Cvatlib_Network*, Cvatlib_Network::WindLayer layers[4], void* cbvar)
void NetworkVatlib::onWindDataReceived(Cvatlib_Network*, Cvatlib_Network::WindLayer /*layers*/[4], void* /*cbvar*/)
{
//TODO
}
void NetworkVatlib::onCloudDataReceived(Cvatlib_Network*, Cvatlib_Network::CloudLayer layers[2], Cvatlib_Network::StormLayer storm, float vis, void* cbvar)
void NetworkVatlib::onCloudDataReceived(Cvatlib_Network*, Cvatlib_Network::CloudLayer /*layers*/[2], Cvatlib_Network::StormLayer /*storm*/, float /*vis*/, void* /*cbvar*/)
{
//TODO
}

View File

@@ -86,8 +86,16 @@ namespace BlackCore
signals:
void terminate();
public:
//! Deletion policy for QScopedPointer
struct VatlibQScopedPointerDeleter
{
//! Called by QScopedPointer destructor
static void cleanup(Cvatlib_Network *net) { if (net) net->Destroy(); }
};
private:
QScopedPointer<Cvatlib_Network> m_net;
QScopedPointer<Cvatlib_Network, VatlibQScopedPointerDeleter> m_net;
Cvatlib_Network::connStatus m_status;
QBasicTimer m_timer;