but XML Parser back to OPie Core as libtinykate uses it as well

4 files changed, 4 insertions, 452 deletions

diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro
index d4867ba..953d928 100644
--- a/libopie2/opiepim/backend/backends.pro
+++ b/libopie2/opiepim/backend/backends.pro
@@ -1,33 +1,31 @@
 SOURCES += core/backends/ocontactaccessbackend_sql.cpp \
         core/backends/ocontactaccessbackend_vcard.cpp \
         core/backends/ocontactaccessbackend_xml.cpp \
         core/backends/ocontactaccess.cpp \
         core/backends/odatebookaccessbackend.cpp \
         core/backends/odatebookaccessbackend_xml.cpp \
         core/backends/otodoaccessbackend.cpp \
         core/backends/otodoaccess.cpp \
         core/backends/otodoaccesssql.cpp \
         core/backends/otodoaccessvcal.cpp \
         core/backends/otodoaccessxml.cpp \
         core/backends/odatebookaccess.cpp \
-        core/backends/odatebookaccessbackend_sql.cpp \
-        core/backends/private/xmltree.cc
+        core/backends/odatebookaccessbackend_sql.cpp 
         
 HEADERS += core/backends/obackendfactory.h \
         core/backends/ocontactaccessbackend.h \
         core/backends/ocontactaccessbackend_sql.h \
         core/backends/ocontactaccessbackend_vcard.h \
         core/backends/ocontactaccessbackend_xml.h \
         core/backends/ocontactaccess.h \
         core/backends/odatebookaccessbackend.h \
         core/backends/odatebookaccessbackend_sql.h \
         core/backends/odatebookaccessbackend_xml.h \
         core/backends/opimaccessbackend.h \
         core/backends/opimaccesstemplate.h \
         core/backends/otodoaccessbackend.h \
         core/backends/otodoaccess.h \
         core/backends/otodoaccesssql.h \
         core/backends/otodoaccessvcal.h \
         core/backends/otodoaccessxml.h \
-        core/backends/odatebookaccess.h \
-        core/backends/private/xmltree.h
+        core/backends/odatebookaccess.h 
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index f5e76d5..2b467c3 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -1,180 +1,179 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program 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.
 */
 /*
  * XML Backend for the OPIE-Contact Database.
  */
 
 #include <opie2/ocontactaccessbackend_xml.h>
 
 #include <qasciidict.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qarray.h>
 #include <qmap.h>
 
 #include <qpe/global.h>
 
-#include "private/xmltree.h"
+#include <opie2/xmltree.h>
 #include <opie2/ocontactaccessbackend.h>
 #include <opie2/ocontactaccess.h>
 
 #include <stdlib.h>
 #include <errno.h>
 
