diff options
| author | David Wagner <david.wagner@intel.com> | 2014-12-10 14:49:23 +0100 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2015-01-22 11:53:52 +0100 |
| commit | d8a53107d5f965c8ca406ee95f5999efd6694730 (patch) | |
| tree | 26656386d16a6f260fb1ecc79ce20e6e96f595f3 /parameter/ParameterMgr.cpp | |
| parent | 29fa61fc5bc02f72f99e66ad50e4de8cb6b8490b (diff) | |
| download | external_parameter-framework-d8a53107d5f965c8ca406ee95f5999efd6694730.zip external_parameter-framework-d8a53107d5f965c8ca406ee95f5999efd6694730.tar.gz external_parameter-framework-d8a53107d5f965c8ca406ee95f5999efd6694730.tar.bz2 | |
Pass the SystemClass as deserialization context for Domains
This allows diminishing the dependency on the parent element when creating a
Domain element from an XML document: the parent was used to get a handle to the
system class in order to check the existence of ConfigurableElements included
in the Domain.
Change-Id: Icba7c3c4db2b9728c0fb7c6840a254de9775f6a4
Signed-off-by: David Wagner <david.wagner@intel.com>
Diffstat (limited to 'parameter/ParameterMgr.cpp')
| -rw-r--r-- | parameter/ParameterMgr.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/parameter/ParameterMgr.cpp b/parameter/ParameterMgr.cpp index 749aacd..8a6adf0 100644 --- a/parameter/ParameterMgr.cpp +++ b/parameter/ParameterMgr.cpp @@ -622,7 +622,8 @@ bool CParameterMgr::loadSettingsFromConfigFile(string& strError) string strXmlConfigurationDomainsFolder = pConfigurableDomainsFileLocation->getFolderPath(_strXmlConfigurationFolderPath); // Parse configuration domains XML file (ask to read settings from XML file if they are not provided as binary) - CXmlDomainImportContext xmlDomainImportContext(strError, !pBinarySettingsFileLocation); + CXmlDomainImportContext xmlDomainImportContext(strError, !pBinarySettingsFileLocation, + *getSystemClass()); // Selection criteria definition for rule creation xmlDomainImportContext.setSelectionCriteriaDefinition(getConstSelectionCriteria()->getSelectionCriteriaDefinition()); @@ -2011,7 +2012,7 @@ bool CParameterMgr::importDomainsXml(const string& strXmlSource, bool bWithSetti CConfigurableDomains* pConfigurableDomains = getConfigurableDomains(); // Context - CXmlDomainImportContext xmlDomainImportContext(strError, bWithSettings); + CXmlDomainImportContext xmlDomainImportContext(strError, bWithSettings, *getSystemClass()); // Selection criteria definition for rule creation xmlDomainImportContext.setSelectionCriteriaDefinition( |