Q*FActory: remove unused path arguments

Cargo-culted from somewhere but not used in any of these classes. This
just made the code bigger for no reason.

Task-number: QTBUG-97950
Change-Id: Ice04365c72984d07a64dfffd16b48632888ed664
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 0158a3ddfb1ad367c0b969ffa72caa18cee322fd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

10 files changed, 23 insertions, 184 deletions

diff --git a/src/input/frontend/qinputdeviceintegrationfactory.cpp b/src/input/frontend/qinputdeviceintegrationfactory.cpp
index 221965a5f..2435c3904 100644
--- a/src/input/frontend/qinputdeviceintegrationfactory.cpp
+++ b/src/input/frontend/qinputdeviceintegrationfactory.cpp
@@ -51,47 +51,14 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DInput {
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QInputDevicePlugin_iid, QLatin1String("/3dinputdevices"), Qt::CaseInsensitive))
-#if QT_CONFIG(library)
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QInputDevicePlugin_iid, QLatin1String(""), Qt::CaseInsensitive))
-#endif
 
-QStringList QInputDeviceIntegrationFactory::keys(const QString &pluginPath)
+QStringList QInputDeviceIntegrationFactory::keys()
 {
-    QStringList list;
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        list = directLoader()->keyMap().values();
-        if (!list.isEmpty()) {
-            const QString postFix = QStringLiteral(" (from ")
-                    + QDir::toNativeSeparators(pluginPath)
-                    + QLatin1Char(')');
-            const QStringList::iterator end = list.end();
-            for (QStringList::iterator it = list.begin(); it != end; ++it)
-                (*it).append(postFix);
-        }
-#else
-    qWarning() << QInputDeviceIntegration::tr("Cannot query QInputDeviceIntegration plugins at %1. "
-                                              "Library loading is disabled.").arg(pluginPath);
-#endif
-    }
-    list.append(loader()->keyMap().values());
-    return list;
+    return loader->keyMap().values();
 }
 
-QInputDeviceIntegration *QInputDeviceIntegrationFactory::create(const QString &name, const QStringList &args, const QString &pluginPath)
+QInputDeviceIntegration *QInputDeviceIntegrationFactory::create(const QString &name, const QStringList &args)
 {
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        if (QInputDeviceIntegration *ret = qLoadPlugin<QInputDeviceIntegration, QInputDevicePlugin>(directLoader(), name, args))
-            return ret;
-#else
-        qWarning() << QInputDeviceIntegration::tr("Cannot load QInputDeviceIntegration plugin from "
-                                                  "%1. Library loading is disabled.")
-                      .arg(pluginPath);
-#endif
-    }
     return qLoadPlugin<QInputDeviceIntegration, QInputDevicePlugin>(loader(), name, args);
 }
 
diff --git a/src/input/frontend/qinputdeviceintegrationfactory_p.h b/src/input/frontend/qinputdeviceintegrationfactory_p.h
index e3d775932..417aa1c47 100644
--- a/src/input/frontend/qinputdeviceintegrationfactory_p.h
+++ b/src/input/frontend/qinputdeviceintegrationfactory_p.h
@@ -63,8 +63,8 @@ class QInputDeviceIntegration;
 class QInputDeviceIntegrationFactory
 {
 public:
-    static QStringList keys(const QString &pluginPath = QString());
-    static QInputDeviceIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
+    static QStringList keys();
+    static QInputDeviceIntegration *create(const QString &name, const QStringList &args);
 };
 
 } // Qt3DInput
diff --git a/src/render/frontend/qrenderpluginfactory.cpp b/src/render/frontend/qrenderpluginfactory.cpp
index f842e651d..25c97cd23 100644
--- a/src/render/frontend/qrenderpluginfactory.cpp
+++ b/src/render/frontend/qrenderpluginfactory.cpp
@@ -52,45 +52,14 @@ namespace Qt3DRender {
 namespace Render {
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QRenderPluginFactoryInterface_iid, QLatin1String("/renderplugins"), Qt::CaseInsensitive))
-#if QT_CONFIG(library)
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QRenderPluginFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
-#endif
 
-QStringList QRenderPluginFactory::keys(const QString &pluginPath)
+QStringList QRenderPluginFactory::keys()
 {
-#if QT_CONFIG(library)
-    QStringList list;
-    if (!pluginPath.isEmpty()) {
-        QCoreApplication::addLibraryPath(pluginPath);
-        list = directLoader()->keyMap().values();
-        if (!list.isEmpty()) {
-            const QString postFix = QLatin1String(" (from ")
-                    + QDir::toNativeSeparators(pluginPath)
-                    + QLatin1Char(')');
-            const QStringList::iterator end = list.end();
-            for (QStringList::iterator it = list.begin(); it != end; ++it)
-                (*it).append(postFix);
-        }
-    }
-    list.append(loader()->keyMap().values());
-    return list;
-#else
     return loader()->keyMap().values();
-#endif
 }
 
