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 | |
parent | 02bd3d07a8949bdfe0fe708ff8f3c01bc84fab08 (diff) | |
download | opie-342ac04976065864b351c6b36087a483a8932da7.zip opie-342ac04976065864b351c6b36087a483a8932da7.tar.gz opie-342ac04976065864b351c6b36087a483a8932da7.tar.bz2 |
along with tododb
-rw-r--r-- | include/opie/xmltree.h | 2 | ||||
-rw-r--r-- | libopie/xmltree.cc | 42 | ||||
-rw-r--r-- | libopie/xmltree.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/xmltree.cc | 42 | ||||
-rw-r--r-- | libopie2/opiecore/xmltree.h | 2 |
5 files changed, 40 insertions, 50 deletions
diff --git a/include/opie/xmltree.h b/include/opie/xmltree.h index 7f1b7b7..7f50365 100644 --- a/include/opie/xmltree.h +++ b/include/opie/xmltree.h | |||
@@ -75,24 +75,26 @@ public: | |||
75 | XMLElement *lastChild() const { return m_last; } | 75 | XMLElement *lastChild() const { return m_last; } |
76 | 76 | ||
77 | void setTagName( const QString &tag ) { m_tag = tag; } | 77 | void setTagName( const QString &tag ) { m_tag = tag; } |
78 | QString tagName() const { return m_tag; } | 78 | QString tagName() const { return m_tag; } |
79 | 79 | ||
80 | void setValue( const QString &val ) { m_value = val; } | 80 | void setValue( const QString &val ) { m_value = val; } |
81 | QString value() const { return m_value; } | 81 | QString value() const { return m_value; } |
82 | 82 | ||
83 | void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; } | 83 | void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; } |
84 | AttributeMap attributes() const { return m_attributes; } | 84 | AttributeMap attributes() const { return m_attributes; } |
85 | AttributeMap &attributes() { return m_attributes; } | 85 | AttributeMap &attributes() { return m_attributes; } |
86 | 86 | ||
87 | QString attribute(const QString &)const; | ||
88 | void setAttribute( const QString &attr, const QString &value ); | ||
87 | void save( QTextStream &stream, uint indent = 0 ); | 89 | void save( QTextStream &stream, uint indent = 0 ); |
88 | 90 | ||
89 | XMLElement *namedItem( const QString &name ); | 91 | XMLElement *namedItem( const QString &name ); |
90 | 92 | ||
91 | XMLElement *clone() const; | 93 | XMLElement *clone() const; |
92 | 94 | ||
93 | static XMLElement *load( const QString &fileName ); | 95 | static XMLElement *load( const QString &fileName ); |
94 | 96 | ||
95 | private: | 97 | private: |
96 | QString m_tag; | 98 | QString m_tag; |
97 | QString m_value; | 99 | QString m_value; |
98 | AttributeMap m_attributes; | 100 | AttributeMap m_attributes; |
diff --git a/libopie/xmltree.cc b/libopie/xmltree.cc index d5ce74a..3d03cc6 100644 --- a/libopie/xmltree.cc +++ b/libopie/xmltree.cc | |||
@@ -8,52 +8,31 @@ | |||
8 | 8 | ||
9 | This library is distributed in the hope that it will be useful, | 9 | This library is distributed in the hope that it will be useful, |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | Library General Public License for more details. | 12 | Library General Public License for more details. |
13 | 13 | ||
14 | You should have received a copy of the GNU Library General Public License | 14 | You should have received a copy of the GNU Library General Public License |
15 | along with this library; see the file COPYING.LIB. If not, write to | 15 | along with this library; see the file COPYING.LIB. If not, write to |
16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
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 ) |
51 | { | 30 | { |
52 | } | 31 | } |
53 | 32 | ||
54 | XMLElement::~XMLElement() | 33 | XMLElement::~XMLElement() |
55 | { | 34 | { |
56 | XMLElement *n = m_first; | 35 | XMLElement *n = m_first; |
57 | 36 | ||
58 | while ( n ) | 37 | while ( n ) |
59 | { | 38 | { |
@@ -101,25 +80,36 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild ) | |||
101 | newChild->m_parent = this; | 80 | newChild->m_parent = this; |
102 | 81 | ||
103 | XMLElement *next = refChild->m_next; | 82 | XMLElement *next = refChild->m_next; |
104 | 83 | ||
105 | refChild->m_next = newChild; | 84 | refChild->m_next = newChild; |
106 | 85 | ||
107 | newChild->m_prev = refChild; | 86 | newChild->m_prev = refChild; |
108 | newChild->m_next = next; | 87 | newChild->m_next = next; |
109 | 88 | ||
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 ); |
117 | assert( refChild->m_parent ); | 107 | assert( refChild->m_parent ); |
118 | assert( refChild->m_parent == this ); | 108 | assert( refChild->m_parent == this ); |
119 | assert( newChild != refChild ); | 109 | assert( newChild != refChild ); |
120 | 110 | ||
121 | if ( newChild->m_parent && newChild != refChild ) | 111 | if ( newChild->m_parent && newChild != refChild ) |
122 | newChild->m_parent->removeChild( newChild ); | 112 | newChild->m_parent->removeChild( newChild ); |
123 | 113 | ||
124 | newChild->m_parent = this; | 114 | newChild->m_parent = this; |
125 | 115 | ||
@@ -154,41 +144,41 @@ void XMLElement::removeChild( XMLElement *child ) | |||
154 | if ( child->m_next ) | 144 | if ( child->m_next ) |
155 | child->m_next->m_prev = child->m_prev; | 145 | child->m_next->m_prev = child->m_prev; |
156 | 146 | ||
157 | child->m_parent = 0; | 147 | child->m_parent = 0; |
158 | child->m_prev = 0; | 148 | child->m_prev = 0; |
159 | child->m_next = 0; | 149 | child->m_next = 0; |
160 | } | 150 | } |
161 | 151 | ||
162 | void XMLElement::save( QTextStream &s, uint indent ) | 152 | 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 | ||
170 | for ( uint i = 0; i < indent; ++i ) | 160 | for ( uint i = 0; i < indent; ++i ) |
171 | s << " "; | 161 | s << " "; |
172 | 162 | ||
173 | s << "<" << m_tag; | 163 | s << "<" << m_tag; |
174 | 164 | ||
175 | if ( !m_attributes.isEmpty() ) | 165 | if ( !m_attributes.isEmpty() ) |
176 | { | 166 | { |
177 | s << " "; | 167 | s << " "; |
178 | AttributeMap::ConstIterator it = m_attributes.begin(); | 168 | AttributeMap::ConstIterator it = m_attributes.begin(); |
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 | } |
186 | 176 | ||
187 | if ( m_last ) | 177 | if ( m_last ) |
188 | { | 178 | { |
189 | if ( ( m_first && !m_first->value().isEmpty() ) || !m_parent ) | 179 | if ( ( m_first && !m_first->value().isEmpty() ) || !m_parent ) |
190 | s << ">"; | 180 | s << ">"; |
191 | else | 181 | else |
192 | s << ">" << endl; | 182 | s << ">" << endl; |
193 | 183 | ||
194 | int newIndent = indent; | 184 | int newIndent = indent; |
@@ -315,12 +305,14 @@ XMLElement *XMLElement::load( const QString &fileName ) | |||
315 | QTextStream stream( &f ); | 305 | QTextStream stream( &f ); |
316 | stream.setEncoding( QTextStream::UnicodeUTF8 ); | 306 | stream.setEncoding( QTextStream::UnicodeUTF8 ); |
317 | QXmlInputSource src( stream ); | 307 | QXmlInputSource src( stream ); |
318 | QXmlSimpleReader reader; | 308 | QXmlSimpleReader reader; |
319 | Handler handler; | 309 | Handler handler; |
320 | 310 | ||
321 | reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false ); | 311 | reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false ); |
322 | reader.setContentHandler( &handler ); | 312 | reader.setContentHandler( &handler ); |
323 | reader.parse( src ); | 313 | reader.parse( src ); |
324 | 314 | ||
325 | return handler.root();; | 315 | return handler.root();; |
326 | } | 316 | } |
317 | |||
318 | |||
diff --git a/libopie/xmltree.h b/libopie/xmltree.h index 7f1b7b7..7f50365 100644 --- a/libopie/xmltree.h +++ b/libopie/xmltree.h | |||
@@ -75,24 +75,26 @@ public: | |||
75 | XMLElement *lastChild() const { return m_last; } | 75 | XMLElement *lastChild() const { return m_last; } |
76 | 76 | ||
77 | void setTagName( const QString &tag ) { m_tag = tag; } | 77 | void setTagName( const QString &tag ) { m_tag = tag; } |
78 | QString tagName() const { return m_tag; } | 78 | QString tagName() const { return m_tag; } |
79 | 79 | ||
80 | void setValue( const QString &val ) { m_value = val; } | 80 | void setValue( const QString &val ) { m_value = val; } |
81 | QString value() const { return m_value; } | 81 | QString value() const { return m_value; } |
82 | 82 | ||
83 | void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; } | 83 | void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; } |
84 | AttributeMap attributes() const { return m_attributes; } | 84 | AttributeMap attributes() const { return m_attributes; } |
85 | AttributeMap &attributes() { return m_attributes; } | 85 | AttributeMap &attributes() { return m_attributes; } |
86 | 86 | ||
87 | QString attribute(const QString &)const; | ||
88 | void setAttribute( const QString &attr, const QString &value ); | ||
87 | void save( QTextStream &stream, uint indent = 0 ); | 89 | void save( QTextStream &stream, uint indent = 0 ); |
88 | 90 | ||
89 | XMLElement *namedItem( const QString &name ); | 91 | XMLElement *namedItem( const QString &name ); |
90 | 92 | ||
91 | XMLElement *clone() const; | 93 | XMLElement *clone() const; |
92 | 94 | ||
93 | static XMLElement *load( const QString &fileName ); | 95 | static XMLElement *load( const QString &fileName ); |
94 | 96 | ||
95 | private: | 97 | private: |
96 | QString m_tag; | 98 | QString m_tag; |
97 | QString m_value; | 99 | QString m_value; |
98 | AttributeMap m_attributes; | 100 | AttributeMap m_attributes; |
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 | |||
@@ -8,52 +8,31 @@ | |||
8 | 8 | ||
9 | This library is distributed in the hope that it will be useful, | 9 | This library is distributed in the hope that it will be useful, |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | Library General Public License for more details. | 12 | Library General Public License for more details. |
13 | 13 | ||
14 | You should have received a copy of the GNU Library General Public License | 14 | You should have received a copy of the GNU Library General Public License |
15 | along with this library; see the file COPYING.LIB. If not, write to | 15 | along with this library; see the file COPYING.LIB. If not, write to |
16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
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 ) |
51 | { | 30 | { |
52 | } | 31 | } |
53 | 32 | ||
54 | XMLElement::~XMLElement() | 33 | XMLElement::~XMLElement() |
55 | { | 34 | { |
56 | XMLElement *n = m_first; | 35 | XMLElement *n = m_first; |
57 | 36 | ||
58 | while ( n ) | 37 | while ( n ) |
59 | { | 38 | { |
@@ -101,25 +80,36 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild ) | |||
101 | newChild->m_parent = this; | 80 | newChild->m_parent = this; |
102 | 81 | ||
103 | XMLElement *next = refChild->m_next; | 82 | XMLElement *next = refChild->m_next; |
104 | 83 | ||
105 | refChild->m_next = newChild; | 84 | refChild->m_next = newChild; |
106 | 85 | ||
107 | newChild->m_prev = refChild; | 86 | newChild->m_prev = refChild; |
108 | newChild->m_next = next; | 87 | newChild->m_next = next; |
109 | 88 | ||
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 ); |
117 | assert( refChild->m_parent ); | 107 | assert( refChild->m_parent ); |
118 | assert( refChild->m_parent == this ); | 108 | assert( refChild->m_parent == this ); |
119 | assert( newChild != refChild ); | 109 | assert( newChild != refChild ); |
120 | 110 | ||
121 | if ( newChild->m_parent && newChild != refChild ) | 111 | if ( newChild->m_parent && newChild != refChild ) |
122 | newChild->m_parent->removeChild( newChild ); | 112 | newChild->m_parent->removeChild( newChild ); |
123 | 113 | ||
124 | newChild->m_parent = this; | 114 | newChild->m_parent = this; |
125 | 115 | ||
@@ -154,41 +144,41 @@ void XMLElement::removeChild( XMLElement *child ) | |||
154 | if ( child->m_next ) | 144 | if ( child->m_next ) |
155 | child->m_next->m_prev = child->m_prev; | 145 | child->m_next->m_prev = child->m_prev; |
156 | 146 | ||
157 | child->m_parent = 0; | 147 | child->m_parent = 0; |
158 | child->m_prev = 0; | 148 | child->m_prev = 0; |
159 | child->m_next = 0; | 149 | child->m_next = 0; |
160 | } | 150 | } |
161 | 151 | ||
162 | void XMLElement::save( QTextStream &s, uint indent ) | 152 | 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 | ||
170 | for ( uint i = 0; i < indent; ++i ) | 160 | for ( uint i = 0; i < indent; ++i ) |
171 | s << " "; | 161 | s << " "; |
172 | 162 | ||
173 | s << "<" << m_tag; | 163 | s << "<" << m_tag; |
174 | 164 | ||
175 | if ( !m_attributes.isEmpty() ) | 165 | if ( !m_attributes.isEmpty() ) |
176 | { | 166 | { |
177 | s << " "; | 167 | s << " "; |
178 | AttributeMap::ConstIterator it = m_attributes.begin(); | 168 | AttributeMap::ConstIterator it = m_attributes.begin(); |
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 | } |
186 | 176 | ||
187 | if ( m_last ) | 177 | if ( m_last ) |
188 | { | 178 | { |
189 | if ( ( m_first && !m_first->value().isEmpty() ) || !m_parent ) | 179 | if ( ( m_first && !m_first->value().isEmpty() ) || !m_parent ) |
190 | s << ">"; | 180 | s << ">"; |
191 | else | 181 | else |
192 | s << ">" << endl; | 182 | s << ">" << endl; |
193 | 183 | ||
194 | int newIndent = indent; | 184 | int newIndent = indent; |
@@ -315,12 +305,14 @@ XMLElement *XMLElement::load( const QString &fileName ) | |||
315 | QTextStream stream( &f ); | 305 | QTextStream stream( &f ); |
316 | stream.setEncoding( QTextStream::UnicodeUTF8 ); | 306 | stream.setEncoding( QTextStream::UnicodeUTF8 ); |
317 | QXmlInputSource src( stream ); | 307 | QXmlInputSource src( stream ); |
318 | QXmlSimpleReader reader; | 308 | QXmlSimpleReader reader; |
319 | Handler handler; | 309 | Handler handler; |
320 | 310 | ||
321 | reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false ); | 311 | reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false ); |
322 | reader.setContentHandler( &handler ); | 312 | reader.setContentHandler( &handler ); |
323 | reader.parse( src ); | 313 | reader.parse( src ); |
324 | 314 | ||
325 | return handler.root();; | 315 | return handler.root();; |
326 | } | 316 | } |
317 | |||
318 | |||
diff --git a/libopie2/opiecore/xmltree.h b/libopie2/opiecore/xmltree.h index 7f1b7b7..7f50365 100644 --- a/libopie2/opiecore/xmltree.h +++ b/libopie2/opiecore/xmltree.h | |||
@@ -75,24 +75,26 @@ public: | |||
75 | XMLElement *lastChild() const { return m_last; } | 75 | XMLElement *lastChild() const { return m_last; } |
76 | 76 | ||
77 | void setTagName( const QString &tag ) { m_tag = tag; } | 77 | void setTagName( const QString &tag ) { m_tag = tag; } |
78 | QString tagName() const { return m_tag; } | 78 | QString tagName() const { return m_tag; } |
79 | 79 | ||
80 | void setValue( const QString &val ) { m_value = val; } | 80 | void setValue( const QString &val ) { m_value = val; } |
81 | QString value() const { return m_value; } | 81 | QString value() const { return m_value; } |
82 | 82 | ||
83 | void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; } | 83 | void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; } |
84 | AttributeMap attributes() const { return m_attributes; } | 84 | AttributeMap attributes() const { return m_attributes; } |
85 | AttributeMap &attributes() { return m_attributes; } | 85 | AttributeMap &attributes() { return m_attributes; } |
86 | 86 | ||
87 | QString attribute(const QString &)const; | ||
88 | void setAttribute( const QString &attr, const QString &value ); | ||
87 | void save( QTextStream &stream, uint indent = 0 ); | 89 | void save( QTextStream &stream, uint indent = 0 ); |
88 | 90 | ||
89 | XMLElement *namedItem( const QString &name ); | 91 | XMLElement *namedItem( const QString &name ); |
90 | 92 | ||
91 | XMLElement *clone() const; | 93 | XMLElement *clone() const; |
92 | 94 | ||
93 | static XMLElement *load( const QString &fileName ); | 95 | static XMLElement *load( const QString &fileName ); |
94 | 96 | ||
95 | private: | 97 | private: |
96 | QString m_tag; | 98 | QString m_tag; |
97 | QString m_value; | 99 | QString m_value; |
98 | AttributeMap m_attributes; | 100 | AttributeMap m_attributes; |