From dc436735cc80689f839e4212b05bf39448e9fab9 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Tue, 24 Sep 2013 01:01:07 +0100
Subject: [PATCH] suppressing various GCC warnings

---
 src/blackcore/network_vatlib.cpp | 10 +++++-----
 src/blackcore/network_vatlib.h   | 10 +++++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp
index c8a1ba402..f2830564b 100644
--- a/src/blackcore/network_vatlib.cpp
+++ b/src/blackcore/network_vatlib.cpp
@@ -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
     }
diff --git a/src/blackcore/network_vatlib.h b/src/blackcore/network_vatlib.h
index e1f5325af..413a7c3d8 100644
--- a/src/blackcore/network_vatlib.h
+++ b/src/blackcore/network_vatlib.h
@@ -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;