diff --git a/examples/AddressBookXML2/AddressBook.cpp b/examples/AddressBookXML2/AddressBook.cpp index 88925af8c..e6ac4ba81 100644 --- a/examples/AddressBookXML2/AddressBook.cpp +++ b/examples/AddressBookXML2/AddressBook.cpp @@ -143,27 +143,17 @@ void AddressBook::Open() if(n.GetCount()==0 || n[0].GetTag() != TAG_ADDRESSBOOK) throw XmlError("No AddressBook tag"); const XmlNode &ab = n[0]; - array.SetCount(ab.GetCount()); - for(int i=0; i < ab.GetCount(); i++){ + for(int i = 0; i < ab.GetCount(); i++) { const XmlNode &person = ab[i]; - for(int j=0; j < person.GetCount(); j++){ - const XmlNode &prop = person[j]; - if(prop.IsTag(TAG_NAME)) - array.Set(i, TAG_NAME, prop[0].GetText()); - else - if(prop.IsTag(TAG_SURNAME)) - array.Set(i, TAG_SURNAME, prop[0].GetText()); - else - if(prop.IsTag(TAG_ADDRESS)) - array.Set(i, TAG_ADDRESS, prop[0].GetText()); - else - if(prop.IsTag(TAG_EMAIL)) - array.Set(i, TAG_EMAIL, prop[0].GetText()); - } + if(person.IsTag(TAG_PERSON)) + array.Add(person[TAG_NAME].GatherText(), + person[TAG_SURNAME].GatherText(), + person[TAG_ADDRESS].GatherText(), + person[TAG_EMAIL].GatherText()); } } catch(XmlError &e) { - Exclamation("Error reading the input file:&" + DeQtf(e) ); + Exclamation("Error reading the input file:&\1" + e); } } diff --git a/examples/AddressBookXML2/AddressBookXML2.upp b/examples/AddressBookXML2/AddressBookXML2.upp index 5425b838e..0a624bc38 100644 --- a/examples/AddressBookXML2/AddressBookXML2.upp +++ b/examples/AddressBookXML2/AddressBookXML2.upp @@ -1,4 +1,4 @@ -description "Address book application, uses XML to store data (using DOM like U++ classes)"; +description "Address book application, uses XML to store data (using DOM like U++ classes)\377"; uses CtrlLib, diff --git a/examples/AddressBookXML2/init b/examples/AddressBookXML2/init new file mode 100644 index 000000000..31dad5190 --- /dev/null +++ b/examples/AddressBookXML2/init @@ -0,0 +1,5 @@ +#ifndef _AddressBookXML2_icpp_init_stub +#define _AddressBookXML2_icpp_init_stub +#include "CtrlLib/init" +#include "Report/init" +#endif