Mercurial > hg > svcore
diff plugin/PluginScan.cpp @ 1483:7459f4c4d7c3
Merge from branch plugin-path-config
author | Chris Cannam |
---|---|
date | Mon, 11 Jun 2018 14:40:09 +0100 |
parents | dcff44a76573 |
children | 0ee87bc10cdc |
line wrap: on
line diff
--- a/plugin/PluginScan.cpp Thu May 24 16:30:55 2018 +0100 +++ b/plugin/PluginScan.cpp Mon Jun 11 14:40:09 2018 +0100 @@ -19,9 +19,9 @@ #include "base/HelperExecPath.h" #ifdef HAVE_PLUGIN_CHECKER_HELPER -#include "checker/knownplugins.h" +#include "checker/knownplugincandidates.h" #else -class KnownPlugins {}; +class KnownPluginCandidates {}; #endif #include <QMutex> @@ -92,7 +92,7 @@ for (auto p: helpers) { try { - KnownPlugins *kp = new KnownPlugins + KnownPluginCandidates *kp = new KnownPluginCandidates (p.executable.toStdString(), m_logger); if (m_kp.find(p.tag) != m_kp.end()) { SVDEBUG << "WARNING: PluginScan::scan: Duplicate tag " << p.tag @@ -151,7 +151,7 @@ for (auto rec: m_kp) { - KnownPlugins *kp = rec.second; + KnownPluginCandidates *kp = rec.second; auto c = kp->getCandidateLibrariesFor(kpt);