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
@@ -85,4 +85,6 @@ public:
     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 );
 
diff --git a/libopie/xmltree.cc b/libopie/xmltree.cc
index d5ce74a..3d03cc6 100644
--- a/libopie/xmltree.cc
+++ b/libopie/xmltree.cc
@@ -18,5 +18,5 @@
 */
 
-
+#include <qpe/stringutil.h>
 #include <opie/xmltree.h>
 
@@ -25,25 +25,4 @@
 #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()
@@ -111,5 +90,16 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild )
         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 )
 {
@@ -164,5 +154,5 @@ void XMLElement::save( QTextStream &s, uint indent )
     if ( !m_value.isEmpty() )
     {
-        s << encodeAttr( m_value );
+        s << Qtopia::escapeString( m_value );
         return;
     }
@@ -180,5 +170,5 @@ void XMLElement::save( QTextStream &s, uint indent )
         for (; it != end; ++it )
         {
-            s << it.key() << "=\"" << encodeAttr( it.data() ) << "\"";
+            s << it.key() << "=\"" << Qtopia::escapeString( it.data() ) << "\"";
             s << " ";
         }
@@ -325,2 +315,4 @@ XMLElement *XMLElement::load( const QString &fileName )
     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
@@ -85,4 +85,6 @@ public:
     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 );
 
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
@@ -18,5 +18,5 @@
 */
 
-
+#include <qpe/stringutil.h>
 #include <opie/xmltree.h>
 
@@ -25,25 +25,4 @@
 #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()
@@ -111,5 +90,16 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild )
         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 )
 {
@@ -164,5 +154,5 @@ void XMLElement::save( QTextStream &s, uint indent )
     if ( !m_value.isEmpty() )
     {
-        s << encodeAttr( m_value );
+        s << Qtopia::escapeString( m_value );
         return;
     }
@@ -180,5 +170,5 @@ void XMLElement::save( QTextStream &s, uint indent )
         for (; it != end; ++it )
         {
-            s << it.key() << "=\"" << encodeAttr( it.data() ) << "\"";
+            s << it.key() << "=\"" << Qtopia::escapeString( it.data() ) << "\"";
             s << " ";
         }
@@ -325,2 +315,4 @@ XMLElement *XMLElement::load( const QString &fileName )
     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
@@ -85,4 +85,6 @@ public:
     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 );