Changes in Backendfactory: Now providing VCARD/VCAL backends if available

Changing API: Default now gets a OPimGlobal::PimType as first param instead of QString.

5 files changed, 62 insertions, 45 deletions

diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h
index 4bedbef..c8a4627 100644
--- a/libopie2/opiepim/backend/obackendfactory.h
+++ b/libopie2/opiepim/backend/obackendfactory.h
@@ -1,208 +1,222 @@
 /*
                              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.
 */
 /*
  * =====================================================================
  * ToDo: Use plugins
  * =====================================================================
  */
 #ifndef OPIE_BACKENDFACTORY_H_
 #define OPIE_BACKENDFACTORY_H_
 
 #include <qstring.h>
 #include <qasciidict.h>
 #include <qpe/config.h>
 
+#include <opie2/opimaccessbackend.h>
 #include <opie2/opimglobal.h>
 #include <opie2/otodoaccessxml.h>
+#include <opie2/otodoaccessvcal.h>
 #include <opie2/ocontactaccessbackend_xml.h>
+#include <opie2/ocontactaccessbackend_vcard.h>
 #include <opie2/odatebookaccessbackend_xml.h>
 
 #ifdef __USE_SQL
 #include <opie2/otodoaccesssql.h>
 #include <opie2/ocontactaccessbackend_sql.h>
 #include <opie2/odatebookaccessbackend_sql.h>
 #endif
 
 using namespace Opie;
 using namespace Opie::Pim;
 
 namespace Opie {
 
 class OBackendPrivate;
 
 /**
  * This class is our factory. It will give us the default implementations
  * of at least Todolist, Contacts and Datebook. In the future this class will
  * allow users to switch the backend with ( XML->SQLite ) without the need
  * to recompile.#
  * This class - as the whole PIM Api - is making use of templates
  *
  * <pre>
  *   OPimTodoAccessBackend* backend = OBackEndFactory<OPimTodoAccessBackend>::Default("todo", QString::null );
  *   backend->load();
  * </pre>
  *
  * @author Stefan Eilers
  * @version 0.1
  */
 template<class T>
 class OBackendFactory
 {
  public:
 	OBackendFactory() {};
 
         /**
          * Returns a selected backend implementation
          * @param type the type of the backend
 	 * @param database the type of the used database
          * @param appName The name of your application. It will be passed on to the backend.
+	 * @param filename Filename of the database file if you don't want to access the default 
          */
 	static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database,
-			  const QString& appName ){
+			  const QString& appName, const QString& filename = QString::null ){
 		qWarning("Selected backend for %d is: %d", type, database );
 		// If we should use the dafult database style, we have to request it
-		OPimGlobal::DatabaseStyle used_database = database;
-		if ( database == OPimGlobal::DEFAULT ){
-			used_database = defaultDB( type );
+		OPimGlobal::DatabaseStyle use_database = database;
+		if ( use_database == OPimGlobal::DEFAULT ){
+			use_database = defaultDB( type );
 		}
 
-
 		switch ( type ){
 		case OPimGlobal::TODOLIST:
+
+			switch ( use_database ){
+			default: // Use SQL if something weird is given.
+				// Fall through !!
+			case OPimGlobal::SQL:
 #ifdef __USE_SQL
-			if ( used_database == OPimGlobal::SQL )
-				return (T*) new OPimTodoAccessBackendSQL("");
+				return (T*) new OPimTodoAccessBackendSQL( filename );
+				break;
 #else
-			if ( used_database == OPimGlobal::SQL )
 				qWarning ("OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!");
+				// Fall through !!
 #endif
-
-			return (T*) new OPimTodoAccessXML( appName );
+			case OPimGlobal::XML:
+				return (T*) new OPimTodoAccessXML( appName, filename );
+				break;
+			case OPimGlobal::VCARD:
+				return (T*) new OPimTodoAccessVCal( filename );
+				break;
+			}
 		case OPimGlobal::CONTACTLIST:
+			switch ( use_database ){
+			default: // Use SQL if something weird is given.
+				// Fall through !!
+			case OPimGlobal::SQL:
 #ifdef __USE_SQL
-			if ( used_database == OPimGlobal::SQL )
-				return (T*) new OPimContactAccessBackend_SQL("");
+				return (T*) new OPimContactAccessBackend_SQL( appName, filename );
+				break;
 #else
-			if ( used_database == OPimGlobal::SQL )
 				qWarning ("OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!");
+				// Fall through !!
 #endif
-
-			return (T*) new OPimContactAccessBackend_XML( appName );
+			case OPimGlobal::XML:
+				return (T*) new OPimContactAccessBackend_XML( appName, filename );
+				break;
+			case OPimGlobal::VCARD:
+				return (T*) new OPimContactAccessBackend_VCard( appName, filename );
+				break;
+			}
 		case OPimGlobal::DATEBOOK:
+			switch ( use_database ){
+			default: // Use SQL if something weird is given.
+				// Fall through !!
+			case OPimGlobal::SQL:
 #ifdef __USE_SQL
-			if ( used_database == OPimGlobal::SQL )
-				return (T*) new ODateBookAccessBackend_SQL("");
+				return (T*) new ODateBookAccessBackend_SQL( appName, filename );
+				break;
 #else
-			if ( used_database == OPimGlobal::SQL )
                             qWarning("OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!");
+				// Fall through !!
 #endif
-
-			return (T*) new ODateBookAccessBackend_XML( appName );
+			case OPimGlobal::XML:
+				return (T*) new ODateBookAccessBackend_XML( appName, filename );
+				break;
+			case OPimGlobal::VCARD:
+				qWarning("OBackendFactory:: VCal Backend for DATEBOOK not implemented!");
+				return (T*) NULL;
+				break;
+			}
 		default:
 			return (T*) NULL;
 		}
 
-
 	}
 
 	/**
 	 * Returns the style of the default database which is used to contact PIM data.
          * @param type the type of the backend
 	 * @see OPimGlobal
 	 */
 	static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType type ){
 		QString group_name;
 		switch ( type ){
 		case OPimGlobal::TODOLIST:
 			group_name = "todo";
 			break;
 		case OPimGlobal::CONTACTLIST:
 			group_name = "contact";
 			break;
 		case OPimGlobal::DATEBOOK:
 			group_name = "datebook";
 			break;
 		default:
 			group_name = "unknown";
 		}
 
 		Config config( "pimaccess" );
 		config.setGroup ( group_name );
 		QString db_String = config.readEntry( "usebackend", "xml" );
 
 		QAsciiDict<int> dictDbTypes( OPimGlobal::_END_DatabaseStyle );
 		dictDbTypes.setAutoDelete( TRUE );
 
 		dictDbTypes.insert( "xml", new int (OPimGlobal::XML) );
 		dictDbTypes.insert( "sql", new int (OPimGlobal::SQL) );
 		dictDbTypes.insert( "vcard", new int (OPimGlobal::VCARD) );
 
 	        int* db_find = dictDbTypes[ db_String ];
 
 		if ( !db_find )
 			return OPimGlobal::UNKNOWN;
 
 		return (OPimGlobal::DatabaseStyle) *db_find;
 	}
 
 
         /**
          * Returns the default backend implementation for backendName. Which one is used, is defined
 	 * by the configfile "pimaccess.conf".
-         * @param backendName the type of the backend (use "todo", "contact" or "datebook" )
+         * @param type The type of the backend (@see OPimGlobal())
          * @param appName The name of your application. It will be passed on to the backend
          */
-	static T* defaultBackend( const QString backendName, const QString& appName ){
-
-		QAsciiDict<int> dictBackends( OPimGlobal::_END_PimType );
- 		dictBackends.setAutoDelete ( TRUE );
-
-		dictBackends.insert( "todo", new int (OPimGlobal::TODOLIST) );
-		dictBackends.insert( "contact", new int (OPimGlobal::CONTACTLIST) );
-                dictBackends.insert( "datebook", new int(OPimGlobal::DATEBOOK) );
-
-                int* backend_find = dictBackends[ backendName ];
-                if ( !backend_find ) return NULL;
-
-		OPimGlobal::DatabaseStyle style = defaultDB( static_cast<OPimGlobal::PimType>( *backend_find ) );
-
-		qDebug( "OBackendFactory::Default -> Backend is %s, Database is %d", backendName.latin1(),
-			style );
-
-		return create( (OPimGlobal::PimType) *backend_find, style, appName );
-
+	static T* defaultBackend( OPimGlobal::PimType type, const QString& appName ){
+		return create( type, OPimGlobal::DEFAULT, appName );
 	}
     private:
 	OBackendPrivate* d;
 
 };
 
 }
 
 #endif
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp
index 417a954..a372267 100644
--- a/libopie2/opiepim/core/ocontactaccess.cpp
+++ b/libopie2/opiepim/core/ocontactaccess.cpp
@@ -1,158 +1,159 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) The Main Author <main-author@whereever.org>
               =.             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.
 */
 /*
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  */
 
 #include "ocontactaccess.h"
 #include "obackendfactory.h"
 
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <qlist.h>
 #include <qcopchannel_qws.h>
 
 //#include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 #include <opie2/ocontactaccessbackend_xml.h>
 #include <opie2/opimresolver.h>
