diff plugin/PluginScan.h @ 1242:c401e738793f piper

Merge from branch 3.0-integration

--- a/plugin/PluginScan.h	Fri Oct 28 15:19:12 2016 +0100
+++ b/plugin/PluginScan.h	Tue Nov 01 14:08:57 2016 +0000
@@ -16,6 +16,7 @@
 #define PLUGIN_SCAN_H
 
 #include <QStringList>
+#include <vector>
 
 class KnownPlugins;
 
@@ -24,7 +25,7 @@
 public:
     static PluginScan *getInstance();
 
-    void scan(QString helperExecutablePath);
+    void scan();
 
     bool scanSucceeded() const;
     
@@ -40,7 +41,10 @@
 private:
     PluginScan();
     ~PluginScan();
-    KnownPlugins *m_kp;
+
+    void clear();
+    
+    std::vector<KnownPlugins *> m_kp;
     bool m_succeeded;
 
     class Logger;