merge patched into master

1 files changed, 7 insertions, 6 deletions

diff --git a/plugins/PluginLoader/catchcopy-v0002/pluginLoader.h b/plugins/PluginLoader/catchcopy-v0002/pluginLoader.h
index 0246cd1..d18248d 100644
--- a/plugins/PluginLoader/catchcopy-v0002/pluginLoader.h
+++ b/plugins/PluginLoader/catchcopy-v0002/pluginLoader.h
@@ -8,6 +8,7 @@
 
 #include <QObject>
 #include <QMessageBox>
+#include <unordered_set>
 
 #include <QString>
 #include <QStringList>
@@ -29,7 +30,7 @@
 class WindowsExplorerLoader : public PluginInterface_PluginLoader
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "first-world.info.ultracopier.PluginInterface.PluginLoader/1.0.0.0" FILE "plugin.json")
+    Q_PLUGIN_METADATA(IID "first-world.info.ultracopier.PluginInterface.PluginLoader/1.2.4.0" FILE "plugin.json")
     Q_INTERFACES(PluginInterface_PluginLoader)
 public:
     WindowsExplorerLoader();
@@ -37,17 +38,17 @@ public:
     /// \brief try enable/disable the catching
     void setEnabled(const bool &needBeRegistred);
     /// \brief to set resources, writePath can be empty if read only mode
-    void setResources(OptionInterface * options,const QString &writePath,const QString &pluginPath,const bool &portableVersion);
+    void setResources(OptionInterface * options,const std::string &writePath,const std::string &pluginPath,const bool &portableVersion);
     /// \brief to get the options widget, NULL if not have
     QWidget * options();
 public slots:
     /// \brief to reload the translation, because the new language have been loaded
     void newLanguageLoaded();
 private:
-    QString pluginPath;
-    QStringList importantDll,secondDll;
-    QSet<QString> correctlyLoaded;
-    bool RegisterShellExtDll(const QString &dllPath, const bool &bRegister,const bool &quiet);
+    std::string pluginPath;
+    std::vector<std::string> importantDll,secondDll;
+    std::unordered_set<std::string> correctlyLoaded;
+    bool RegisterShellExtDll(const std::string &dllPath, const bool &bRegister,const bool &quiet);
     bool checkExistsDll();
     bool dllChecked;
     bool needBeRegistred;