author | harlekin <harlekin> | 2002-03-19 00:18:04 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-03-19 00:18:04 (UTC) |
commit | 342ac04976065864b351c6b36087a483a8932da7 (patch) (unidiff) | |
tree | 646a89071882378786532ff587ac0e6e8fd0df03 /libopie2/opiecore/xmltree.cc | |
parent | 02bd3d07a8949bdfe0fe708ff8f3c01bc84fab08 (diff) | |
download | opie-342ac04976065864b351c6b36087a483a8932da7.zip opie-342ac04976065864b351c6b36087a483a8932da7.tar.gz opie-342ac04976065864b351c6b36087a483a8932da7.tar.bz2 |
along with tododb
Diffstat (limited to 'libopie2/opiecore/xmltree.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/xmltree.cc | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/libopie2/opiecore/xmltree.cc b/libopie2/opiecore/xmltree.cc index d5ce74a..3d03cc6 100644 --- a/libopie2/opiecore/xmltree.cc +++ b/libopie2/opiecore/xmltree.cc | |||
@@ -17,34 +17,13 @@ | |||
17 | Boston, MA 02111-1307, USA. | 17 | Boston, MA 02111-1307, USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | 20 | #include <qpe/stringutil.h> | |
21 | #include <opie/xmltree.h> | 21 | #include <opie/xmltree.h> |
22 | 22 | ||
23 | #include <qxml.h> | 23 | #include <qxml.h> |
24 | 24 | ||
25 | #include <assert.h> | 25 | #include <assert.h> |
26 | 26 | ||
27 | namespace | ||
28 | { | ||
29 | |||
30 | /** | ||
31 | Encode an attribute value upon saving. | ||
32 | replaces '"' with """ | ||
33 | replaces '<' with "<" | ||
34 | replaces '&' with "&" | ||
35 | replaces '>' with ">" | ||
36 | */ | ||
37 | QString encodeAttr( const QString& str ) | ||
38 | { | ||
39 | QString encAttr( str ); // cause of the const parameter | ||
40 | encAttr = encAttr.replace( QRegExp( "[<]" ), "<" ); | ||
41 | encAttr = encAttr.replace( QRegExp( "[>]" ), ">" ); | ||
42 | encAttr = encAttr.replace( QRegExp( "[\"]" ), """ ); | ||
43 | encAttr = encAttr.replace( QRegExp( "[&]" ), "&" ); | ||
44 | return encAttr; | ||
45 | } | ||
46 | |||
47 | } | ||
48 | 27 | ||
49 | XMLElement::XMLElement() | 28 | XMLElement::XMLElement() |
50 | : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) | 29 | : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) |
@@ -110,7 +89,18 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild ) | |||
110 | if ( next ) | 89 | if ( next ) |
111 | next->m_prev = newChild; | 90 | next->m_prev = newChild; |
112 | } | 91 | } |
113 | 92 | QString XMLElement::attribute(const QString &attr )const | |
93 | { | ||
94 | if ( !m_attributes.contains( attr ) ) | ||
95 | return QString::null; | ||
96 | AttributeMap::ConstIterator it = m_attributes.find( attr ); | ||
97 | return it.data(); | ||
98 | } | ||
99 | void XMLElement::setAttribute(const QString &attr, const QString &value ) | ||
100 | { | ||
101 | m_attributes.remove( attr ); | ||
102 | m_attributes.insert( attr, value ); | ||
103 | } | ||
114 | void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild ) | 104 | void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild ) |
115 | { | 105 | { |
116 | assert( refChild ); | 106 | assert( refChild ); |
@@ -163,7 +153,7 @@ void XMLElement::save( QTextStream &s, uint indent ) | |||
163 | { | 153 | { |
164 | if ( !m_value.isEmpty() ) | 154 | if ( !m_value.isEmpty() ) |
165 | { | 155 | { |
166 | s << encodeAttr( m_value ); | 156 | s << Qtopia::escapeString( m_value ); |
167 | return; | 157 | return; |
168 | } | 158 | } |
169 | 159 | ||
@@ -179,7 +169,7 @@ void XMLElement::save( QTextStream &s, uint indent ) | |||
179 | AttributeMap::ConstIterator end = m_attributes.end(); | 169 | AttributeMap::ConstIterator end = m_attributes.end(); |
180 | for (; it != end; ++it ) | 170 | for (; it != end; ++it ) |
181 | { | 171 | { |
182 | s << it.key() << "=\"" << encodeAttr( it.data() ) << "\""; | 172 | s << it.key() << "=\"" << Qtopia::escapeString( it.data() ) << "\""; |
183 | s << " "; | 173 | s << " "; |
184 | } | 174 | } |
185 | } | 175 | } |
@@ -324,3 +314,5 @@ XMLElement *XMLElement::load( const QString &fileName ) | |||
324 | 314 | ||
325 | return handler.root();; | 315 | return handler.root();; |
326 | } | 316 | } |
317 | |||
318 | |||