-QRenderPlugin *QRenderPluginFactory::create(const QString &name, const QStringList &args,
-                                            const QString &pluginPath)
+QRenderPlugin *QRenderPluginFactory::create(const QString &name, const QStringList &args)
 {
-#if QT_CONFIG(library)
-    if (!pluginPath.isEmpty()) {
-        QCoreApplication::addLibraryPath(pluginPath);
-        if (QRenderPlugin *ret
-                = qLoadPlugin<QRenderPlugin, QRenderPluginFactoryIf>(directLoader(), name, args)) {
-            return ret;
-        }
-    }
-#endif
     return qLoadPlugin<QRenderPlugin, QRenderPluginFactoryIf>(loader(), name, args);
 }
 
diff --git a/src/render/frontend/qrenderpluginfactory_p.h b/src/render/frontend/qrenderpluginfactory_p.h
index 3f56be8ae..20f965012 100644
--- a/src/render/frontend/qrenderpluginfactory_p.h
+++ b/src/render/frontend/qrenderpluginfactory_p.h
@@ -65,9 +65,8 @@ class QRenderPlugin;
 class Q_3DRENDERSHARED_PRIVATE_EXPORT QRenderPluginFactory
 {
 public:
-    static QStringList keys(const QString &pluginPath = QString());
-    static QRenderPlugin *create(const QString &name, const QStringList &args,
-                                 const QString &pluginPath = QString());
+    static QStringList keys();
+    static QRenderPlugin *create(const QString &name, const QStringList &args);
 };
 
 } // namespace Render
diff --git a/src/render/io/qsceneexportfactory.cpp b/src/render/io/qsceneexportfactory.cpp
index 10db614f4..e87896ff3 100644
--- a/src/render/io/qsceneexportfactory.cpp
+++ b/src/render/io/qsceneexportfactory.cpp
@@ -51,45 +51,14 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QSceneExportFactoryInterface_iid, QLatin1String("/sceneparsers"), Qt::CaseInsensitive))
-#if QT_CONFIG(library)
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QSceneExportFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
-#endif
 
-QStringList QSceneExportFactory::keys(const QString &pluginPath)
+QStringList QSceneExportFactory::keys()
 {
-#if QT_CONFIG(library)
-    QStringList list;
-    if (!pluginPath.isEmpty()) {
-        QCoreApplication::addLibraryPath(pluginPath);
-        list = directLoader()->keyMap().values();
-        if (!list.isEmpty()) {
-            const QString postFix = QLatin1String(" (from ")
-                    + QDir::toNativeSeparators(pluginPath)
-                    + QLatin1Char(')');
-            const QStringList::iterator end = list.end();
-            for (QStringList::iterator it = list.begin(); it != end; ++it)
-                (*it).append(postFix);
-        }
-    }
-    list.append(loader()->keyMap().values());
-    return list;
-#else
     return loader()->keyMap().values();
-#endif
 }
 
-QSceneExporter *QSceneExportFactory::create(const QString &name, const QStringList &args,
-                                            const QString &pluginPath)
+QSceneExporter *QSceneExportFactory::create(const QString &name, const QStringList &args)
 {
-#if QT_CONFIG(library)
-    if (!pluginPath.isEmpty()) {
-        QCoreApplication::addLibraryPath(pluginPath);
-        if (QSceneExporter *ret = qLoadPlugin<QSceneExporter,
-                QSceneExportPlugin>(directLoader(), name, args)) {
-            return ret;
-        }
-    }
-#endif
     return qLoadPlugin<QSceneExporter, QSceneExportPlugin>(loader(), name, args);
 }
 
diff --git a/src/render/io/qsceneexportfactory_p.h b/src/render/io/qsceneexportfactory_p.h
index fbb278ebe..2a0d29155 100644
--- a/src/render/io/qsceneexportfactory_p.h
+++ b/src/render/io/qsceneexportfactory_p.h
@@ -64,9 +64,8 @@ class QSceneExporter;
 class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneExportFactory
 {
 public:
-    static QStringList keys(const QString &pluginPath = QString());
-    static QSceneExporter *create(const QString &name, const QStringList &args,
-                                  const QString &pluginPath = QString());
+    static QStringList keys();
+    static QSceneExporter *create(const QString &name, const QStringList &args);
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/io/qsceneimportfactory.cpp b/src/render/io/qsceneimportfactory.cpp
index 587722a35..afcd2a3a6 100644
--- a/src/render/io/qsceneimportfactory.cpp
+++ b/src/render/io/qsceneimportfactory.cpp
@@ -50,46 +50,14 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QSceneImportFactoryInterface_iid, QLatin1String("/sceneparsers"), Qt::CaseInsensitive))
-#ifndef QT_NO_LIBRARY
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QSceneImportFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
-#endif
 
