summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/xmltree.cc70
-rw-r--r--libopie2/opiecore/xmltree.cc70
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,24 +1,20 @@
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
@@ -28,6 +24,28 @@
28 24
29#include <assert.h> 25#include <assert.h>
30 26
27namespace
28{
29
30/**
31 Encode an attribute value upon saving.
32 replaces '"' with "&quot"
33 replaces '<' with "&lt"
34 replaces '&' with "&amp"
35 replaces '>' with "&gt"
36*/
37QString encodeAttr( const QString& str )
38{
39 QString encAttr( str ); // cause of the const parameter
40 encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
41 encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
42 encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
43 encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
44 return encAttr;
45}
46
47}
48
31XMLElement::XMLElement() 49XMLElement::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{
@@ -194,22 +212,6 @@ void XMLElement::save( QTextStream &s, uint indent )
194 else 212 else
195 s << "/>" << endl; 213 s << "/>" << endl;
196} 214}
197/**
198 Encode an attribute value upon saving.
199 replaces '"' with "&quot"
200 replaces '<' with "&lt"
201 replaces '&' with "&amp"
202 replaces '>' with "&gt"
203*/
204QString XMLElement::encodeAttr( const QString& str )
205{
206 QString encAttr( str ); // cause of the const parameter
207 encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
208 encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
209 encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
210 encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
211 return encAttr;
212}
213 215
214class Handler : public QXmlDefaultHandler 216class Handler : public QXmlDefaultHandler
215{ 217{
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,24 +1,20 @@
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
@@ -28,6 +24,28 @@
28 24
29#include <assert.h> 25#include <assert.h>
30 26
27namespace
28{
29
30/**
31 Encode an attribute value upon saving.
32 replaces '"' with "&quot"
33 replaces '<' with "&lt"
34 replaces '&' with "&amp"
35 replaces '>' with "&gt"
36*/
37QString encodeAttr( const QString& str )
38{
39 QString encAttr( str ); // cause of the const parameter
40 encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
41 encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
42 encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
43 encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
44 return encAttr;
45}
46
47}
48
31XMLElement::XMLElement() 49XMLElement::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{
@@ -194,22 +212,6 @@ void XMLElement::save( QTextStream &s, uint indent )
194 else 212 else
195 s << "/>" << endl; 213 s << "/>" << endl;
196} 214}
197/**
198 Encode an attribute value upon saving.
199 replaces '"' with "&quot"
200 replaces '<' with "&lt"
201 replaces '&' with "&amp"
202 replaces '>' with "&gt"
203*/
204QString XMLElement::encodeAttr( const QString& str )
205{
206 QString encAttr( str ); // cause of the const parameter
207 encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
208 encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
209 encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
210 encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
211 return encAttr;
212}
213 215
214class Handler : public QXmlDefaultHandler 216class Handler : public QXmlDefaultHandler
215{ 217{