| -rw-r--r-- | libopie/xmltree.cc | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/libopie/xmltree.cc b/libopie/xmltree.cc index d5ce74a..3d03cc6 100644 --- a/libopie/xmltree.cc +++ b/libopie/xmltree.cc @@ -8,52 +8,31 @@ 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 """ - 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 ) { } XMLElement::~XMLElement() { XMLElement *n = m_first; while ( n ) { @@ -101,25 +80,36 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild ) 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; @@ -154,41 +144,41 @@ void XMLElement::removeChild( XMLElement *child ) 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; @@ -315,12 +305,14 @@ XMLElement *XMLElement::load( const QString &fileName ) 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();; } + + |