+#include <opie2/opimglobal.h>
 
 namespace Opie {
 
 OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
 			 OPimContactAccessBackend* end, bool autosync ):
 	OPimAccessTemplate<OPimContact>( end )
 {
         /* take care of the backend. If there is no one defined, we
 	 * will use the XML-Backend as default (until we have a cute SQL-Backend..).
 	 */
         if( end == 0 ) {
 		qWarning ("Using BackendFactory !");
-		end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( "contact", appname );
+		end = OBackendFactory<OPimContactAccessBackend>::defaultBackend( OPimGlobal::CONTACTLIST, appname );
         }
 	// Set backend locally and in template
         m_backEnd = end;
 	OPimAccessTemplate<OPimContact>::setBackEnd (end);
 
 
 	/* Connect signal of external db change to function */
 	QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this );
 	connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)),
                this, SLOT(copMessage(const QCString&,const QByteArray&)) );
 	if ( autosync ){
 		QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this );
 		connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)),
 			 this, SLOT(copMessage(const QCString&,const QByteArray&)) );
 	}
 
 
 }
 OPimContactAccess::~OPimContactAccess ()
 {
 	/* The user may forget to save the changed database, therefore try to
 	 * do it for him..
 	 */
 	save();
 	// delete m_backEnd; is done by template..
 }
 
 
 bool OPimContactAccess::save ()
 {
 	/* If the database was changed externally, we could not save the
 	 * Data. This will remove added items which is unacceptable !
 	 * Therefore: Reload database and merge the data...
 	 */
 	if ( OPimAccessTemplate<OPimContact>::wasChangedExternally() )
 		reload();
 
 	bool status = OPimAccessTemplate<OPimContact>::save();
 	if ( !status ) return false;
 
 	/* Now tell everyone that new data is available.
 	 */
 	QCopEnvelope e( "QPE/PIM", "addressbookUpdated()" );
 
 	return true;
 }
 
 const uint OPimContactAccess::querySettings()
 {
 	return ( m_backEnd->querySettings() );
 }
 
 bool OPimContactAccess::hasQuerySettings ( int querySettings ) const
 {
 	return ( m_backEnd->hasQuerySettings ( querySettings ) );
 }
 OPimRecordList<OPimContact> OPimContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
 {
 	QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
 	return ( OPimRecordList<OPimContact>(matchingContacts, this) );
 }
 
 
 bool OPimContactAccess::wasChangedExternally()const
 {
 	return ( m_backEnd->wasChangedExternally() );
 }
 
 
 void OPimContactAccess::copMessage( const QCString &msg, const QByteArray & )
 {
 	if ( msg == "addressbookUpdated()" ){
 		qWarning ("OPimContactAccess: Received addressbokUpdated()");
 		emit signalChanged ( this );
 	} else if ( msg == "flush()" ) {
 		qWarning ("OPimContactAccess: Received flush()");
 		save ();
 	} else if ( msg == "reload()" ) {
 		qWarning ("OPimContactAccess: Received reload()");
 		reload ();
 		emit signalChanged ( this );
 	}
 }
 
 int OPimContactAccess::rtti() const
 {
 	return OPimResolver::AddressBook;
 }
 
 }
