summaryrefslogtreecommitdiff
Side-by-side diff
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,62 +1,80 @@
/* This file is part of the KDE project
Copyright (C) 2001 Simon Hausmann <hausmann@kde.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- As a special exception this program may be linked with Qt non-commercial
- edition, the resulting executable be distributed, without including the
- source code for the Qt non-commercial edition in the source distribution.
-
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
*/
#include "xmltree.h"
#include <qxml.h>
#include <assert.h>
+namespace
+{
+
+/**
+ Encode an attribute value upon saving.
+ replaces '"' with "&quot"
+ replaces '<' with "&lt"
+ replaces '&' with "&amp"
+ replaces '>' with "&gt"
+*/
+QString encodeAttr( const QString& str )
+{
+ QString encAttr( str ); // cause of the const parameter
+ encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
+ encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
+ encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
+ encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
+ return encAttr;
+}
+
+}
+
XMLElement::XMLElement()
: m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 )
{
}
XMLElement::~XMLElement()
{
XMLElement *n = m_first;
while ( n )
{
XMLElement *tmp = n;
n = n->m_next;
delete tmp;
}
}
void XMLElement::appendChild( XMLElement *child )
{
if ( child->m_parent )
child->m_parent->removeChild( child );
child->m_parent = this;
if ( m_last )
m_last->m_next = child;
child->m_prev = m_last;
if ( !m_first )
m_first = child;
@@ -165,80 +183,64 @@ void XMLElement::save( QTextStream &s, uint indent )
s << " ";
}
}
if ( m_last )
{
if ( ( m_first && !m_first->value().isEmpty() ) || !m_parent )
s << ">";
else
s << ">" << endl;
int newIndent = indent;
if ( m_parent )
newIndent++;
XMLElement *n = m_first;
while ( n )
{
n->save( s, newIndent );
n = n->nextChild();
}
if ( m_last && m_last->value().isEmpty() && m_parent )
for ( uint i = 0; i < indent; ++i )
s << " ";
if ( m_parent )
s << "</" << m_tag << ">" << endl;
}
else
s << "/>" << endl;
}
-/**
- Encode an attribute value upon saving.
- replaces '"' with "&quot"
- replaces '<' with "&lt"
- replaces '&' with "&amp"
- replaces '>' with "&gt"
-*/
-QString XMLElement::encodeAttr( const QString& str )
-{
- QString encAttr( str ); // cause of the const parameter
- encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
- encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
- encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
- encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
- return encAttr;
-}
class Handler : public QXmlDefaultHandler
{
public:
Handler() : m_node( 0 ), m_root( 0 ) {}
XMLElement *root() const { return m_root; }
virtual bool startDocument();
virtual bool endDocument();
virtual bool startElement( const QString &ns, const QString &ln, const QString &qName,
const QXmlAttributes &attr );
virtual bool endElement( const QString &ns, const QString &ln, const QString &qName );
virtual bool characters( const QString &ch );
private:
XMLElement *m_node;
XMLElement *m_root;
};
bool Handler::startDocument()
{
m_root = m_node = new XMLElement;
return true;
}
bool Handler::endDocument()
{
return m_root == m_node;
}
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 @@
/* This file is part of the KDE project
Copyright (C) 2001 Simon Hausmann <hausmann@kde.org>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- As a special exception this program may be linked with Qt non-commercial
- edition, the resulting executable be distributed, without including the
- source code for the Qt non-commercial edition in the source distribution.
-
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
*/
#include "xmltree.h"
#include <qxml.h>
#include <assert.h>
+namespace
+{
+
+/**
+ Encode an attribute value upon saving.
+ replaces '"' with "&quot"
+ replaces '<' with "&lt"
+ replaces '&' with "&amp"
+ replaces '>' with "&gt"
+*/
+QString encodeAttr( const QString& str )
+{
+ QString encAttr( str ); // cause of the const parameter
+ encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
+ encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
+ encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
+ encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
+ return encAttr;
+}
+
+}
+
XMLElement::XMLElement()
: m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 )
{
}
XMLElement::~XMLElement()
{
XMLElement *n = m_first;
while ( n )
{
XMLElement *tmp = n;
n = n->m_next;
delete tmp;
}
}
void XMLElement::appendChild( XMLElement *child )
{
if ( child->m_parent )
child->m_parent->removeChild( child );
child->m_parent = this;
if ( m_last )
m_last->m_next = child;
child->m_prev = m_last;
if ( !m_first )
m_first = child;
@@ -165,80 +183,64 @@ void XMLElement::save( QTextStream &s, uint indent )
s << " ";
}
}
if ( m_last )
{
if ( ( m_first && !m_first->value().isEmpty() ) || !m_parent )
s << ">";
else
s << ">" << endl;
int newIndent = indent;
if ( m_parent )
newIndent++;
XMLElement *n = m_first;
while ( n )
{
n->save( s, newIndent );
n = n->nextChild();
}
if ( m_last && m_last->value().isEmpty() && m_parent )
for ( uint i = 0; i < indent; ++i )
s << " ";
if ( m_parent )
s << "</" << m_tag << ">" << endl;
}
else
s << "/>" << endl;
}
-/**
- Encode an attribute value upon saving.
- replaces '"' with "&quot"
- replaces '<' with "&lt"
- replaces '&' with "&amp"
- replaces '>' with "&gt"
-*/
-QString XMLElement::encodeAttr( const QString& str )
-{
- QString encAttr( str ); // cause of the const parameter
- encAttr = encAttr.replace( QRegExp( "[<]" ), "&lt" );
- encAttr = encAttr.replace( QRegExp( "[>]" ), "&gt" );
- encAttr = encAttr.replace( QRegExp( "[\"]" ), "&quot" );
- encAttr = encAttr.replace( QRegExp( "[&]" ), "&amp" );
- return encAttr;
-}
class Handler : public QXmlDefaultHandler
{
public:
Handler() : m_node( 0 ), m_root( 0 ) {}
XMLElement *root() const { return m_root; }
virtual bool startDocument();
virtual bool endDocument();
virtual bool startElement( const QString &ns, const QString &ln, const QString &qName,
const QXmlAttributes &attr );
virtual bool endElement( const QString &ns, const QString &ln, const QString &qName );
virtual bool characters( const QString &ch );
private:
XMLElement *m_node;
XMLElement *m_root;
};
bool Handler::startDocument()
{
m_root = m_node = new XMLElement;
return true;
}
bool Handler::endDocument()
{
return m_root == m_node;
}