From a9be2d378b7ad84e679a48efa81f42fb54f85d9a Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Wed, 15 Jul 2015 15:37:57 -0700 Subject: Drop release v2.6.0+no-stlport Bug 246391 Change-Id: I662b7b0f90c97cb169978e1b64ad1fe32c440cf5 Signed-off-by: Jean-Michel Trivi --- parameter/include/ParameterMgrFullConnector.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'parameter/include') diff --git a/parameter/include/ParameterMgrFullConnector.h b/parameter/include/ParameterMgrFullConnector.h index 31022a6..4ee3b4f 100644 --- a/parameter/include/ParameterMgrFullConnector.h +++ b/parameter/include/ParameterMgrFullConnector.h @@ -215,11 +215,28 @@ public: /** * Method that imports a single Configurable Domain from an Xml source. * - * @param[in] strXmlSource a string containing an xml description or a path to an xml file - * @param[in] bWithSettings a boolean that determines if the settings should be used in the + * @param[in] xmlSource a string containing an xml description or a path to an xml file + * @param[in] overwrite when importing an existing domain, allow overwriting or return an + * error + * @param[in] withSettings a boolean that determines if the settings should be used in the * xml description - * @param[in] bFromFile a boolean that determines if the source is an xml description in + * @param[in] fromFile a boolean that determines if the source is an xml description in * strXmlSource or contained in a file. In that case strXmlSource is just the file path. + * @param[out] errorMsg is used as the error output + * + * @return false if any error occurs + */ + bool importSingleDomainXml(const std::string& xmlSource, bool overwrite, bool withSettings, + bool toFile, std::string& errorMsg); + /** + * Method that imports a single Configurable Domain from an string + * describing an Xml source. + * + * @deprecated use the other versions of importSingleDomainXml instead + * + * @param[in] strXmlSource a string containing an xml description + * @param[in] bOverwrite when importing an existing domain, allow overwriting or return an + * error * @param[out] strError is used as the error output * * @return false if any error occurs -- cgit v1.1