-rw-r--r-- | libopie2/opiecore/xmltree.cc | 42 | ||||
-rw-r--r-- | libopie2/opiecore/xmltree.h | 2 |
2 files changed, 19 insertions, 25 deletions
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 @@ -14,40 +14,19 @@ 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 """ - replaces '<' with "<" - replaces '&' with "&" - replaces '>' with ">" -*/ -QString encodeAttr( const QString& str ) -{ - QString encAttr( str ); // cause of the const parameter - encAttr = encAttr.replace( QRegExp( "[<]" ), "<" ); - encAttr = encAttr.replace( QRegExp( "[>]" ), ">" ); - encAttr = encAttr.replace( QRegExp( "[\"]" ), """ ); - encAttr = encAttr.replace( QRegExp( "[&]" ), "&" ); - return encAttr; -} - -} XMLElement::XMLElement() : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) { } @@ -107,13 +86,24 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild ) 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 ); @@ -160,13 +150,13 @@ void XMLElement::removeChild( XMLElement *child ) } 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 << " "; @@ -176,13 +166,13 @@ void XMLElement::save( QTextStream &s, uint indent ) { 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 ) { @@ -321,6 +311,8 @@ XMLElement *XMLElement::load( const QString &fileName ) 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 @@ -81,12 +81,14 @@ public: 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; |