Merge pull request #1528 from Holt59/remove-boost-uibase

Update after removal of boost in uibase.

2 files changed, 1 insertions, 9 deletions

diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index c5896d2e..c4640cc3 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -491,9 +491,7 @@ IPlugin* PluginContainer::registerPlugin(QObject *plugin, const QString& filepat
     if (diagnose != nullptr) {

       bf::at_key<IPluginDiagnose>(m_Plugins).push_back(diagnose);

       bf::at_key<IPluginDiagnose>(m_AccessPlugins)[diagnose] = pluginObj;

-      m_DiagnosisConnections.push_back(

-        diagnose->onInvalidated([&] () { emit diagnosisUpdate(); })

-      );

+      diagnose->onInvalidated([&]() { emit diagnosisUpdate(); });

     }

   }

   { // file mapper plugin

@@ -967,11 +965,6 @@ void PluginContainer::unloadPlugins()
   bf::for_each(m_AccessPlugins, [](auto& t) { t.second.clear(); });

   m_Requirements.clear();

 

-  for (const boost::signals2::connection& connection : m_DiagnosisConnections) {

-    connection.disconnect();

-  }

-  m_DiagnosisConnections.clear();

-

   while (!m_PluginLoaders.empty()) {

     QPluginLoader* loader = m_PluginLoaders.back();

     m_PluginLoaders.pop_back();

diff --git a/src/plugincontainer.h b/src/plugincontainer.h
index 386b9bca..b250573a 100644
--- a/src/plugincontainer.h
+++ b/src/plugincontainer.h
@@ -476,7 +476,6 @@ private:
   std::map<MOBase::IPlugin*, PluginRequirements> m_Requirements;

 

   std::map<QString, MOBase::IPluginGame*> m_SupportedGames;

-  std::vector<boost::signals2::connection> m_DiagnosisConnections;

   QStringList m_FailedPlugins;

   std::vector<QPluginLoader*> m_PluginLoaders;