Remove Yuni::Bind from src, excluding src/ui (#1977)

Remove `Yuni::Bind`, use `std::function`, `std::bind` instead.

Don't do it in src/ui (deprecated component).

src/libs/antares/paths/include/antares/paths/list.h

@@ -199,7 +199,7 @@ class PathList
     /*!
     ** \brief Event triggered from time to time
     */
-    Yuni::Bind<bool(uint)> onProgress;
+    std::function<bool(uint)> onProgress;
 
 private:
     template<class StringT>

src/libs/antares/paths/list.cpp

@@ -122,7 +122,7 @@ class PathListIterator : public IO::Directory::IIterator<true>
     using Flow = IO::Flow;
 
 public:
-    PathListIterator(PathList& l, const PathList& e, Yuni::Bind<bool(uint)>& progress) :
+    PathListIterator(PathList& l, const PathList& e, std::function<bool(uint)>& progress) :
      list(l), exclude(e), onProgress(progress)
     {
     }
@@ -160,7 +160,7 @@ class PathListIterator : public IO::Directory::IIterator<true>
     PathList& list;
     const PathList& exclude;
     uint offset;
-    Yuni::Bind<bool(uint)>& onProgress;
+    std::function<bool(uint)>& onProgress;
 };
 
 void PathList::internalAddFromFolder(const Clob& folder, const PathList& exclude)

src/libs/antares/study/binding_constraint/BindingConstraint.cpp

@@ -22,6 +22,8 @@
 #include <yuni/core/math.h>
 #include <algorithm>
 #include <vector>
+#include <functional>
+
 #include "antares/study/binding_constraint/BindingConstraint.h"
 #include "antares/study/study.h"
 #include "antares/study/binding_constraint/BindingConstraintLoader.h"
@@ -39,7 +41,8 @@ using namespace Antares;
 #define SNPRINTF snprintf
 #endif
 
