Mercurial > hg > svcore
changeset 1474:dcff44a76573 plugin-path-config
Update for checker API change
| author | Chris Cannam |
|---|---|
| date | Wed, 06 Jun 2018 15:55:34 +0100 |
| parents | f52bf66b9096 |
| children | bd1a2cacd1e7 |
| files | plugin/PluginScan.cpp plugin/PluginScan.h |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/plugin/PluginScan.cpp Mon Jun 04 15:43:27 2018 +0100 +++ b/plugin/PluginScan.cpp Wed Jun 06 15:55:34 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);
--- a/plugin/PluginScan.h Mon Jun 04 15:43:27 2018 +0100 +++ b/plugin/PluginScan.h Wed Jun 06 15:55:34 2018 +0100 @@ -20,7 +20,7 @@ #include <vector> #include <map> -class KnownPlugins; +class KnownPluginCandidates; class PluginScan { @@ -75,7 +75,7 @@ mutable QMutex m_mutex; // while scanning; definitely can't multi-thread this - std::map<QString, KnownPlugins *> m_kp; // tag -> KnownPlugins client + std::map<QString, KnownPluginCandidates *> m_kp; // tag -> KnownPlugins client bool m_succeeded; class Logger;