diff options
Diffstat (limited to 'common/resource.cpp')
-rw-r--r-- | common/resource.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/resource.cpp b/common/resource.cpp index f4c2ad4..db64d33 100644 --- a/common/resource.cpp +++ b/common/resource.cpp | |||
@@ -80,7 +80,7 @@ ResourceFactory::~ResourceFactory() | |||
80 | // delete d; | 80 | // delete d; |
81 | } | 81 | } |
82 | 82 | ||
83 | ResourceFactory *ResourceFactory::load(const QString &resourceName) | 83 | ResourceFactory *ResourceFactory::load(const QByteArray &resourceName) |
84 | { | 84 | { |
85 | ResourceFactory *factory = Private::s_loadedFactories.value(resourceName); | 85 | ResourceFactory *factory = Private::s_loadedFactories.value(resourceName); |
86 | if (factory) { | 86 | if (factory) { |
@@ -106,8 +106,9 @@ ResourceFactory *ResourceFactory::load(const QString &resourceName) | |||
106 | factory = qobject_cast<ResourceFactory *>(object); | 106 | factory = qobject_cast<ResourceFactory *>(object); |
107 | if (factory) { | 107 | if (factory) { |
108 | Private::s_loadedFactories.insert(resourceName, factory); | 108 | Private::s_loadedFactories.insert(resourceName, factory); |
109 | factory->registerFacades(FacadeFactory::instance()); | 109 | //TODO: Instead of always loading both facades and adaptorfactories into the respective singletons, we could also leave this up to the caller. (ResourceFactory::loadFacades(...)) |
110 | factory->registerAdaptorFactories(AdaptorFactoryRegistry::instance()); | 110 | factory->registerFacades(resourceName, FacadeFactory::instance()); |
111 | factory->registerAdaptorFactories(resourceName, AdaptorFactoryRegistry::instance()); | ||
111 | // TODO: if we need more data on it const QJsonObject json = loader.metaData()[QStringLiteral("MetaData")].toObject(); | 112 | // TODO: if we need more data on it const QJsonObject json = loader.metaData()[QStringLiteral("MetaData")].toObject(); |
112 | return factory; | 113 | return factory; |
113 | } else { | 114 | } else { |