From 2d1aacb8e795de320c2fe7e2ea7b1f9df4287051 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 10 Jan 2011 19:34:42 +0000 Subject: [PATCH] .Core: Developing Xmlize git-svn-id: svn://ultimatepp.org/upp/trunk@2984 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Xmlize.cpp | 4 ++-- uppsrc/Core/Xmlize.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/uppsrc/Core/Xmlize.cpp b/uppsrc/Core/Xmlize.cpp index 7e7fceb4e..4140bd7bc 100644 --- a/uppsrc/Core/Xmlize.cpp +++ b/uppsrc/Core/Xmlize.cpp @@ -347,7 +347,7 @@ String StoreAsXML(Callback1 xmlize, const char *name) if(IsNull(n)) n = "app"; XmlNode node; - xmlize(XmlIO(node(n), false)); + xmlize(XmlIO(node(n), false, Value())); return AsXML(node); } @@ -357,7 +357,7 @@ bool LoadFromXML(Callback1 xmlize, const String& xml) XmlNode node = ParseXML(xml); for(int i = 0; i < node.GetCount(); i++) if(node.Node(i).IsTag()) { - xmlize(XmlIO(node.At(i), true)); + xmlize(XmlIO(node.At(i), true, Value())); break; } return true; diff --git a/uppsrc/Core/Xmlize.h b/uppsrc/Core/Xmlize.h index 98f038a0c..0e7165926 100644 --- a/uppsrc/Core/Xmlize.h +++ b/uppsrc/Core/Xmlize.h @@ -51,15 +51,15 @@ public: return *this; } - XmlIO At(int i) { XmlIO m(node.At(i), IsLoading()); return m; } - XmlIO Add() { XmlIO m(node.Add(), IsLoading()); return m; } - XmlIO Add(const char *id) { XmlIO m(node.Add(id), IsLoading()); return m; } - XmlIO GetAdd(const char *id) { XmlIO m(node.GetAdd(id), IsLoading()); return m; } + XmlIO At(int i) { XmlIO m(node.At(i), IsLoading(), userdata); return m; } + XmlIO Add() { XmlIO m(node.Add(), IsLoading(), userdata); return m; } + XmlIO Add(const char *id) { XmlIO m(node.Add(id), IsLoading(), userdata); return m; } + XmlIO GetAdd(const char *id) { XmlIO m(node.GetAdd(id), IsLoading(), userdata); return m; } void SetUserData(const Value& v) { userdata = v; } Value GetUserData() const { return userdata; } - XmlIO(XmlNode& xml, bool loading) : node(xml), loading(loading) {} + XmlIO(XmlNode& xml, bool loading, const Value& userdata) : node(xml), loading(loading) {} XmlIO(XmlIO xml, const char *tag) : node(xml.node.GetAdd(tag)), loading(xml.loading), userdata(xml.userdata) {} };