mark: added .pro for libopie. moved .h to includedir.

6 files changed, 339 insertions, 2 deletions

diff --git a/include/opie/xmltree.h b/include/opie/xmltree.h
new file mode 100644
index 0000000..7f1b7b7
--- a/dev/null
+++ b/include/opie/xmltree.h
@@ -0,0 +1,110 @@
+/*  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>
+
+/**
+ *  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; }
+
+    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 );
+};
+
+#endif
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
new file mode 100644
index 0000000..95ec145
--- a/dev/null
+++ b/libopie/libopie.pro
@@ -0,0 +1,7 @@
+TEMPLATE        = lib
+CONFIG          += qte warn_on release
+HEADERS 	= $(OPIEDIR)/include/opie/xmltree.h
+SOURCES		= xmltree.cc
+TARGET		= opie
+INCLUDEPATH += $(OPIEDIR)/include
+DESTDIR         = $(QTDIR)/lib$(PROJMAK)
diff --git a/libopie/xmltree.cc b/libopie/xmltree.cc
index bf93151..d5ce74a 100644
--- a/libopie/xmltree.cc
+++ b/libopie/xmltree.cc
@@ -1,213 +1,213 @@
 /*  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 <opie/xmltree.h>
 
 #include <qxml.h>
 
 #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()
     : 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;
 }
 
 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 << encodeAttr( 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 << " ";
         }
     }
 
     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;
diff --git a/libopie/xmltree.h b/libopie/xmltree.h
new file mode 100644
index 0000000..7f1b7b7
--- a/dev/null
+++ b/libopie/xmltree.h
@@ -0,0 +1,110 @@
+/*  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>
+
+/**
+ *  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; }
+
+    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 );
+};
+
+#endif
diff --git a/libopie2/opiecore/xmltree.cc b/libopie2/opiecore/xmltree.cc
index bf93151..d5ce74a 100644
--- a/libopie2/opiecore/xmltree.cc
+++ b/libopie2/opiecore/xmltree.cc
@@ -1,213 +1,213 @@
 /*  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 <opie/xmltree.h>
 
 #include <qxml.h>
 
 #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()
     : 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;
 }
 
 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 << encodeAttr( 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 << " ";
         }
     }
 
     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;
diff --git a/libopie2/opiecore/xmltree.h b/libopie2/opiecore/xmltree.h
new file mode 100644
index 0000000..7f1b7b7
--- a/dev/null
+++ b/libopie2/opiecore/xmltree.h
@@ -0,0 +1,110 @@
+/*  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>
+
+/**
+ *  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; }
+
+    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 );
+};
+
+#endif