QtQml: Refactor plugin loading into a separate class

The methods that load the plugins were suffering from an excessive
number of parameters, and were dispersed across several classes.
Concentrating them in one place and transforming all the parameters into
members makes the code more readable and easier to extend.

Pick-to: 6.2
Change-Id: I67e4f49567ad37363a0f38d8f7773de863856554
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 4 insertions, 14 deletions

diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h
index 7a8e1f9dd4..33f5eaf04a 100644
--- a/src/qml/qml/qqmlimport_p.h
+++ b/src/qml/qml/qqmlimport_p.h
@@ -228,9 +228,6 @@ public:
     QQmlImportDatabase(QQmlEngine *);
     ~QQmlImportDatabase();
 
-    QTypeRevision importDynamicPlugin(
-            const QString &filePath, const QString &uri, const QString &importNamespace,
-            QTypeRevision version, bool isOptional, QList<QQmlError> *errors);
     bool removeDynamicPlugin(const QString &filePath);
     QStringList dynamicPlugins() const;
 
@@ -242,20 +239,13 @@ public:
     void setPluginPathList(const QStringList &paths);
     void addPluginPath(const QString& path);
 
-    QString resolvePlugin(QQmlTypeLoader *typeLoader,
-                          const QString &qmldirPath, const QString &qmldirPluginPath,
-                          const QString &baseName) const;
+    static QTypeRevision lockModule(const QString &uri, const QString &typeNamespace,
+                                    QTypeRevision version, QList<QQmlError> *errors);
+
 private:
     friend class QQmlImportsPrivate;
-    QString resolvePlugin(QQmlTypeLoader *typeLoader,
-                          const QString &qmldirPath, const QString &qmldirPluginPath,
-                          const QString &baseName, const QStringList &suffixes,
-                          const QString &prefix = QString()) const;
-    QTypeRevision importStaticPlugin(
-            QObject *instance, const QString &basePath, const QString &uri,
-            const QString &typeNamespace, QTypeRevision version, QList<QQmlError> *errors);
+    friend class QQmlPluginImporter;
     void clearDirCache();
-    void finalizePlugin(QObject *instance, const QString &path, const QString &uri);
 
     struct QmldirCache {
         QTypeRevision version;