comparison plugin/PluginScan.h @ 1527:710e6250a401 zoom

Merge from default branch

 #include <QStringList>
 #include <QMutex>
 #include <vector>
 #include <map>
 
-class KnownPlugins;
+#ifdef HAVE_PLUGIN_CHECKER_HELPER
+#include "checker/knownplugincandidates.h"
+#else
+class KnownPluginCandidates {};
+#endif
 
 class PluginScan
 {
 public:
     static PluginScan *getInstance();

      * logic was added.
      */
     bool scanSucceeded() const;
     
     enum PluginType {
-	VampPlugin,
-	LADSPAPlugin,
-	DSSIPlugin
+        VampPlugin,
+        LADSPAPlugin,
+        DSSIPlugin
     };
     struct Candidate {
         QString libraryPath;    // full path, not just soname
         QString helperTag;      // identifies the helper that found it
                                 // (see HelperExecPath) 

     PluginScan();
     ~PluginScan();
 
     void clear();
 
+#ifdef HAVE_PLUGIN_CHECKER_HELPER
+    QString formatFailureReport(QString helperTag,
+                                std::vector<PluginCandidates::FailureRec>)
+        const;
+#endif
+
     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;
     Logger *m_logger;
 };