diff options
| author | 2009-10-26 20:33:36 +0100 | |
|---|---|---|
| committer | 2009-10-26 20:33:36 +0100 | |
| commit | a129688a888968286a30eeba7833629225c59fa0 (patch) | |
| tree | 3daa1bed71a2d3ec60f24bc11ff116c02ccac003 | |
| parent | c1363bea107b15bdc10ce80671747be891661889 (diff) | |
| download | libplist-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.h | 4 | ||||
| -rw-r--r-- | src/Utils.cpp | 8 |
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 | |||
| 31 | { | 31 | { |
| 32 | public: | 32 | public: |
| 33 | static Node* FromPlist(plist_t node, Node* parent = NULL); | 33 | static Node* FromPlist(plist_t node, Node* parent = NULL); |
| 34 | static Structure* FromXml(const std::string& in); | 34 | static Structure* FromXml(const std::string& xml); |
| 35 | static Structure* FromBin(const std::vector<char>& in); | 35 | static Structure* FromBin(const std::vector<char>& bin); |
| 36 | 36 | ||
| 37 | private: | 37 | private: |
| 38 | Utils(); | 38 | 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) | |||
| 89 | return ret; | 89 | return ret; |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | Structure* Utils::FromXml(const std::string& in) | 92 | Structure* Utils::FromXml(const std::string& xml) |
| 93 | { | 93 | { |
| 94 | plist_t root = NULL; | 94 | plist_t root = NULL; |
| 95 | plist_from_xml(in.c_str(), in.size(), &root); | 95 | plist_from_xml(xml.c_str(), xml.size(), &root); |
| 96 | 96 | ||
| 97 | return ImportStruct(root); | 97 | return ImportStruct(root); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | Structure* Utils::FromBin(const std::vector<char>& in) | 100 | Structure* Utils::FromBin(const std::vector<char>& bin) |
| 101 | { | 101 | { |
| 102 | plist_t root = NULL; | 102 | plist_t root = NULL; |
| 103 | plist_from_bin(&in[0], in.size(), &root); | 103 | plist_from_bin(&bin[0], bin.size(), &root); |
| 104 | 104 | ||
| 105 | return ImportStruct(root); | 105 | return ImportStruct(root); |
| 106 | 106 | ||
