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

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

4 files changed, 7 insertions, 4 deletions

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
@@ -54,4 +54,5 @@
 #include <opie2/ocontactaccessbackend_xml.h>
 #include <opie2/opimresolver.h>
+#include <opie2/opimglobal.h>
 
 namespace Opie {
@@ -66,5 +67,5 @@ OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
         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
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
@@ -30,4 +30,5 @@
 #include <opie2/odatebookaccess.h>
 #include <opie2/opimresolver.h>
+#include <opie2/opimglobal.h>
 
 namespace Opie {
@@ -43,5 +44,5 @@ ODateBookAccess::ODateBookAccess( ODateBookAccessBackend* back, enum Access ac )
 {
     if (!back )
-        back = OBackendFactory<ODateBookAccessBackend>::defaultBackend("datebook", QString::null );
+        back = OBackendFactory<ODateBookAccessBackend>::defaultBackend( OPimGlobal::DATEBOOK, QString::null );
 
     m_backEnd = back;
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
@@ -51,5 +51,5 @@ class OPimGlobal{
                 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
@@ -35,4 +35,5 @@
 #include <opie2/obackendfactory.h>
 #include <opie2/opimresolver.h>
+#include <opie2/opimglobal.h>
 
 namespace Opie {
@@ -45,5 +46,5 @@ OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access )
         // 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 );