diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-01-05 01:06:50 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-01-05 10:28:27 +0000 |
| commit | 8b2f133822a22379cbbaa33fe600c30b95dc0044 (patch) | |
| tree | 7721d5e73a6810f27565e6f8b4d509448779a029 /src/gui/kernel/qgenericpluginfactory.cpp | |
| parent | 32bd53c6b10b505a32d2940f9c0c8a7d3e85abf3 (diff) | |
QFactoryLoader: generalize qLoadPlugin()
- Use perfect forwarding for the additional argument.
- Provide a variadic template version
- Deprecate qLoadPlugin1() — there's no reason for a different name
— and fix all callers in qtbase.
- Provide non-variadic overloads for up to three additional args
(QPlatformIntegration rolled its own function because it needs
three args).
Change-Id: I72fb2dd9a021de704cbf5e4b6ea31c80447fb3b1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qgenericpluginfactory.cpp')
| -rw-r--r-- | src/gui/kernel/qgenericpluginfactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qgenericpluginfactory.cpp b/src/gui/kernel/qgenericpluginfactory.cpp index d7b9bfba06..15fa094f54 100644 --- a/src/gui/kernel/qgenericpluginfactory.cpp +++ b/src/gui/kernel/qgenericpluginfactory.cpp @@ -71,7 +71,7 @@ QObject *QGenericPluginFactory::create(const QString& key, const QString &specif { #if (!defined(Q_OS_WIN32) || defined(QT_SHARED)) && !defined(QT_NO_LIBRARY) const QString driver = key.toLower(); - if (QObject *object = qLoadPlugin1<QObject, QGenericPlugin>(loader(), driver, specification)) + if (QObject *object = qLoadPlugin<QObject, QGenericPlugin>(loader(), driver, specification)) return object; #else // (!Q_OS_WIN32 || QT_SHARED) && !QT_NO_LIBRARY Q_UNUSED(key) |