diff options
author | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-03-10 09:46:40 +0200 |
---|---|---|
committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-03-16 13:43:57 +0000 |
commit | 7c9fe368de133a6b4e256392e0db0d6c3dc1cf9a (patch) | |
tree | e2462fe843cb8ed41c1261fed07cb8713a5d48e1 /src/imports/networksettings | |
parent | c6b5855b446c73f8a60cc3d4427fc445e0ba400d (diff) |
Use qmlRegisterSingletonType instead of setContextProperty in plugins
Change-Id: Ib6c6c7bc5e5e1db005dd43222163fceb50c8894a
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'src/imports/networksettings')
-rw-r--r-- | src/imports/networksettings/plugin.cpp | 20 | ||||
-rw-r--r-- | src/imports/networksettings/plugin.h | 1 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp index eeee147..ab81e31 100644 --- a/src/imports/networksettings/plugin.cpp +++ b/src/imports/networksettings/plugin.cpp @@ -43,6 +43,13 @@ #include <QQmlEngine> #include <QQmlContext> +template <typename T> +QObject *instance(QQmlEngine *engine, QJSEngine *) { + T *t = new T(engine); + t->setObjectName(T::staticMetaObject.className()); + return t; +} + void NetworksettingspluginPlugin::registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.network")); @@ -52,16 +59,7 @@ void NetworksettingspluginPlugin::registerTypes(const char *uri) qmlRegisterUncreatableType<QNetworkSettingsProxy>(uri, 1, 0, "NetworkSettingsProxy", "Cannot be instantiated directly."); qmlRegisterUncreatableType<QNetworkSettingsType>(uri, 1, 0, "NetworkSettingsType", "Cannot be instantiated directly."); qmlRegisterUncreatableType<QNetworkSettingsState>(uri, 1, 0, "NetworkSettingsState", "Cannot be instantiated directly."); -} - - -void NetworksettingspluginPlugin::initializeEngine(QQmlEngine * engine, const char * uri) -{ - Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.network")); - QNetworkSettingsManager* networkManager = new QNetworkSettingsManager(engine); - QNetworkSettingsUserAgent* userAgent = new QNetworkSettingsUserAgent(engine); - networkManager->setUserAgent(userAgent); - engine->rootContext()->setContextProperty("NetworkSettingsManager", networkManager); - engine->rootContext()->setContextProperty("NetworkSettingsUserAgent", userAgent); + qmlRegisterSingletonType<QNetworkSettingsManager>(uri, 1, 0, "NetworkSettingsManager", &instance<QNetworkSettingsManager>); + qmlRegisterSingletonType<QNetworkSettingsUserAgent>(uri, 1, 0, "NetworkSettingsUserAgent", &instance<QNetworkSettingsUserAgent>); } diff --git a/src/imports/networksettings/plugin.h b/src/imports/networksettings/plugin.h index f47b964..40e02e2 100644 --- a/src/imports/networksettings/plugin.h +++ b/src/imports/networksettings/plugin.h @@ -45,7 +45,6 @@ class NetworksettingspluginPlugin : public QQmlExtensionPlugin public: void registerTypes(const char *uri); - void initializeEngine(QQmlEngine * engine, const char * uri); }; #endif // NETWORKSETTINGSPLUGIN_PLUGIN_H |