diff --git a/libopie2/opiepim/core/odatebookaccess.cpp b/libopie2/opiepim/core/odatebookaccess.cpp
index 5f471cf..440ee0a 100644
--- a/libopie2/opiepim/core/odatebookaccess.cpp
+++ b/libopie2/opiepim/core/odatebookaccess.cpp
@@ -1,117 +1,118 @@
 /*
                              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.
 */
 #include <opie2/obackendfactory.h>
 #include <opie2/odatebookaccess.h>
 #include <opie2/opimresolver.h>
+#include <opie2/opimglobal.h>
 
 namespace Opie {
 /**
  * Simple constructor
  * It takes a ODateBookAccessBackend as parent. If it is 0 the default implementation
  * will be used!
  * @param back The backend to be used or 0 for the default backend
  * @param ac What kind of access is intended
  */
 ODateBookAccess::ODateBookAccess( ODateBookAccessBackend* back, enum Access ac )
     : OPimAccessTemplate<OPimEvent>( back )
 {
     if (!back )
-        back = OBackendFactory<ODateBookAccessBackend>::defaultBackend("datebook", QString::null );
+        back = OBackendFactory<ODateBookAccessBackend>::defaultBackend( OPimGlobal::DATEBOOK, QString::null );
 
     m_backEnd = back;
     setBackEnd( m_backEnd );
 }
 ODateBookAccess::~ODateBookAccess() {
 }
 
 /**
  * @return all events available
  */
 ODateBookAccess::List ODateBookAccess::rawEvents()const {
     QArray<int> ints = m_backEnd->rawEvents();
 
     List lis( ints, this );
     return lis;
 }
 
 /**
  * @return all repeating events
  */
 ODateBookAccess::List ODateBookAccess::rawRepeats()const {
     QArray<int> ints = m_backEnd->rawRepeats();
 
     List lis( ints, this );
     return lis;
 }
 
 /**
  * @return all non repeating events
  */
 ODateBookAccess::List ODateBookAccess::nonRepeats()const {
     QArray<int> ints = m_backEnd->nonRepeats();
 
     List lis( ints, this );
     return lis;
 }
 
 /**
  * @return dates in the time span between from and to
  * @param from Include all events from...
  * @param to Include all events to...
  */
 OEffectiveEvent::ValueList ODateBookAccess::effectiveEvents( const QDate& from, const QDate& to ) const {
     return m_backEnd->effectiveEvents( from, to );
 }
 /**
  * @return all events at a given datetime
  */
 OEffectiveEvent::ValueList ODateBookAccess::effectiveEvents( const QDateTime& start ) const {
     return m_backEnd->effectiveEvents( start );
 }
 
 /**
  * @return non repeating dates in the time span between from and to
  * @param from Include all events from...
  * @param to Include all events to...
  */
 OEffectiveEvent::ValueList ODateBookAccess::effectiveNonRepeatingEvents( const QDate& from, const QDate& to ) const {
     return m_backEnd->effectiveNonRepeatingEvents( from, to );
 }
 /**
  * @return all non repeating events at a given datetime
  */
 OEffectiveEvent::ValueList ODateBookAccess::effectiveNonRepeatingEvents( const QDateTime& start ) const {
     return m_backEnd->effectiveNonRepeatingEvents( start );
 }
 int ODateBookAccess::rtti() const
 {
 	return OPimResolver::DateBook;
 }
 
 }
