diff options
| author | David Wagner <david.wagner@intel.com> | 2014-10-24 17:41:58 +0200 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-10-24 17:41:58 +0200 |
| commit | d9ad02e2a322fff355cd113c5bb98ff4667a95f2 (patch) | |
| tree | 7bfbb4fd253ffa8abb98f03887a4e76f1f26caaa /xmlserializer/XmlFileDocSource.cpp | |
| parent | a022e315ecfede7bb37ab17382482eb794b33f00 (diff) | |
| parent | d9526499d6ab53b7d13d1434f748f6f2161c2e0a (diff) | |
| download | external_parameter-framework-d9ad02e2a322fff355cd113c5bb98ff4667a95f2.zip external_parameter-framework-d9ad02e2a322fff355cd113c5bb98ff4667a95f2.tar.gz external_parameter-framework-d9ad02e2a322fff355cd113c5bb98ff4667a95f2.tar.bz2 | |
Merge pull request #13 from 01org/OznOg-bis
some C++ cleanup
Diffstat (limited to 'xmlserializer/XmlFileDocSource.cpp')
| -rw-r--r-- | xmlserializer/XmlFileDocSource.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xmlserializer/XmlFileDocSource.cpp b/xmlserializer/XmlFileDocSource.cpp index 908c13b..f980c39 100644 --- a/xmlserializer/XmlFileDocSource.cpp +++ b/xmlserializer/XmlFileDocSource.cpp @@ -34,11 +34,11 @@ #define base CXmlDocSource -CXmlFileDocSource::CXmlFileDocSource(const string& strXmlInstanceFile, - const string& strXmlSchemaFile, - const string& strRootElementType, - const string& strRootElementName, - const string& strNameAttrituteName, +CXmlFileDocSource::CXmlFileDocSource(const std::string& strXmlInstanceFile, + const std::string& strXmlSchemaFile, + const std::string& strRootElementType, + const std::string& strRootElementName, + const std::string& strNameAttrituteName, bool bValidateWithSchema) : base(readFile(strXmlInstanceFile), strXmlSchemaFile, @@ -50,9 +50,9 @@ CXmlFileDocSource::CXmlFileDocSource(const string& strXmlInstanceFile, { } -CXmlFileDocSource::CXmlFileDocSource(const string& strXmlInstanceFile, - const string& strXmlSchemaFile, - const string& strRootElementType, +CXmlFileDocSource::CXmlFileDocSource(const std::string& strXmlInstanceFile, + const std::string& strXmlSchemaFile, + const std::string& strRootElementType, bool bValidateWithSchema) : base(readFile(strXmlInstanceFile), strXmlSchemaFile, @@ -88,7 +88,7 @@ bool CXmlFileDocSource::populate(CXmlSerializingContext& serializingContext) return true; } -_xmlDoc* CXmlFileDocSource::readFile(const string& strFileName) +_xmlDoc* CXmlFileDocSource::readFile(const std::string& strFileName) { // Read xml file xmlDocPtr pDoc = xmlReadFile(strFileName.c_str(), NULL, 0); |