-QStringList QSceneImportFactory::keys(const QString &pluginPath)
+QStringList QSceneImportFactory::keys()
 {
-    QStringList list;
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        list = directLoader()->keyMap().values();
-        if (!list.isEmpty()) {
-            const QString postFix = QLatin1String(" (from ")
-                    + QDir::toNativeSeparators(pluginPath)
-                    + QLatin1Char(')');
-            const QStringList::iterator end = list.end();
-            for (QStringList::iterator it = list.begin(); it != end; ++it)
-                (*it).append(postFix);
-        }
-#else
-        qWarning() << QSceneImporter::tr("Cannot query QSceneImporter plugins at %1. "
-                                         "Library loading is disabled.").arg(pluginPath);
-#endif
-    }
-    list.append(loader()->keyMap().values());
-    return list;
+    return loader->keyMap().values();
 }
 
-QSceneImporter *QSceneImportFactory::create(const QString &name, const QStringList &args, const QString &pluginPath)
+QSceneImporter *QSceneImportFactory::create(const QString &name, const QStringList &args)
 {
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        if (QSceneImporter *ret = qLoadPlugin<QSceneImporter, QSceneImportPlugin>(directLoader(), name, args))
-            return ret;
-#else
-        qWarning() << QSceneImporter::tr("Cannot load QSceneImporter plugin from %1. "
-                                         "Library loading is disabled.").arg(pluginPath);
-#endif
-    }
     return qLoadPlugin<QSceneImporter, QSceneImportPlugin>(loader(), name, args);
 }
 
diff --git a/src/render/io/qsceneimportfactory_p.h b/src/render/io/qsceneimportfactory_p.h
index 8409ea96d..09b609de1 100644
--- a/src/render/io/qsceneimportfactory_p.h
+++ b/src/render/io/qsceneimportfactory_p.h
@@ -63,8 +63,8 @@ class QSceneImporter;
 class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneImportFactory
 {
 public:
-    static QStringList keys(const QString &pluginPath = QString());
-    static QSceneImporter *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
+    static QStringList keys();
+    static QSceneImporter *create(const QString &name, const QStringList &args);
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/qrendererpluginfactory.cpp b/src/render/qrendererpluginfactory.cpp
index 1c0fd2b33..76f4b01d7 100644
--- a/src/render/qrendererpluginfactory.cpp
+++ b/src/render/qrendererpluginfactory.cpp
@@ -52,46 +52,14 @@ namespace Qt3DRender {
 namespace Render {
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QRendererPluginFactoryInterface_iid, QLatin1String("/renderers"), Qt::CaseInsensitive))
-#ifndef QT_NO_LIBRARY
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QRendererPluginFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
-#endif
 
-QStringList QRendererPluginFactory::keys(const QString &pluginPath)
+QStringList QRendererPluginFactory::keys()
 {
-    QStringList list;
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        list = directLoader()->keyMap().values();
-        if (!list.isEmpty()) {
-            const QString postFix = QLatin1String(" (from ")
-                    + QDir::toNativeSeparators(pluginPath)
-                    + QLatin1Char(')');
-            const QStringList::iterator end = list.end();
-            for (QStringList::iterator it = list.begin(); it != end; ++it)
-                (*it).append(postFix);
-        }
-#else
-        qWarning() << QObject::tr("Cannot query QRendererPlugin plugins at %1. "
-                                  "Library loading is disabled.").arg(pluginPath);
-#endif
-    }
-    list.append(loader()->keyMap().values());
-    return list;
+    return loader->keyMap().values();
 }
 
-AbstractRenderer *QRendererPluginFactory::create(const QString &name, const QString &pluginPath)
+AbstractRenderer *QRendererPluginFactory::create(const QString &name)
 {
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        if (AbstractRenderer *ret = qLoadPlugin<AbstractRenderer, QRendererPlugin>(directLoader(), name))
-            return ret;
-#else
-        qWarning() << QObject::tr("Cannot load QRendererPlugin plugin from %1. "
-                                  "Library loading is disabled.").arg(pluginPath);
-#endif
-    }
     return qLoadPlugin<AbstractRenderer, QRendererPlugin>(loader(), name);
 }
 
diff --git a/src/render/qrendererpluginfactory_p.h b/src/render/qrendererpluginfactory_p.h
index 2088a8c8e..92bd02426 100644
--- a/src/render/qrendererpluginfactory_p.h
+++ b/src/render/qrendererpluginfactory_p.h
@@ -66,8 +66,8 @@ class AbstractRenderer;
 class Q_3DRENDERSHARED_PRIVATE_EXPORT QRendererPluginFactory
 {
 public:
-    static QStringList keys(const QString &pluginPath = QString());
-    static AbstractRenderer *create(const QString &name, const QString &pluginPath = QString());
+    static QStringList keys();
+    static AbstractRenderer *create(const QString &name);
 };
 
 } // Render