diff --git a/libopie2/opiepim/core/opimglobal.h b/libopie2/opiepim/core/opimglobal.h
index d56c9be..efd455c 100644
--- a/libopie2/opiepim/core/opimglobal.h
+++ b/libopie2/opiepim/core/opimglobal.h
@@ -1,64 +1,64 @@
 /*
                              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.
 */
 #ifndef __OPIMGLOBAL_H_
 #define __OPIMGLOBAL_H_
 
 namespace Opie{
 namespace Pim{
 
 
 	/** 
 	 * Contains global types and enums for the PIM-API 
 	 */
 class OPimGlobal{
  public:
 	enum PimType {
 		TODOLIST,
 		CONTACTLIST,
 		DATEBOOK,
 		_END_PimType
 	};
 	
 	enum DatabaseStyle {
 		DEFAULT,      // Use default Database
 		UNKNOWN,      // Unknown database style
 		XML,
 		SQL,
-		VCARD,
+		VCARD,        // Also used for VCARD !
 		_END_DatabaseStyle
 	};
 
 
 };
 
 }
 }
 
 
 #endif
diff --git a/libopie2/opiepim/core/otodoaccess.cpp b/libopie2/opiepim/core/otodoaccess.cpp
index 87a211f..c4adbbd 100644
--- a/libopie2/opiepim/core/otodoaccess.cpp
+++ b/libopie2/opiepim/core/otodoaccess.cpp
@@ -1,100 +1,101 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) The Main Author <main-author@whereever.org>
               =.             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.
 */
 #include <qdatetime.h>
 
 #include <qpe/alarmserver.h>
 
 // #include "otodoaccesssql.h"
 #include <opie2/otodoaccess.h>
 #include <opie2/obackendfactory.h>
 #include <opie2/opimresolver.h>