-using namespace Opie;
-using namespace Opie::Pim::Private;
+using namespace Opie::Core;
 
 
 namespace Opie {
 OPimContactAccessBackend_XML::OPimContactAccessBackend_XML ( const QString& appname, const QString& filename ):
         m_changed( false )
 {
         // Just m_contactlist should call delete if an entry
         // is removed.
         m_contactList.setAutoDelete( true );
         m_uidToContact.setAutoDelete( false );
 
         m_appName = appname;
 
         /* Set journalfile name ... */
         m_journalName = getenv("HOME");
         m_journalName +="/.abjournal" + appname;
 
         /* Expecting to access the default filename if nothing else is set */
         if ( filename.isEmpty() ){
                 m_fileName = Global::applicationFileName( "addressbook","addressbook.xml" );
         } else
                 m_fileName = filename;
 
         /* Load Database now */
         load ();
 }
 
 bool OPimContactAccessBackend_XML::save()
 {
 
         if ( !m_changed )
                 return true;
 
         QString strNewFile = m_fileName + ".new";
         QFile f( strNewFile );
         if ( !f.open( IO_WriteOnly|IO_Raw ) )
                 return false;
 
         int total_written;
         int idx_offset = 0;
         QString out;
 
         // Write Header
         out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>\n"
                 " <Groups>\n"
                 " </Groups>\n"
                 " <Contacts>\n";
         QCString cstr = out.utf8();
         f.writeBlock( cstr.data(), cstr.length() );
         idx_offset += cstr.length();
         out = "";
 
         // Write all contacts
         QListIterator<OPimContact> it( m_contactList );
         for ( ; it.current(); ++it ) {
                 // qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset );
                 out += "<Contact ";
                 (*it)->save( out );
                 out += "/>\n";
                 cstr = out.utf8();
                 total_written = f.writeBlock( cstr.data(), cstr.length() );
                 idx_offset += cstr.length();
                 if ( total_written != int(cstr.length()) ) {
                         f.close();
                         QFile::remove( strNewFile );
                         return false;
                 }
                 out = "";
         }
         out += " </Contacts>\n</AddressBook>\n";
 
         // Write Footer
         cstr = out.utf8();
         total_written = f.writeBlock( cstr.data(), cstr.length() );
         if ( total_written != int( cstr.length() ) ) {
                 f.close();
                 QFile::remove( strNewFile );
                 return false;
         }
         f.close();
 
         // move the file over, I'm just going to use the system call
         // because, I don't feel like using QDir.
         if ( ::rename( strNewFile.latin1(), m_fileName.latin1() ) < 0 ) {
                 qWarning( "problem renaming file %s to %s, errno: %d",
                           strNewFile.latin1(), m_journalName.latin1(), errno );
                 // remove the tmp file...
                 QFile::remove( strNewFile );
         }
 
         /* The journalfile should be removed now... */
         removeJournal();
 
         m_changed = false;
         return true;
 }
 
 bool OPimContactAccessBackend_XML::load ()
 {
         m_contactList.clear();
         m_uidToContact.clear();
 
         /* Load XML-File and journal if it exists */
         if ( !load ( m_fileName, false ) )
                 return false;
         /* The returncode of the journalfile is ignored due to the
          * fact that it does not exist when this class is instantiated !
          * But there may such a file exist, if the application crashed.
          * Therefore we try to load it to get the changes before the #
          * crash happened...
          */
         load (m_journalName, true);
 
         return true;
 }
 
 void OPimContactAccessBackend_XML::clear ()
 {
         m_contactList.clear();
         m_uidToContact.clear();
 
         m_changed = false;
 }
 
 bool OPimContactAccessBackend_XML::wasChangedExternally()
 {
         QFileInfo fi( m_fileName );
 
diff --git a/libopie2/opiepim/core/backends/private/xmltree.cc b/libopie2/opiepim/core/backends/private/xmltree.cc
deleted file mode 100644
index 40749ca..0000000
--- a/libopie2/opiepim/core/backends/private/xmltree.cc
+++ b/dev/null
@@ -1,323 +0,0 @@
-/*  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 "xmltree.h"
-
-#include <qpe/stringutil.h>
-
-#include <qxml.h>
-
-#include <assert.h>
-
-using namespace Opie::Pim::Private;
-
-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;
-
-    if ( m_last )
-        m_last->m_next = child;
-
-    child->m_prev = m_last;
-
-    if ( !m_first )
-        m_first = child;
-
-    m_last = child;
-}
-
-void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild )
-{
-    assert( newChild != refChild );
-
-    if ( refChild == m_last )
-    {
-        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
-{
-    AttributeMap::ConstIterator it = m_attributes.find( attr );
-    if ( it == m_attributes.end() )
-    return QString::null;
-    return it.data();
-}
-
-void XMLElement::setAttribute( const QString &attr, const QString &value )
-{
-    m_attributes.replace( 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;
-}
-
-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 << 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() << "=\"" << 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 )
-                s << " ";
-
-        if ( m_parent )
-            s << "</" << m_tag << ">" << endl;
-    }
-    else
-        s << "/>" << endl;
-}
-
-class Handler : public QXmlDefaultHandler
-{
-public:
-    Handler() : m_node( 0 ), m_root( 0 ) {}
-
-    XMLElement *root() const { return m_root; }
-
-    virtual bool startDocument();
-    virtual bool endDocument();
-    virtual bool startElement( const QString &ns, const QString &ln, const QString &qName,
-                               const QXmlAttributes &attr );
-    virtual bool endElement( const QString &ns, const QString &ln, const QString &qName );
-    virtual bool characters( const QString &ch );
-
-private:
-    XMLElement *m_node;
-    XMLElement *m_root;
-};
-
-bool Handler::startDocument()
-{
-    m_root = m_node = new XMLElement;
-
-    return true;
-}
-
-bool Handler::endDocument()
-{
-    return m_root == m_node;
-}
-
-bool Handler::startElement( const QString &, const QString &, const QString &qName,
-                           const QXmlAttributes &attr )
-{
-    XMLElement *bm = new XMLElement;
-
-    XMLElement::AttributeMap attributes;
-    for ( int i = 0; i < attr.length(); ++i )
-        attributes[ attr.qName( i ) ] = attr.value( i );
-
-    bm->setAttributes( attributes );
-
-    bm->setTagName( qName );
-
-    m_node->appendChild( bm );
-    m_node = bm;
-
-    return true;
-}
-
-bool Handler::endElement( const QString &, const QString &, const QString & )
-{
-    if ( m_node == m_root )
-        return false;
-
-    m_node = m_node->parent();
-    return true;
-}
-
-bool Handler::characters( const QString &ch )
-{
-    XMLElement *textNode = new XMLElement;
-    textNode->setValue( ch );
-    m_node->appendChild( textNode );
-    return true;
-}
-
-XMLElement *XMLElement::namedItem( const QString &name )
-{
-    XMLElement *e = m_first;
-
-    for (; e; e = e->nextChild() )
-        if ( e->tagName() == name )
-            return e;
-
-    return 0;
-}
-
-XMLElement *XMLElement::clone() const
-{
-    XMLElement *res = new XMLElement;
-
-    res->setTagName( m_tag );
-    res->setValue( m_value );
-    res->setAttributes( m_attributes );
-
-    XMLElement *e = m_first;
-    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();;
-}
-
-/* vim: et sw=4
- */
diff --git a/libopie2/opiepim/core/backends/private/xmltree.h b/libopie2/opiepim/core/backends/private/xmltree.h
deleted file mode 100644
index 9817a02..0000000
--- a/libopie2/opiepim/core/backends/private/xmltree.h
+++ b/dev/null
@@ -1,122 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2000,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.
-*/
-
-
-#ifndef __bookmarks_h__
-#define __bookmarks_h__
-
-#include <qstring.h>
-#include <qmap.h>
-#include <qtextstream.h>
-
-namespace Opie {
-namespace Pim  {
-namespace Private{
-
-/**
- *  A small xml lib written by Simon Hausmann.
- */ 
-class XMLElement
-{
-public:
-    typedef QMap<QString, QString> AttributeMap;
-
-    /**
-     *  The constructor of XMLElement
-     */
-    XMLElement();
-    ~XMLElement();
-
-    /** appendChild appends a child to the XMLElement behind the last element.
-     *  The ownership of the child get's transfered to the
-     *  this XMLElement.
-     *  If child is already the child of another parent
-     *  it's get removed from the other parent first. 
-     */
-    void appendChild( XMLElement *child );
-
-    /** inserts newChild after refChild. If newChild is the child
-     *  of another parent the child will get removed.
-     *  The ownership of child gets transfered.
-     *
-     */
-    void insertAfter( XMLElement *newChild, XMLElement *refChild );
-
-    /** same as insertAfter but the element get's inserted before refChild.
-     *
-     */
-    void insertBefore( XMLElement *newChild, XMLElement *refChild );
-
-    /** removeChild removes the child from the XMLElement.
-     *  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 );
-    class Private;
-    Private* d;
-};
-
-}
-}
-} // namespace Opie
-
-#endif