summaryrefslogtreecommitdiff
path: root/libopie2/opiepim
Side-by-side diff
Diffstat (limited to 'libopie2/opiepim') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/backend/backends.pro6
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp2
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_sql.h8
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp3
-rw-r--r--libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp2
-rw-r--r--libopie2/opiepim/backend/odatebookaccessbackend_sql.h8
-rw-r--r--libopie2/opiepim/backend/otodoaccesssql.cpp2
-rw-r--r--libopie2/opiepim/backend/otodoaccesssql.h12
-rw-r--r--libopie2/opiepim/core/backends/private/xmltree.cc323
-rw-r--r--libopie2/opiepim/core/backends/private/xmltree.h122
10 files changed, 476 insertions, 12 deletions
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro
index 4231a00..d4867ba 100644
--- a/libopie2/opiepim/backend/backends.pro
+++ b/libopie2/opiepim/backend/backends.pro
@@ -10,7 +10,8 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \
core/backends/otodoaccessvcal.cpp \
core/backends/otodoaccessxml.cpp \
core/backends/odatebookaccess.cpp \
- core/backends/odatebookaccessbackend_sql.cpp
+ core/backends/odatebookaccessbackend_sql.cpp \
+ core/backends/private/xmltree.cc
HEADERS += core/backends/obackendfactory.h \
core/backends/ocontactaccessbackend.h \
@@ -28,4 +29,5 @@ HEADERS += core/backends/obackendfactory.h \
core/backends/otodoaccesssql.h \
core/backends/otodoaccessvcal.h \
core/backends/otodoaccessxml.h \
- core/backends/odatebookaccess.h
+ core/backends/odatebookaccess.h \
+ core/backends/private/xmltree.h
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index f121cc2..d16d692 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -46,7 +46,7 @@
#include <opie2/osqlmanager.h>
#include <opie2/osqlquery.h>
-
+using namespace Opie::DB;
// If defined, we use a horizontal table ( uid, attr1, attr2, attr3, ..., attrn ) instead
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
index 58ae2ae..ba122ec 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
@@ -40,9 +40,13 @@
#include <qdict.h>
/* aren't in namespace Opie yet - alwin */
+namespace Opie {
+namespace DB {
class OSQLDriver;
class OSQLResult;
class OSQLResultItem;
+}
+}
namespace Opie {
@@ -91,7 +95,7 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
bool reload();
private:
- QArray<int> extractUids( OSQLResult& res ) const;
+ QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
QMap<int, QString> requestNonCustom( int uid ) const;
QMap<QString, QString> requestCustom( int uid ) const;
void update();
@@ -101,7 +105,7 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
QString m_fileName;
QArray<int> m_uids;
- OSQLDriver* m_driver;
+ Opie::DB::OSQLDriver* m_driver;
};
}
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 5d92b8f..f5e76d5 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -41,7 +41,7 @@
#include <qpe/global.h>
-#include <opie2/xmltree.h>
+#include "private/xmltree.h"
#include <opie2/ocontactaccessbackend.h>
#include <opie2/ocontactaccess.h>
@@ -49,6 +49,7 @@
#include <errno.h>
using namespace Opie;
+using namespace Opie::Pim::Private;
namespace Opie {
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
index 2ee76cc..a779dc1 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
@@ -46,6 +46,8 @@
#include <opie2/opimrecurrence.h>
#include <opie2/odatebookaccessbackend_sql.h>
+using namespace Opie::DB;
+
namespace Opie {
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.h b/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
index cbfeb97..60d7f21 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
@@ -34,7 +34,11 @@
#include <opie2/odatebookaccessbackend.h>
+namespace Opie {
+namespace DB {
class OSQLDriver;
+}
+}
namespace Opie {
/**
@@ -77,14 +81,14 @@ private:
QMap<int, QString> m_fieldMap;
QMap<QString, int> m_reverseFieldMap;
- OSQLDriver* m_driver;
+ Opie::DB::OSQLDriver* m_driver;
class Private;
Private *d;
void initFields();
void update();
- QArray<int> extractUids( OSQLResult& res ) const;
+ QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
};
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index 72232e5..d218090 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -41,6 +41,8 @@
#include <opie2/opimnotifymanager.h>
#include <opie2/opimrecurrence.h>
+using namespace Opie::DB;
+
using namespace Opie;
/*
* first some query
diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h
index e945863..0ae2591 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.h
+++ b/libopie2/opiepim/backend/otodoaccesssql.h
@@ -33,9 +33,13 @@
#include <opie2/otodoaccessbackend.h>
+namespace Opie {
+namespace DB {
class OSQLDriver;
class OSQLResult;
class OSQLResultItem;
+}
+}
namespace Opie {
@@ -71,14 +75,14 @@ private:
void update()const;
void fillDict();
inline bool date( QDate& date, const QString& )const;
- inline OPimTodo todo( const OSQLResult& )const;
- inline OPimTodo todo( OSQLResultItem& )const;
- inline QArray<int> uids( const OSQLResult& )const;
+ inline OPimTodo todo( const Opie::DB::OSQLResult& )const;
+ inline OPimTodo todo( Opie::DB::OSQLResultItem& )const;
+ inline QArray<int> uids( const Opie::DB::OSQLResult& )const;
OPimTodo todo( int uid )const;
QBitArray sup() const;
QAsciiDict<int> m_dict;
- OSQLDriver* m_driver;
+ Opie::DB::OSQLDriver* m_driver;
QArray<int> m_uids;
bool m_dirty : 1;
};
diff --git a/libopie2/opiepim/core/backends/private/xmltree.cc b/libopie2/opiepim/core/backends/private/xmltree.cc
new file mode 100644
index 0000000..40749ca
--- a/dev/null
+++ b/libopie2/opiepim/core/backends/private/xmltree.cc
@@ -0,0 +1,323 @@
+/* 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
new file mode 100644
index 0000000..9817a02
--- a/dev/null
+++ b/libopie2/opiepim/core/backends/private/xmltree.h
@@ -0,0 +1,122 @@
+/* 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