-rw-r--r-- | libopie/xmltree.cc | 70 | ||||
-rw-r--r-- | libopie2/opiecore/xmltree.cc | 70 |
2 files changed, 72 insertions, 68 deletions
diff --git a/libopie/xmltree.cc b/libopie/xmltree.cc index 9b8dd05..bf93151 100644 --- a/libopie/xmltree.cc +++ b/libopie/xmltree.cc | |||
@@ -1,62 +1,80 @@ | |||
1 | /* This file is part of the KDE project | 1 | /* This file is part of the KDE project |
2 | Copyright (C) 2001 Simon Hausmann <hausmann@kde.org> | 2 | Copyright (C) 2001 Simon Hausmann <hausmann@kde.org> |
3 | 3 | ||
4 | This program is free software; you can redistribute it and/or modify | 4 | This library is free software; you can redistribute it and/or |
5 | it under the terms of the GNU General Public License as published by | 5 | modify it under the terms of the GNU Library General Public |
6 | the Free Software Foundation; either version 2 of the License, or | 6 | License as published by the Free Software Foundation; either |
7 | (at your option) any later version. | 7 | version 2 of the License, or (at your option) any later version. |
8 | 8 | ||
9 | This program 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 | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | GNU 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 General Public License | 14 | You should have received a copy of the GNU Library General Public License |
15 | along with this program; if not, write to the Free Software | 15 | along with this library; see the file COPYING.LIB. If not, write to |
16 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
17 | 17 | Boston, MA 02111-1307, USA. | |
18 | As a special exception this program may be linked with Qt non-commercial | ||
19 | edition, the resulting executable be distributed, without including the | ||
20 | source code for the Qt non-commercial edition in the source distribution. | ||
21 | |||
22 | */ | 18 | */ |
23 | 19 | ||
24 | 20 | ||
25 | #include "xmltree.h" | 21 | #include "xmltree.h" |
26 | 22 | ||
27 | #include <qxml.h> | 23 | #include <qxml.h> |
28 | 24 | ||
29 | #include <assert.h> | 25 | #include <assert.h> |
30 | 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 | |||
31 | XMLElement::XMLElement() | 49 | XMLElement::XMLElement() |
32 | : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) | 50 | : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) |
33 | { | 51 | { |
34 | } | 52 | } |
35 | 53 | ||
36 | XMLElement::~XMLElement() | 54 | XMLElement::~XMLElement() |
37 | { | 55 | { |
38 | XMLElement *n = m_first; | 56 | XMLElement *n = m_first; |
39 | 57 | ||
40 | while ( n ) | 58 | while ( n ) |
41 | { | 59 | { |
42 | XMLElement *tmp = n; | 60 | XMLElement *tmp = n; |
43 | n = n->m_next; | 61 | n = n->m_next; |
44 | delete tmp; | 62 | delete tmp; |
45 | } | 63 | } |
46 | } | 64 | } |
47 | 65 | ||
48 | void XMLElement::appendChild( XMLElement *child ) | 66 | void XMLElement::appendChild( XMLElement *child ) |
49 | { | 67 | { |
50 | if ( child->m_parent ) | 68 | if ( child->m_parent ) |
51 | child->m_parent->removeChild( child ); | 69 | child->m_parent->removeChild( child ); |
52 | 70 | ||
53 | child->m_parent = this; | 71 | child->m_parent = this; |
54 | 72 | ||
55 | if ( m_last ) | 73 | if ( m_last ) |
56 | m_last->m_next = child; | 74 | m_last->m_next = child; |
57 | 75 | ||
58 | child->m_prev = m_last; | 76 | child->m_prev = m_last; |
59 | 77 | ||
60 | if ( !m_first ) | 78 | if ( !m_first ) |
61 | m_first = child; | 79 | m_first = child; |
62 | 80 | ||
@@ -165,80 +183,64 @@ void XMLElement::save( QTextStream &s, uint indent ) | |||
165 | s << " "; | 183 | s << " "; |
166 | } | 184 | } |
167 | } | 185 | } |
168 | 186 | ||
169 | if ( m_last ) | 187 | if ( m_last ) |
170 | { | 188 | { |
171 | if ( ( m_first && !m_first->value().isEmpty() ) || !m_parent ) | 189 | if ( ( m_first && !m_first->value().isEmpty() ) || !m_parent ) |
172 | s << ">"; | 190 | s << ">"; |
173 | else | 191 | else |
174 | s << ">" << endl; | 192 | s << ">" << endl; |
175 | 193 | ||
176 | int newIndent = indent; | 194 | int newIndent = indent; |
177 | if ( m_parent ) | 195 | if ( m_parent ) |
178 | newIndent++; | 196 | newIndent++; |
179 | 197 | ||
180 | XMLElement *n = m_first; | 198 | XMLElement *n = m_first; |
181 | while ( n ) | 199 | while ( n ) |
182 | { | 200 | { |
183 | n->save( s, newIndent ); | 201 | n->save( s, newIndent ); |
184 | n = n->nextChild(); | 202 | n = n->nextChild(); |
185 | } | 203 | } |
186 | 204 | ||
187 | if ( m_last && m_last->value().isEmpty() && m_parent ) | 205 | if ( m_last && m_last->value().isEmpty() && m_parent ) |
188 | for ( uint i = 0; i < indent; ++i ) | 206 | for ( uint i = 0; i < indent; ++i ) |
189 | s << " "; | 207 | s << " "; |
190 | 208 | ||
191 | if ( m_parent ) | 209 | if ( m_parent ) |
192 | s << "</" << m_tag << ">" << endl; | 210 | s << "</" << m_tag << ">" << endl; |
193 | } | 211 | } |
194 | else | 212 | else |
195 | s << "/>" << endl; | 213 | s << "/>" << endl; |
196 | } | 214 | } |
197 | /** | ||
198 | Encode an attribute value upon saving. | ||
199 | replaces '"' with """ | ||
200 | replaces '<' with "<" | ||
201 | replaces '&' with "&" | ||
202 | replaces '>' with ">" | ||
203 | */ | ||
204 | QString XMLElement::encodeAttr( const QString& str ) | ||
205 | { | ||
206 | QString encAttr( str ); // cause of the const parameter | ||
207 | encAttr = encAttr.replace( QRegExp( "[<]" ), "<" ); | ||
208 | encAttr = encAttr.replace( QRegExp( "[>]" ), ">" ); | ||
209 | encAttr = encAttr.replace( QRegExp( "[\"]" ), """ ); | ||
210 | encAttr = encAttr.replace( QRegExp( "[&]" ), "&" ); | ||
211 | return encAttr; | ||
212 | } | ||
213 | 215 | ||
214 | class Handler : public QXmlDefaultHandler | 216 | class Handler : public QXmlDefaultHandler |
215 | { | 217 | { |
216 | public: | 218 | public: |
217 | Handler() : m_node( 0 ), m_root( 0 ) {} | 219 | Handler() : m_node( 0 ), m_root( 0 ) {} |
218 | 220 | ||
219 | XMLElement *root() const { return m_root; } | 221 | XMLElement *root() const { return m_root; } |
220 | 222 | ||
221 | virtual bool startDocument(); | 223 | virtual bool startDocument(); |
222 | virtual bool endDocument(); | 224 | virtual bool endDocument(); |
223 | virtual bool startElement( const QString &ns, const QString &ln, const QString &qName, | 225 | virtual bool startElement( const QString &ns, const QString &ln, const QString &qName, |
224 | const QXmlAttributes &attr ); | 226 | const QXmlAttributes &attr ); |
225 | virtual bool endElement( const QString &ns, const QString &ln, const QString &qName ); | 227 | virtual bool endElement( const QString &ns, const QString &ln, const QString &qName ); |
226 | virtual bool characters( const QString &ch ); | 228 | virtual bool characters( const QString &ch ); |
227 | 229 | ||
228 | private: | 230 | private: |
229 | XMLElement *m_node; | 231 | XMLElement *m_node; |
230 | XMLElement *m_root; | 232 | XMLElement *m_root; |
231 | }; | 233 | }; |
232 | 234 | ||
233 | bool Handler::startDocument() | 235 | bool Handler::startDocument() |
234 | { | 236 | { |
235 | m_root = m_node = new XMLElement; | 237 | m_root = m_node = new XMLElement; |
236 | 238 | ||
237 | return true; | 239 | return true; |
238 | } | 240 | } |
239 | 241 | ||
240 | bool Handler::endDocument() | 242 | bool Handler::endDocument() |
241 | { | 243 | { |
242 | return m_root == m_node; | 244 | return m_root == m_node; |
243 | } | 245 | } |
244 | 246 | ||
diff --git a/libopie2/opiecore/xmltree.cc b/libopie2/opiecore/xmltree.cc index 9b8dd05..bf93151 100644 --- a/libopie2/opiecore/xmltree.cc +++ b/libopie2/opiecore/xmltree.cc | |||
@@ -1,62 +1,80 @@ | |||
1 | /* This file is part of the KDE project | 1 | /* This file is part of the KDE project |
2 | Copyright (C) 2001 Simon Hausmann <hausmann@kde.org> | 2 | Copyright (C) 2001 Simon Hausmann <hausmann@kde.org> |
3 | 3 | ||
4 | This program is free software; you can redistribute it and/or modify | 4 | This library is free software; you can redistribute it and/or |
5 | it under the terms of the GNU General Public License as published by | 5 | modify it under the terms of the GNU Library General Public |
6 | the Free Software Foundation; either version 2 of the License, or | 6 | License as published by the Free Software Foundation; either |
7 | (at your option) any later version. | 7 | version 2 of the License, or (at your option) any later version. |
8 | 8 | ||
9 | This program 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 | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | GNU 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 General Public License | 14 | You should have received a copy of the GNU Library General Public License |
15 | along with this program; if not, write to the Free Software | 15 | along with this library; see the file COPYING.LIB. If not, write to |
16 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
17 | 17 | Boston, MA 02111-1307, USA. | |
18 | As a special exception this program may be linked with Qt non-commercial | ||
19 | edition, the resulting executable be distributed, without including the | ||
20 | source code for the Qt non-commercial edition in the source distribution. | ||
21 | |||
22 | */ | 18 | */ |
23 | 19 | ||
24 | 20 | ||
25 | #include "xmltree.h" | 21 | #include "xmltree.h" |
26 | 22 | ||
27 | #include <qxml.h> | 23 | #include <qxml.h> |
28 | 24 | ||
29 | #include <assert.h> | 25 | #include <assert.h> |
30 | 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 | |||
31 | XMLElement::XMLElement() | 49 | XMLElement::XMLElement() |
32 | : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) | 50 | : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) |
33 | { | 51 | { |
34 | } | 52 | } |
35 | 53 | ||
36 | XMLElement::~XMLElement() | 54 | XMLElement::~XMLElement() |
37 | { | 55 | { |
38 | XMLElement *n = m_first; | 56 | XMLElement *n = m_first; |
39 | 57 | ||
40 | while ( n ) | 58 | while ( n ) |
41 | { | 59 | { |
42 | XMLElement *tmp = n; | 60 | XMLElement *tmp = n; |
43 | n = n->m_next; | 61 | n = n->m_next; |
44 | delete tmp; | 62 | delete tmp; |
45 | } | 63 | } |
46 | } | 64 | } |
47 | 65 | ||
48 | void XMLElement::appendChild( XMLElement *child ) | 66 | void XMLElement::appendChild( XMLElement *child ) |
49 | { | 67 | { |
50 | if ( child->m_parent ) | 68 | if ( child->m_parent ) |
51 | child->m_parent->removeChild( child ); | 69 | child->m_parent->removeChild( child ); |
52 | 70 | ||
53 | child->m_parent = this; | 71 | child->m_parent = this; |
54 | 72 | ||
55 | if ( m_last ) | 73 | if ( m_last ) |
56 | m_last->m_next = child; | 74 | m_last->m_next = child; |
57 | 75 | ||
58 | child->m_prev = m_last; | 76 | child->m_prev = m_last; |
59 | 77 | ||
60 | if ( !m_first ) | 78 | if ( !m_first ) |
61 | m_first = child; | 79 | m_first = child; |
62 | 80 | ||
@@ -165,80 +183,64 @@ void XMLElement::save( QTextStream &s, uint indent ) | |||
165 | s << " "; | 183 | s << " "; |
166 | } | 184 | } |
167 | } | 185 | } |
168 | 186 | ||
169 | if ( m_last ) | 187 | if ( m_last ) |
170 | { | 188 | { |
171 | if ( ( m_first && !m_first->value().isEmpty() ) || !m_parent ) | 189 | if ( ( m_first && !m_first->value().isEmpty() ) || !m_parent ) |
172 | s << ">"; | 190 | s << ">"; |
173 | else | 191 | else |
174 | s << ">" << endl; | 192 | s << ">" << endl; |
175 | 193 | ||
176 | int newIndent = indent; | 194 | int newIndent = indent; |
177 | if ( m_parent ) | 195 | if ( m_parent ) |
178 | newIndent++; | 196 | newIndent++; |
179 | 197 | ||
180 | XMLElement *n = m_first; | 198 | XMLElement *n = m_first; |
181 | while ( n ) | 199 | while ( n ) |
182 | { | 200 | { |
183 | n->save( s, newIndent ); | 201 | n->save( s, newIndent ); |
184 | n = n->nextChild(); | 202 | n = n->nextChild(); |
185 | } | 203 | } |
186 | 204 | ||
187 | if ( m_last && m_last->value().isEmpty() && m_parent ) | 205 | if ( m_last && m_last->value().isEmpty() && m_parent ) |
188 | for ( uint i = 0; i < indent; ++i ) | 206 | for ( uint i = 0; i < indent; ++i ) |
189 | s << " "; | 207 | s << " "; |
190 | 208 | ||
191 | if ( m_parent ) | 209 | if ( m_parent ) |
192 | s << "</" << m_tag << ">" << endl; | 210 | s << "</" << m_tag << ">" << endl; |
193 | } | 211 | } |
194 | else | 212 | else |
195 | s << "/>" << endl; | 213 | s << "/>" << endl; |
196 | } | 214 | } |
197 | /** | ||
198 | Encode an attribute value upon saving. | ||
199 | replaces '"' with """ | ||
200 | replaces '<' with "<" | ||
201 | replaces '&' with "&" | ||
202 | replaces '>' with ">" | ||
203 | */ | ||
204 | QString XMLElement::encodeAttr( const QString& str ) | ||
205 | { | ||
206 | QString encAttr( str ); // cause of the const parameter | ||
207 | encAttr = encAttr.replace( QRegExp( "[<]" ), "<" ); | ||
208 | encAttr = encAttr.replace( QRegExp( "[>]" ), ">" ); | ||
209 | encAttr = encAttr.replace( QRegExp( "[\"]" ), """ ); | ||
210 | encAttr = encAttr.replace( QRegExp( "[&]" ), "&" ); | ||
211 | return encAttr; | ||
212 | } | ||
213 | 215 | ||
214 | class Handler : public QXmlDefaultHandler | 216 | class Handler : public QXmlDefaultHandler |
215 | { | 217 | { |
216 | public: | 218 | public: |
217 | Handler() : m_node( 0 ), m_root( 0 ) {} | 219 | Handler() : m_node( 0 ), m_root( 0 ) {} |
218 | 220 | ||
219 | XMLElement *root() const { return m_root; } | 221 | XMLElement *root() const { return m_root; } |
220 | 222 | ||
221 | virtual bool startDocument(); | 223 | virtual bool startDocument(); |
222 | virtual bool endDocument(); | 224 | virtual bool endDocument(); |
223 | virtual bool startElement( const QString &ns, const QString &ln, const QString &qName, | 225 | virtual bool startElement( const QString &ns, const QString &ln, const QString &qName, |
224 | const QXmlAttributes &attr ); | 226 | const QXmlAttributes &attr ); |
225 | virtual bool endElement( const QString &ns, const QString &ln, const QString &qName ); | 227 | virtual bool endElement( const QString &ns, const QString &ln, const QString &qName ); |
226 | virtual bool characters( const QString &ch ); | 228 | virtual bool characters( const QString &ch ); |
227 | 229 | ||
228 | private: | 230 | private: |
229 | XMLElement *m_node; | 231 | XMLElement *m_node; |
230 | XMLElement *m_root; | 232 | XMLElement *m_root; |
231 | }; | 233 | }; |
232 | 234 | ||
233 | bool Handler::startDocument() | 235 | bool Handler::startDocument() |
234 | { | 236 | { |
235 | m_root = m_node = new XMLElement; | 237 | m_root = m_node = new XMLElement; |
236 | 238 | ||
237 | return true; | 239 | return true; |
238 | } | 240 | } |
239 | 241 | ||
240 | bool Handler::endDocument() | 242 | bool Handler::endDocument() |
241 | { | 243 | { |
242 | return m_root == m_node; | 244 | return m_root == m_node; |
243 | } | 245 | } |
244 | 246 | ||