Update lyric tool

Author: SineStriker

libs/qtmediate

@@ -76,6 +76,11 @@ namespace IEMgr {
         return true;
     }
 
+    IWizard *WizardManager::wizard(const QString &id) const {
+        Q_D(const WizardManager);
+        return d->importWizards.value(id);
+    }
+
     QList<IWizard *> WizardManager::wizards() const {
         Q_D(const WizardManager);
         return d->importWizards.values_qlist();

scripts/vcpkg

@@ -23,6 +23,7 @@ namespace IEMgr {
         bool addWizard(IWizard *factory);
         bool removeWizard(IWizard *factory);
         bool removeWizard(const QString &id);
+        IWizard *wizard(const QString &id) const;
         QList<IWizard *> wizards() const;
         void clearWizards();
 

src/plugins/iemgr/core/wizardmanager.cpp

@@ -1,29 +1,43 @@
 #include "charsetanalyzer.h"
+#include "charsetanalyzer_p.h"
 
-#include <qrandom.h>
+#include <QtCore/QRandomGenerator>
 
 namespace LyricTool {
+
+    CharsetAnalyzerPrivate::CharsetAnalyzerPrivate() {
+    }
+
+    void CharsetAnalyzerPrivate::init() {
+    }
+
     CharsetAnalyzer::CharsetAnalyzer(const QString &id, QObject *parent)
-        : ILanguageAnalyzer(id, parent) {
+        : CharsetAnalyzer(*new CharsetAnalyzerPrivate(), id, parent) {
     }
 
     void CharsetAnalyzer::loadDict() {
     }
 
     bool CharsetAnalyzer::contains(QChar c) const {
-        return m_charset.contains(c);
+        Q_D(const CharsetAnalyzer);
+        return d->charset.contains(c);
     }
 
     QString CharsetAnalyzer::randString() const {
-        if (m_charset.isEmpty()) {
-            return "";
+        Q_D(const CharsetAnalyzer);
+        if (d->charset.isEmpty()) {
+            return {};
         }
 
-        const int randomIndex = QRandomGenerator::global()->bounded(m_charset.size());
-        auto it = m_charset.begin();
+        const int randomIndex = QRandomGenerator::global()->bounded(d->charset.size());
+        auto it = d->charset.begin();
         std::advance(it, randomIndex);
-
         return *it;
     }
 
+    CharsetAnalyzer::CharsetAnalyzer(CharsetAnalyzerPrivate &d, const QString &id, QObject *parent)
+        : ILanguageAnalyzer(d, id, parent) {
+        d.init();
+    }
+
 }

src/plugins/iemgr/core/wizardmanager.h

@@ -6,19 +6,21 @@
 
 namespace LyricTool {
 
-    class LYRICTOOL_EXPORT CharsetAnalyzer : public LyricTool::ILanguageAnalyzer {
+    class CharsetAnalyzerPrivate;
+
+    class LYRICTOOL_EXPORT CharsetAnalyzer : public ILanguageAnalyzer {
         Q_OBJECT
+        Q_DECLARE_PRIVATE(CharsetAnalyzer)
     public:
         CharsetAnalyzer(const QString &id, QObject *parent = nullptr);
 
         virtual void loadDict();
 
         bool contains(QChar c) const override;
-
         QString randString() const override;
 
     protected:
-        QSet<QChar> m_charset;
+        CharsetAnalyzer(CharsetAnalyzerPrivate &d, const QString &id, QObject *parent = nullptr);
     };
 
 }

src/plugins/lyrictool/core/lang/charsetanalyzer.cpp

@@ -0,0 +1,23 @@
+#ifndef CHARSETANALYZER_P_H
+#define CHARSETANALYZER_P_H
+
+#include <QtCore/QSet>
+
+#include <lyrictool/charsetanalyzer.h>
+#include <lyrictool/private/ilanguageanalyzer_p.h>
+
+namespace LyricTool {
+
+    class CharsetAnalyzerPrivate : public ILanguageAnalyzerPrivate {
+        Q_DECLARE_PUBLIC(CharsetAnalyzer)
+    public:
+        CharsetAnalyzerPrivate();
+
+        void init();
+
+        QSet<QChar> charset;
+    };
+
+}
+
+#endif // CHARSETANALYZER_P_H

src/plugins/lyrictool/core/lang/charsetanalyzer.h

@@ -30,7 +30,7 @@ namespace LyricTool {
         int depth = 0;
     };
 
-    class LYRICTOOL_EXPORT DictAnalyzer : public LyricTool::ILanguageAnalyzer {
+    class LYRICTOOL_EXPORT DictAnalyzer : public ILanguageAnalyzer {
         Q_OBJECT
     public:
         DictAnalyzer(const QString &id, QObject *parent = nullptr);

src/plugins/lyrictool/core/lang/charsetanalyzer_p.h

@@ -0,0 +1,5 @@
+#ifndef DICTANALYZER_P_H
+#define DICTANALYZER_P_H
+
+
+#endif // DICTANALYZER_P_H

src/plugins/lyrictool/core/lang/dictanalyzer.h

@@ -0,0 +1,5 @@
+#ifndef MULTICHARANALYZER_P_H
+#define MULTICHARANALYZER_P_H
+
+
+#endif // MULTICHARANALYZER_P_H