summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jonathan Beck2009-10-26 20:33:36 +0100
committerGravatar Jonathan Beck2009-10-26 20:33:36 +0100
commita129688a888968286a30eeba7833629225c59fa0 (patch)
tree3daa1bed71a2d3ec60f24bc11ff116c02ccac003
parentc1363bea107b15bdc10ce80671747be891661889 (diff)
downloadlibplist-a129688a888968286a30eeba7833629225c59fa0.tar.gz
libplist-a129688a888968286a30eeba7833629225c59fa0.tar.bz2
Change name of input argument as 'in' is a reserved keyword in python.
-rw-r--r--include/plist/Utils.h4
-rw-r--r--src/Utils.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/include/plist/Utils.h b/include/plist/Utils.h
index 65bec7e..4cf6003 100644
--- a/include/plist/Utils.h
+++ b/include/plist/Utils.h
@@ -31,8 +31,8 @@ namespace PList
{
public:
static Node* FromPlist(plist_t node, Node* parent = NULL);
- static Structure* FromXml(const std::string& in);
- static Structure* FromBin(const std::vector<char>& in);
+ static Structure* FromXml(const std::string& xml);
+ static Structure* FromBin(const std::vector<char>& bin);
private:
Utils();
diff --git a/src/Utils.cpp b/src/Utils.cpp
index a88b2ba..df003e7 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -89,18 +89,18 @@ static Structure* ImportStruct(plist_t root)
return ret;
}
-Structure* Utils::FromXml(const std::string& in)
+Structure* Utils::FromXml(const std::string& xml)
{
plist_t root = NULL;
- plist_from_xml(in.c_str(), in.size(), &root);
+ plist_from_xml(xml.c_str(), xml.size(), &root);
return ImportStruct(root);
}
-Structure* Utils::FromBin(const std::vector<char>& in)
+Structure* Utils::FromBin(const std::vector<char>& bin)
{
plist_t root = NULL;
- plist_from_bin(&in[0], in.size(), &root);
+ plist_from_bin(&bin[0], bin.size(), &root);
return ImportStruct(root);