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
@@ -33,19 +33,22 @@
  */
 #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
 
@@ -77,63 +80,91 @@ 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 ){
@@ -170,38 +201,21 @@ class OBackendFactory
 
 		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;
 
 };
 
 }
 
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
@@ -48,29 +48,30 @@
 
 #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 );
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
@@ -24,30 +24,31 @@
     --        :-=`           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() {
 }
 
 /**
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
@@ -45,17 +45,17 @@ class OPimGlobal{
 		_END_PimType
 	};
 	
 	enum DatabaseStyle {
 		DEFAULT,      // Use default Database
 		UNKNOWN,      // Unknown database style
 		XML,
 		SQL,
-		VCARD,
+		VCARD,        // Also used for VCARD !
 		_END_DatabaseStyle
 	};
 
 
 };
 
 }
 }
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
@@ -29,27 +29,28 @@
 #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;