Mercurial > hg > svcore
comparison plugin/PluginScan.cpp @ 1474:dcff44a76573 plugin-path-config
Update for checker API change
author | Chris Cannam |
---|---|
date | Wed, 06 Jun 2018 15:55:34 +0100 |
parents | 48e9f538e6e9 |
children | 0ee87bc10cdc |
comparison
equal
deleted
inserted
replaced
1473:f52bf66b9096 | 1474:dcff44a76573 |
---|---|
17 #include "base/Debug.h" | 17 #include "base/Debug.h" |
18 #include "base/Preferences.h" | 18 #include "base/Preferences.h" |
19 #include "base/HelperExecPath.h" | 19 #include "base/HelperExecPath.h" |
20 | 20 |
21 #ifdef HAVE_PLUGIN_CHECKER_HELPER | 21 #ifdef HAVE_PLUGIN_CHECKER_HELPER |
22 #include "checker/knownplugins.h" | 22 #include "checker/knownplugincandidates.h" |
23 #else | 23 #else |
24 class KnownPlugins {}; | 24 class KnownPluginCandidates {}; |
25 #endif | 25 #endif |
26 | 26 |
27 #include <QMutex> | 27 #include <QMutex> |
28 #include <QCoreApplication> | 28 #include <QCoreApplication> |
29 | 29 |
90 } | 90 } |
91 } | 91 } |
92 | 92 |
93 for (auto p: helpers) { | 93 for (auto p: helpers) { |
94 try { | 94 try { |
95 KnownPlugins *kp = new KnownPlugins | 95 KnownPluginCandidates *kp = new KnownPluginCandidates |
96 (p.executable.toStdString(), m_logger); | 96 (p.executable.toStdString(), m_logger); |
97 if (m_kp.find(p.tag) != m_kp.end()) { | 97 if (m_kp.find(p.tag) != m_kp.end()) { |
98 SVDEBUG << "WARNING: PluginScan::scan: Duplicate tag " << p.tag | 98 SVDEBUG << "WARNING: PluginScan::scan: Duplicate tag " << p.tag |
99 << " for helpers" << endl; | 99 << " for helpers" << endl; |
100 continue; | 100 continue; |
149 | 149 |
150 QList<Candidate> candidates; | 150 QList<Candidate> candidates; |
151 | 151 |
152 for (auto rec: m_kp) { | 152 for (auto rec: m_kp) { |
153 | 153 |
154 KnownPlugins *kp = rec.second; | 154 KnownPluginCandidates *kp = rec.second; |
155 | 155 |
156 auto c = kp->getCandidateLibrariesFor(kpt); | 156 auto c = kp->getCandidateLibrariesFor(kpt); |
157 | 157 |
158 SVDEBUG << "PluginScan: helper \"" << kp->getHelperExecutableName() | 158 SVDEBUG << "PluginScan: helper \"" << kp->getHelperExecutableName() |
159 << "\" likes " << c.size() << " libraries of type " | 159 << "\" likes " << c.size() << " libraries of type " |