Highlighting: changed FGInterface::property_associations() callback to use std::function.

Replaces previous function pointer plus void*.

src/FDM/YASim/FGFDM.cpp

@@ -63,13 +63,12 @@ FGFDM::~FGFDM()
 }
 
 void FGFDM::property_associations(
-        void* ref,
+        std::function<void(const std::string& from, const std::string& to)> fn
-        void (*fn)(void* ref, const std::string& from, const std::string& to)
         )
 {
     for (auto& a: _property_to_properties) {
         for (auto& b: a.second) {
-            fn(ref, a.first, b);
+            fn(a.first, b);
         }
     }
 }

src/FDM/YASim/FGFDM.hpp

@@ -37,8 +37,7 @@ public:
     float getVehicleRadius(void) const { return _vehicle_radius; }
     
     void property_associations(
-            void* ref,
+            std::function<void(const std::string& from, const std::string& to)> fn
-            void (*fn)(void* ref, const std::string& from, const std::string& to)
             );
 
 private:

src/FDM/YASim/YASim.cxx

@@ -55,11 +55,10 @@ YASim::~YASim()
 }
 
 void YASim::property_associations(
-        void* ref,
+        std::function<void(const std::string& from, const std::string& to)> fn
-        void (*fn)(void* ref, const std::string& from, const std::string& to)
         )
 {
-    return _fdm->property_associations(ref, fn);
+    return _fdm->property_associations(fn);
 }
 
 void YASim::report()

src/FDM/YASim/YASim.hxx

@@ -22,8 +22,7 @@ public:
     static const char* staticSubsystemClassId() { return "yasim"; }
 
     void property_associations(
-            void* ref,
+            std::function<void(const std::string& from, const std::string& to)> fn
-            void (*fn)(void* ref, const std::string& from, const std::string& to)
             ) override;
 
 private:

src/FDM/flight.cxx

@@ -234,8 +234,7 @@ FGInterface::common_init ()
 }
 
 void FGInterface::property_associations(
-        void* ref,
+        std::function<void(const std::string& from, const std::string& to)> fn
-        void (*fn)(void* ref, const std::string& from, const std::string& to)
         )
 {
     /* Do nothing by default. */

src/FDM/flight.hxx

@@ -74,6 +74,7 @@
 
 
 #include <cmath>
+#include <functional>
 
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
@@ -440,12 +441,11 @@ public:
     //perform initializion that is common to all FDM's
     void common_init();
 
-    // Makes possibly multiple calls of fn(ref, ...) with pairs of property
+    // Makes possibly multiple calls of fn() with pairs of property paths that
-    // paths that are associated in the FDM. Default implementation does
+    // are associated in the FDM. Default implementation does nothing. Used by
-    // nothing. Used by the Highlight subsystem.
+    // the Highlight subsystem.
     virtual void property_associations(
-            void* ref,
+            std::function<void(const std::string& from, const std::string& to)> fn
-            void (*fn)(void* ref, const std::string& from, const std::string& to)
             );
 
     // Positions

src/GUI/Highlight.cxx

@@ -323,12 +323,6 @@ struct FdmInitialisedListener : SGPropertyChangeListener
     {
         m_fdm_initialised->addChangeListener(this, true /*initial*/);
     }
-    static void property_associations_callback(void* ref, const std::string& from, const std::string& to)
-    {
-        SG_LOG(SG_GENERAL, SG_DEBUG, "fdm property association: " << from << " => " << to);
-        Highlight* highlight = (Highlight*) ref;
-        highlight->addPropertyProperty(from, to);
-    }
     void valueChanged(SGPropertyNode* node) override
     {
         if (m_fdm_initialised->getBoolValue())
@@ -338,7 +332,13 @@ struct FdmInitialisedListener : SGPropertyChangeListener
             FDMShell* fdmshell = (FDMShell*) globals->get_subsystem("flight");
             FGInterface* fginterface = fdmshell->getInterface();
             assert(fginterface);
-            fginterface->property_associations(highlight, property_associations_callback);
+            fginterface->property_associations(
+                    [highlight](const std::string& from, const std::string& to)
+                    {
+                        SG_LOG(SG_GENERAL, SG_DEBUG, "fdm property association: " << from << " => " << to);
+                        highlight->addPropertyProperty(from, to);
+                    }
+                    );
             s_fdm_initialised_listener.reset();
         }
     }