summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opie/xmltree.h2
-rw-r--r--libopie/xmltree.cc42
-rw-r--r--libopie/xmltree.h2
-rw-r--r--libopie2/opiecore/xmltree.cc42
-rw-r--r--libopie2/opiecore/xmltree.h2
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
@@ -63,48 +63,50 @@ public:
* The ownership gets dropped. You need to delete the
* child yourself.
*/
void removeChild( XMLElement *child );
/** parent() returns the parent of this XMLElement
* If there is no parent 0l gets returned
*/
XMLElement *parent() const { return m_parent; }
XMLElement *firstChild() const { return m_first; }
XMLElement *nextChild() const { return m_next; }
XMLElement *prevChild() const { return m_prev; }
XMLElement *lastChild() const { return m_last; }
void setTagName( const QString &tag ) { m_tag = tag; }
QString tagName() const { return m_tag; }
void setValue( const QString &val ) { m_value = val; }
QString value() const { return m_value; }
void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; }
AttributeMap attributes() const { return m_attributes; }
AttributeMap &attributes() { return m_attributes; }
+ QString attribute(const QString &)const;
+ void setAttribute( const QString &attr, const QString &value );
void save( QTextStream &stream, uint indent = 0 );
XMLElement *namedItem( const QString &name );
XMLElement *clone() const;
static XMLElement *load( const QString &fileName );
private:
QString m_tag;
QString m_value;
AttributeMap m_attributes;
XMLElement *m_parent;
XMLElement *m_next;
XMLElement *m_prev;
XMLElement *m_first;
XMLElement *m_last;
XMLElement( const XMLElement &rhs );
XMLElement &operator=( const XMLElement &rhs );
};
#endif
diff --git a/libopie/xmltree.cc b/libopie/xmltree.cc
index d5ce74a..3d03cc6 100644
--- a/libopie/xmltree.cc
+++ b/libopie/xmltree.cc
@@ -1,71 +1,50 @@
/* This file is part of the KDE project
Copyright (C) 2001 Simon Hausmann <hausmann@kde.org>
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 <qpe/stringutil.h>
#include <opie/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;
@@ -89,49 +68,60 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild )
{
appendChild( newChild );
return;
}
assert( refChild );
assert( refChild->m_parent );
assert( refChild->m_parent == this );
if ( newChild->m_parent && newChild != refChild )
newChild->m_parent->removeChild( newChild );
newChild->m_parent = this;
XMLElement *next = refChild->m_next;
refChild->m_next = newChild;
newChild->m_prev = refChild;
newChild->m_next = next;
if ( next )
next->m_prev = newChild;
}
-
+QString XMLElement::attribute(const QString &attr )const
+{
+ if ( !m_attributes.contains( attr ) )
+ return QString::null;
+ AttributeMap::ConstIterator it = m_attributes.find( attr );
+ return it.data();
+}
+void XMLElement::setAttribute(const QString &attr, const QString &value )
+{
+ m_attributes.remove( attr );
+ m_attributes.insert( attr, value );
+}
void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild )
{
assert( refChild );
assert( refChild->m_parent );
assert( refChild->m_parent == this );
assert( newChild != refChild );
if ( newChild->m_parent && newChild != refChild )
newChild->m_parent->removeChild( newChild );
newChild->m_parent = this;
XMLElement *prev = refChild->m_prev;
refChild->m_prev = newChild;
newChild->m_prev = prev;
newChild->m_next = refChild;
if ( prev )
prev->m_next = newChild;
if ( refChild == m_first )
m_first = newChild;
@@ -142,65 +132,65 @@ void XMLElement::removeChild( XMLElement *child )
if ( child->m_parent != this )
return;
if ( m_first == child )
m_first = child->m_next;
if ( m_last == child )
m_last = child->m_prev;
if ( child->m_prev )
child->m_prev->m_next = child->m_next;
if ( child->m_next )
child->m_next->m_prev = child->m_prev;
child->m_parent = 0;
child->m_prev = 0;
child->m_next = 0;
}
void XMLElement::save( QTextStream &s, uint indent )
{
if ( !m_value.isEmpty() )
{
- s << encodeAttr( m_value );
+ s << Qtopia::escapeString( m_value );
return;
}
for ( uint i = 0; i < indent; ++i )
s << " ";
s << "<" << m_tag;
if ( !m_attributes.isEmpty() )
{
s << " ";
AttributeMap::ConstIterator it = m_attributes.begin();
AttributeMap::ConstIterator end = m_attributes.end();
for (; it != end; ++it )
{
- s << it.key() << "=\"" << encodeAttr( it.data() ) << "\"";
+ s << it.key() << "=\"" << Qtopia::escapeString( it.data() ) << "\"";
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 )
@@ -303,24 +293,26 @@ XMLElement *XMLElement::clone() const
for (; e; e = e->m_next )
res->appendChild( e->clone() );
return res;
}
XMLElement *XMLElement::load( const QString &fileName )
{
QFile f( fileName );
if ( !f.open( IO_ReadOnly ) )
return 0;
QTextStream stream( &f );
stream.setEncoding( QTextStream::UnicodeUTF8 );
QXmlInputSource src( stream );
QXmlSimpleReader reader;
Handler handler;
reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false );
reader.setContentHandler( &handler );
reader.parse( src );
return handler.root();;
}
+
+
diff --git a/libopie/xmltree.h b/libopie/xmltree.h
index 7f1b7b7..7f50365 100644
--- a/libopie/xmltree.h
+++ b/libopie/xmltree.h
@@ -63,48 +63,50 @@ public:
* The ownership gets dropped. You need to delete the
* child yourself.
*/
void removeChild( XMLElement *child );
/** parent() returns the parent of this XMLElement
* If there is no parent 0l gets returned
*/
XMLElement *parent() const { return m_parent; }
XMLElement *firstChild() const { return m_first; }
XMLElement *nextChild() const { return m_next; }
XMLElement *prevChild() const { return m_prev; }
XMLElement *lastChild() const { return m_last; }
void setTagName( const QString &tag ) { m_tag = tag; }
QString tagName() const { return m_tag; }
void setValue( const QString &val ) { m_value = val; }
QString value() const { return m_value; }
void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; }
AttributeMap attributes() const { return m_attributes; }
AttributeMap &attributes() { return m_attributes; }
+ QString attribute(const QString &)const;
+ void setAttribute( const QString &attr, const QString &value );
void save( QTextStream &stream, uint indent = 0 );
XMLElement *namedItem( const QString &name );
XMLElement *clone() const;
static XMLElement *load( const QString &fileName );
private:
QString m_tag;
QString m_value;
AttributeMap m_attributes;
XMLElement *m_parent;
XMLElement *m_next;
XMLElement *m_prev;
XMLElement *m_first;
XMLElement *m_last;
XMLElement( const XMLElement &rhs );
XMLElement &operator=( const XMLElement &rhs );
};
#endif
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
@@ -1,71 +1,50 @@
/* This file is part of the KDE project
Copyright (C) 2001 Simon Hausmann <hausmann@kde.org>
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 <qpe/stringutil.h>
#include <opie/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;
@@ -89,49 +68,60 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild )
{
appendChild( newChild );
return;
}
assert( refChild );
assert( refChild->m_parent );
assert( refChild->m_parent == this );
if ( newChild->m_parent && newChild != refChild )
newChild->m_parent->removeChild( newChild );
newChild->m_parent = this;
XMLElement *next = refChild->m_next;
refChild->m_next = newChild;
newChild->m_prev = refChild;
newChild->m_next = next;
if ( next )
next->m_prev = newChild;
}
-
+QString XMLElement::attribute(const QString &attr )const
+{
+ if ( !m_attributes.contains( attr ) )
+ return QString::null;
+ AttributeMap::ConstIterator it = m_attributes.find( attr );
+ return it.data();
+}
+void XMLElement::setAttribute(const QString &attr, const QString &value )
+{
+ m_attributes.remove( attr );
+ m_attributes.insert( attr, value );
+}
void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild )
{
assert( refChild );
assert( refChild->m_parent );
assert( refChild->m_parent == this );
assert( newChild != refChild );
if ( newChild->m_parent && newChild != refChild )
newChild->m_parent->removeChild( newChild );
newChild->m_parent = this;
XMLElement *prev = refChild->m_prev;
refChild->m_prev = newChild;
newChild->m_prev = prev;
newChild->m_next = refChild;
if ( prev )
prev->m_next = newChild;
if ( refChild == m_first )
m_first = newChild;
@@ -142,65 +132,65 @@ void XMLElement::removeChild( XMLElement *child )
if ( child->m_parent != this )
return;
if ( m_first == child )
m_first = child->m_next;
if ( m_last == child )
m_last = child->m_prev;
if ( child->m_prev )
child->m_prev->m_next = child->m_next;
if ( child->m_next )
child->m_next->m_prev = child->m_prev;
child->m_parent = 0;
child->m_prev = 0;
child->m_next = 0;
}
void XMLElement::save( QTextStream &s, uint indent )
{
if ( !m_value.isEmpty() )
{
- s << encodeAttr( m_value );
+ s << Qtopia::escapeString( m_value );
return;
}
for ( uint i = 0; i < indent; ++i )
s << " ";
s << "<" << m_tag;
if ( !m_attributes.isEmpty() )
{
s << " ";
AttributeMap::ConstIterator it = m_attributes.begin();
AttributeMap::ConstIterator end = m_attributes.end();
for (; it != end; ++it )
{
- s << it.key() << "=\"" << encodeAttr( it.data() ) << "\"";
+ s << it.key() << "=\"" << Qtopia::escapeString( it.data() ) << "\"";
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 )
@@ -303,24 +293,26 @@ XMLElement *XMLElement::clone() const
for (; e; e = e->m_next )
res->appendChild( e->clone() );
return res;
}
XMLElement *XMLElement::load( const QString &fileName )
{
QFile f( fileName );
if ( !f.open( IO_ReadOnly ) )
return 0;
QTextStream stream( &f );
stream.setEncoding( QTextStream::UnicodeUTF8 );
QXmlInputSource src( stream );
QXmlSimpleReader reader;
Handler handler;
reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false );
reader.setContentHandler( &handler );
reader.parse( src );
return handler.root();;
}
+
+
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
@@ -63,48 +63,50 @@ public:
* The ownership gets dropped. You need to delete the
* child yourself.
*/
void removeChild( XMLElement *child );
/** parent() returns the parent of this XMLElement
* If there is no parent 0l gets returned
*/
XMLElement *parent() const { return m_parent; }
XMLElement *firstChild() const { return m_first; }
XMLElement *nextChild() const { return m_next; }
XMLElement *prevChild() const { return m_prev; }
XMLElement *lastChild() const { return m_last; }
void setTagName( const QString &tag ) { m_tag = tag; }
QString tagName() const { return m_tag; }
void setValue( const QString &val ) { m_value = val; }
QString value() const { return m_value; }
void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; }
AttributeMap attributes() const { return m_attributes; }
AttributeMap &attributes() { return m_attributes; }
+ QString attribute(const QString &)const;
+ void setAttribute( const QString &attr, const QString &value );
void save( QTextStream &stream, uint indent = 0 );
XMLElement *namedItem( const QString &name );
XMLElement *clone() const;
static XMLElement *load( const QString &fileName );
private:
QString m_tag;
QString m_value;
AttributeMap m_attributes;
XMLElement *m_parent;
XMLElement *m_next;
XMLElement *m_prev;
XMLElement *m_first;
XMLElement *m_last;
XMLElement( const XMLElement &rhs );
XMLElement &operator=( const XMLElement &rhs );
};
#endif