+#include <opie2/opimglobal.h>
 
 namespace Opie {
 OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access )
     : QObject(), OPimAccessTemplate<OPimTodo>( end ),  m_todoBackEnd( end )
 {
 //     if (end == 0l )
 //         m_todoBackEnd = new OPimTodoAccessBackendSQL( QString::null);
 
 	// Zecke: Du musst hier noch fr das XML-Backend einen Appnamen bergeben !
         if (end == 0l )
-		m_todoBackEnd = OBackendFactory<OPimTodoAccessBackend>::defaultBackend ("todo", QString::null);
+		m_todoBackEnd = OBackendFactory<OPimTodoAccessBackend>::defaultBackend (OPimGlobal::TODOLIST, QString::null);
 
     setBackEnd( m_todoBackEnd );
 }
 OPimTodoAccess::~OPimTodoAccess() {
 //    qWarning("~OPimTodoAccess");
 }
 void OPimTodoAccess::mergeWith( const QValueList<OPimTodo>& list ) {
     QValueList<OPimTodo>::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         replace( (*it) );
     }
 }
 OPimTodoAccess::List OPimTodoAccess::effectiveToDos( const QDate& start,
                                                const QDate& end,
                                                bool includeNoDates ) {
     QArray<int> ints = m_todoBackEnd->effectiveToDos( start, end, includeNoDates );
 
     List lis( ints, this );
     return lis;
 }
 OPimTodoAccess::List OPimTodoAccess::effectiveToDos( const QDate& start,
                                                bool includeNoDates ) {
     return effectiveToDos( start, QDate::currentDate(),
                            includeNoDates );
 }
 OPimTodoAccess::List OPimTodoAccess::overDue() {
     List lis( m_todoBackEnd->overDue(), this );
     return lis;
 }
 /* sort order */
 OPimTodoAccess::List OPimTodoAccess::sorted( bool ascending, int sort,int filter, int cat ) {
     QArray<int> ints = m_todoBackEnd->sorted( ascending, sort,
                                       filter, cat );
     OPimTodoAccess::List list( ints, this );
     return list;
 }
 void OPimTodoAccess::removeAllCompleted() {
     m_todoBackEnd->removeAllCompleted();
 }
 QBitArray OPimTodoAccess::backendSupport( const QString& ) const{
     return m_todoBackEnd->supports();
 }
 bool OPimTodoAccess::backendSupports( int attr,  const QString& ar) const{
     return backendSupport(ar).testBit( attr );
 }
 
 
 int OPimTodoAccess::rtti() const
 {
 	return OPimResolver::TodoList;
 }
 
 }