From 70e458c1bb62ad39ea9c59339e74e1f7702910ee Mon Sep 17 00:00:00 2001 From: David Wagner Date: Tue, 6 Jan 2015 17:26:59 +0100 Subject: ParameterMgr: make serializeElement and importDomainFromFile private methods There is no need for these method to be public as they are only used internaly. Change-Id: I172257211f35de26c11aaef499f7c847d55ced0b Signed-off-by: David Wagner --- parameter/ParameterMgr.h | 55 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'parameter') diff --git a/parameter/ParameterMgr.h b/parameter/ParameterMgr.h index 5fd41b1..315cf63 100644 --- a/parameter/ParameterMgr.h +++ b/parameter/ParameterMgr.h @@ -282,33 +282,6 @@ public: std::string& strError); /** - * Method that imports a single Configurable Domain, with settings, from an Xml file. - * - * @param[in] strXmlFilePath absolute path to the xml file containing the domain - * @param[out] strError is used as the error output - * - * @return false if any error occurs - */ - bool importDomainFromFile(const std::string& strXmlFilePath, bool bOverwrite, std::string& strError); - - - /** - * Export an element object to an Xml destination. - * - * - * @param[in,out] strXmlDest a string containing an xml description or a path to an xml file. - * @param[in] xmlSerializingContext the serializing context - * @param[in] bToFile a boolean that determines if the destination is an xml description in - * strXmlDest or contained in a file. In that case strXmlDest is just the file path. - * @param[in] element object to be serialized. - * @param[out] strError is used as the error output. - * - * @return false if any error occurs, true otherwise. - */ - bool serializeElement(std::string& strXmlDest, CXmlSerializingContext& xmlSerializingContext, - bool bToFile, const CElement& element, std::string& strError) const; - - /** * Method that exports Configurable Domains to an Xml destination. * * @param[in,out] strXmlDest a string containing an xml description or a path to an xml file @@ -518,6 +491,34 @@ private: // Parse XML file into Root element bool xmlParse(CXmlElementSerializingContext& elementSerializingContext, CElement* pRootElement, const std::string& strXmlFilePath, const std::string& strXmlFolder, ElementLibrary eElementLibrary, const std::string& strNameAttrituteName = "Name"); + /** + * Export an element object to an Xml destination. + * + * + * @param[in,out] strXmlDest a string containing an xml description or a path to an xml file. + * @param[in] xmlSerializingContext the serializing context + * @param[in] bToFile a boolean that determines if the destination is an xml description in + * strXmlDest or contained in a file. In that case strXmlDest is just the file path. + * @param[in] element object to be serialized. + * @param[out] strError is used as the error output. + * + * @return false if any error occurs, true otherwise. + */ + bool serializeElement(std::string& strXmlDest, CXmlSerializingContext& xmlSerializingContext, + bool bToFile, const CElement& element, std::string& strError) const; + + /** + * Method that imports a single Configurable Domain, with settings, from an Xml file. + * + * @param[in] strXmlFilePath absolute path to the xml file containing the domain + * @param[out] strError is used as the error output + * + * @return false if any error occurs + */ + bool importDomainFromFile(const std::string& strXmlFilePath, bool bOverwrite, + std::string& strError); + + // Framework Configuration CParameterFrameworkConfiguration* getFrameworkConfiguration(); const CParameterFrameworkConfiguration* getConstFrameworkConfiguration(); -- cgit v1.1