along with tododb

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
@@ -86,2 +86,4 @@ public:
 
+    QString attribute(const QString &)const;
+    void setAttribute( const QString &attr, const QString &value );
     void save( QTextStream &stream, uint indent = 0 );
diff --git a/libopie/xmltree.cc b/libopie/xmltree.cc
index d5ce74a..3d03cc6 100644
--- a/libopie/xmltree.cc
+++ b/libopie/xmltree.cc
@@ -19,3 +19,3 @@
 
-
+#include <qpe/stringutil.h>
 #include <opie/xmltree.h>
@@ -26,23 +26,2 @@
 
-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;
-}
-
-}
 
@@ -112,3 +91,14 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild )
 }
-
+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 )
@@ -165,3 +155,3 @@ void XMLElement::save( QTextStream &s, uint indent )
     {
-        s << encodeAttr( m_value );
+        s << Qtopia::escapeString( m_value );
         return;
@@ -181,3 +171,3 @@ void XMLElement::save( QTextStream &s, uint indent )
         {
-            s << it.key() << "=\"" << encodeAttr( it.data() ) << "\"";
+            s << it.key() << "=\"" << Qtopia::escapeString( it.data() ) << "\"";
             s << " ";
@@ -326 +316,3 @@ XMLElement *XMLElement::load( const QString &fileName )
 }
+
+
diff --git a/libopie/xmltree.h b/libopie/xmltree.h
index 7f1b7b7..7f50365 100644
--- a/libopie/xmltree.h
+++ b/libopie/xmltree.h
@@ -86,2 +86,4 @@ public:
 
+    QString attribute(const QString &)const;
+    void setAttribute( const QString &attr, const QString &value );
     void save( QTextStream &stream, uint indent = 0 );
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
@@ -19,3 +19,3 @@
 
-
+#include <qpe/stringutil.h>
 #include <opie/xmltree.h>
@@ -26,23 +26,2 @@
 
-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;
-}
-
-}
 
@@ -112,3 +91,14 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild )
 }
-
+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 )
@@ -165,3 +155,3 @@ void XMLElement::save( QTextStream &s, uint indent )
     {
-        s << encodeAttr( m_value );
+        s << Qtopia::escapeString( m_value );
         return;
@@ -181,3 +171,3 @@ void XMLElement::save( QTextStream &s, uint indent )
         {
-            s << it.key() << "=\"" << encodeAttr( it.data() ) << "\"";
+            s << it.key() << "=\"" << Qtopia::escapeString( it.data() ) << "\"";
             s << " ";
@@ -326 +316,3 @@ XMLElement *XMLElement::load( const QString &fileName )
 }
+
+
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
@@ -86,2 +86,4 @@ public:
 
+    QString attribute(const QString &)const;
+    void setAttribute( const QString &attr, const QString &value );
     void save( QTextStream &stream, uint indent = 0 );