summaryrefslogtreecommitdiffstats
path: root/parameter/XmlFileIncluderElement.cpp
diff options
context:
space:
mode:
authorSebastien Gonzalve <oznog@zarb.org>2014-02-20 22:28:03 +0100
committerDavid Wagner <david.wagner@intel.com>2014-09-11 14:25:02 +0200
commitd9526499d6ab53b7d13d1434f748f6f2161c2e0a (patch)
tree8d2e2db275800821d4bf8873fc16b686bca60b2d /parameter/XmlFileIncluderElement.cpp
parentffbf43b383bb8693741430b02c24dbc9b127f7f7 (diff)
downloadexternal_parameter-framework-d9526499d6ab53b7d13d1434f748f6f2161c2e0a.zip
external_parameter-framework-d9526499d6ab53b7d13d1434f748f6f2161c2e0a.tar.gz
external_parameter-framework-d9526499d6ab53b7d13d1434f748f6f2161c2e0a.tar.bz2
Remove using std::XXX from headers
This is a bad practice to have using in headers because it pollutes the namespace of any user of that header.
Diffstat (limited to 'parameter/XmlFileIncluderElement.cpp')
-rw-r--r--parameter/XmlFileIncluderElement.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/parameter/XmlFileIncluderElement.cpp b/parameter/XmlFileIncluderElement.cpp
index 2e97bdb..e9b95cd 100644
--- a/parameter/XmlFileIncluderElement.cpp
+++ b/parameter/XmlFileIncluderElement.cpp
@@ -36,8 +36,8 @@
#include <assert.h>
#define base CKindElement
-CXmlFileIncluderElement::CXmlFileIncluderElement(const string& strName,
- const string& strKind,
+CXmlFileIncluderElement::CXmlFileIncluderElement(const std::string& strName,
+ const std::string& strKind,
bool bValidateWithSchemas) : base(strName,
strKind)
{
@@ -51,7 +51,7 @@ bool CXmlFileIncluderElement::fromXml(const CXmlElement& xmlElement, CXmlSeriali
CXmlElementSerializingContext& elementSerializingContext = static_cast<CXmlElementSerializingContext&>(serializingContext);
// Parse included document
- string strPath = xmlElement.getAttributeString("Path");
+ std::string strPath = xmlElement.getAttributeString("Path");
// Relative path?
if (strPath[0] != '/') {
@@ -60,13 +60,13 @@ bool CXmlFileIncluderElement::fromXml(const CXmlElement& xmlElement, CXmlSeriali
}
// Instantiate parser
- string strIncludedElementType = getIncludedElementType();
+ std::string strIncludedElementType = getIncludedElementType();
{
// Open a log section titled with loading file path
CAutoLog autolog(this, "Loading " + strPath);
// Use a doc source that load data from a file
- string strPathToXsdFile = elementSerializingContext.getXmlSchemaPathFolder() + "/" +
+ std::string strPathToXsdFile = elementSerializingContext.getXmlSchemaPathFolder() + "/" +
strIncludedElementType + ".xsd";
CXmlFileDocSource fileDocSource(strPath,
@@ -116,9 +116,9 @@ bool CXmlFileIncluderElement::fromXml(const CXmlElement& xmlElement, CXmlSeriali
}
// Element type
-string CXmlFileIncluderElement::getIncludedElementType() const
+std::string CXmlFileIncluderElement::getIncludedElementType() const
{
- string strKind = getKind();
+ std::string strKind = getKind();
int iPosToRemoveFrom = strKind.rfind("Include", -1);