-namespace Antares::Data {
+namespace Antares::Data
+{
 
 BindingConstraint::Operator BindingConstraint::StringToOperator(const AnyString& text)
 {
@@ -211,10 +214,11 @@ void BindingConstraint::resetToDefaultValues()
     markAsModified();
 }
 
-void BindingConstraint::copyWeights(const Study &study,
-                                    const BindingConstraint &rhs,
-                                    bool emptyBefore,
-                                    Yuni::Bind<void(AreaName&, const AreaName&)>& translate)
+void BindingConstraint::copyWeights(
+  const Study& study,
+  const BindingConstraint& rhs,
+  bool emptyBefore,
+  const std::function<void(AreaName&, const AreaName&)>& translate)
 {
     if (emptyBefore)
     {
@@ -276,10 +280,11 @@ void BindingConstraint::copyWeights(const Study &study,
     }
 }
 
-void BindingConstraint::copyOffsets(const Study &study,
-                                    const BindingConstraint &rhs,
-                                    bool emptyBefore,
-                                    Yuni::Bind<void(AreaName&, const AreaName&)>& translate)
+void BindingConstraint::copyOffsets(
+  const Study& study,
+  const BindingConstraint& rhs,
+  bool emptyBefore,
+  const std::function<void(AreaName&, const AreaName&)>& translate)
 {
     if (emptyBefore)
         pLinkOffsets.clear();

src/libs/antares/study/include/antares/study/binding_constraint/BindingConstraint.h

@@ -237,7 +237,7 @@ class BindingConstraint final : public Yuni::NonCopyable<BindingConstraint>
     void copyWeights(const Study& study,
                      const BindingConstraint& rhs,
                      bool emptyBefore,
-                     Yuni::Bind<void(AreaName&, const AreaName&)>& translate);
+                     const std::function<void(AreaName&, const AreaName&)>& translate);
 
     /*!
     ** \brief Get the offset of a given interconnection
@@ -269,7 +269,7 @@ class BindingConstraint final : public Yuni::NonCopyable<BindingConstraint>
     void copyOffsets(const Study& study,
                      const BindingConstraint& rhs,
                      bool emptyBefore,
-                     Yuni::Bind<void(AreaName&, const AreaName&)>& translate);
+                     const std::function<void(AreaName&, const AreaName&)>& translate);
 
     /*!
     ** \brief Get how many links the binding constraint contains

src/libs/antares/study/include/antares/study/cleaner.h

@@ -90,11 +90,10 @@ class StudyCleaningInfos final
     **
     ** Return false to stop the process
     */
-    Yuni::Bind<bool(uint)> onProgress;
+    std::function<bool(uint)> onProgress;
 
 }; // class StudyCleaningInfos
 
 } // namespace Antares::Data
 
-
 #endif /* __ANTARES_LIBS_STUDY_CLEANER_H__ */

src/libs/fswalker/fswalker.cpp

@@ -491,7 +491,7 @@ void Walker::run()
     thread->logPrefix = pLogPrefix;
     // Extensions
     DispatchJobEvent callback;
-    callback.bind(thread, &WalkerThread::dispatchJob);
+    callback = std::bind(&WalkerThread::dispatchJob, thread, std::placeholders::_1);
     thread->events.initialize(pExtensions, callback);
 
     // Starting the thread !

src/libs/fswalker/fswalker.h

@@ -49,7 +49,7 @@ using OnFileEvent = void (*)(const YString& filename,
                              uint64_t size,
                              void* user);
 //! Event for dispatching a new job
-using DispatchJobEvent = Yuni::Bind<void(IJob::Ptr job)>;
+using DispatchJobEvent = std::function<void(IJob::Ptr job)>;
 
 class IExtension
 {

src/tools/cleaner/main.cpp

@@ -65,7 +65,7 @@ class StudyFinderCleaner final : public Data::StudyFinder
 
         auto* cleaner = new Data::StudyCleaningInfos(folder);
         cleaner->setCustomExcludeList(exclude);
-        cleaner->onProgress.bind(&onProgress);
+        cleaner->onProgress = &onProgress;
         if (cleaner->analyze())
             cleaner->performCleanup();
         delete cleaner;

src/tools/updater/main.cpp

@@ -102,7 +102,7 @@ class MyStudyFinder final : public Data::StudyFinder
         if (cleanup)
         {
             auto* cleaner = new Data::StudyCleaningInfos(folder.c_str());
-            cleaner->onProgress.bind(&onProgress);
+            cleaner->onProgress = &onProgress;
             if (cleaner->analyze())
                 cleaner->performCleanup();
             delete cleaner;

src/tools/vacuum/modified-inode.cpp

@@ -220,7 +220,7 @@ void* ModifiedINode::userdataCreate(FSWalker::DispatchJobEvent&)
 
 void ModifiedINode::userdataDestroy(void* userdata)
 {
-    pQueue.unbind();
+    pQueue = []([[maybe_unused]] FSWalker::IJob::Ptr job){};
 
     if (userdata)
     {

src/ui/action/handler/antares-study/constraint/offsets.cpp

@@ -98,15 +98,12 @@ bool Offsets::performWL(Context& ctx)
         if (source && source != ctx.constraint)
         {
             pCurrentContext = &ctx;
-            Bind<void(Data::AreaName&, const Data::AreaName&)> tr;
-            if (!targetName.empty())
-            {
-                tr.bind(this, &Offsets::toLower);
-            }
-            else
-            {
-                tr.bind(this, &Offsets::translate);
-            }
+            const std::function<void(Data::AreaName&, const Data::AreaName&)> tr
+              = std::bind(targetName.empty() ? &Offsets::translate : &Offsets::toLower,
+                          this,
+                          std::placeholders::_1,
+                          std::placeholders::_2);
+
             ctx.constraint->copyOffsets(*ctx.study, *source, true, tr);
             pCurrentContext = nullptr;
             return true;

src/ui/action/handler/antares-study/constraint/weights.cpp

@@ -98,15 +98,11 @@ bool Weights::performWL(Context& ctx)
         if (source && source != ctx.constraint)
         {
             pCurrentContext = &ctx;
-            Bind<void(Data::AreaName&, const Data::AreaName&)> tr;
-            if (!targetName.empty())
-            {
-                tr.bind(this, &Weights::toLower);
-            }
-            else
-            {
-                tr.bind(this, &Weights::translate);
-            }
+            const std::function<void(Data::AreaName&, const Data::AreaName&)> tr
+              = std::bind(targetName.empty() ? &Weights::translate : &Weights::toLower,
+                          this,
+                          std::placeholders::_1,
+                          std::placeholders::_2);
             ctx.constraint->copyWeights(*ctx.study, *source, true, tr);
             pCurrentContext = nullptr;
             return true;

src/ui/simulator/toolbox/components/map/settings.h

@@ -25,6 +25,7 @@
 #include <wx/bitmap.h>
 #include <wx/image.h>
 #include <list>
+#include <cstdint>
 
 namespace Antares
 {

src/ui/simulator/windows/cleaner.cpp

@@ -57,7 +57,8 @@ class CleaningThread final : public Yuni::Thread::IThread
         {
             std::lock_guard locker(pParent->pMutex);
             if (pParent->pInfos)
-                pParent->pInfos->onProgress.unbind();
+                pParent->pInfos->onProgress
+                  = []([[maybe_unused]] unsigned int) { return false; };
         }
         stop();
     }
@@ -69,7 +70,8 @@ class CleaningThread final : public Yuni::Thread::IThread
         std::lock_guard locker(pParent->pMutex);
         if (pParent->pInfos)
         {
-            pParent->pInfos->onProgress.bind(this, &CleaningThread::onProgress);
+            pParent->pInfos->onProgress
+              = std::bind(&CleaningThread::onProgress, this, std::placeholders::_1);
             delete pParent->pInfos;
             pParent->pInfos = nullptr;
         }
@@ -87,7 +89,9 @@ class CleaningThread final : public Yuni::Thread::IThread
         {
             logs.callback.clear();
             pParent->pInfos = new Data::StudyCleaningInfos(stdFolder.c_str());
-            pParent->pInfos->onProgress.bind(this, &CleaningThread::onProgress);
+            pParent->pInfos->onProgress
+              = std::bind(&CleaningThread::onProgress, this, std::placeholders::_1);
+
             pParent->pMutex.unlock();
 
             pParent->pInfos->analyze();