summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/backend/obackendfactory.h28
-rw-r--r--libopie2/opiepim/core/opimaccessfactory.h18
2 files changed, 37 insertions, 9 deletions
diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h
index d8caa80..993ecb4 100644
--- a/libopie2/opiepim/backend/obackendfactory.h
+++ b/libopie2/opiepim/backend/obackendfactory.h
@@ -86,34 +86,40 @@ class OBackendFactory
static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database,
const QString& appName ){
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 );
+ }
+
switch ( type ){
case OPimGlobal::TODOLIST:
#ifdef __USE_SQL
- if ( database == OPimGlobal::SQL )
+ if ( used_database == OPimGlobal::SQL )
return (T*) new OPimTodoAccessBackendSQL("");
#else
- if ( database == OPimGlobal::SQL )
+ if ( used_database == OPimGlobal::SQL )
qWarning ("OBackendFactory:: sql Backend for TODO not implemented! Using XML instead!");
#endif
return (T*) new OPimTodoAccessXML( appName );
case OPimGlobal::CONTACTLIST:
#ifdef __USE_SQL
- if ( database == OPimGlobal::SQL )
+ if ( used_database == OPimGlobal::SQL )
return (T*) new OPimContactAccessBackend_SQL("");
#else
- if ( database == OPimGlobal::SQL )
+ if ( used_database == OPimGlobal::SQL )
qWarning ("OBackendFactory:: sql Backend for CONTACT not implemented! Using XML instead!");
#endif
return (T*) new OPimContactAccessBackend_XML( appName );
case OPimGlobal::DATEBOOK:
#ifdef __USE_SQL
- if ( database == OPimGlobal::SQL )
+ if ( used_database == OPimGlobal::SQL )
return (T*) new ODateBookAccessBackend_SQL("");
#else
- if ( database == OPimGlobal::SQL )
+ if ( used_database == OPimGlobal::SQL )
qWarning("OBackendFactory:: sql Backend for DATEBOOK not implemented! Using XML instead!");
#endif
@@ -125,10 +131,14 @@ class OBackendFactory
}
-
- static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType backend ){
+ /**
+ * 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 ( backend ){
+ switch ( type ){
case OPimGlobal::TODOLIST:
group_name = "todo";
break;
diff --git a/libopie2/opiepim/core/opimaccessfactory.h b/libopie2/opiepim/core/opimaccessfactory.h
index ba99a15..eecfa96 100644
--- a/libopie2/opiepim/core/opimaccessfactory.h
+++ b/libopie2/opiepim/core/opimaccessfactory.h
@@ -92,6 +92,24 @@ class OPimAccessFactory
}
}
+
+
+ /**
+ * Returns the selected PIM access-object, using the default database style
+ * Which style is selected is defined in the configfile "pimaccess.conf" in
+ * the directory "Settings"
+ * @param type Type of the selected database (addressbook, todolist or datebook)
+ * @param appName "Name" of your application. This should be any constant string which is used
+ * by some backends for creating special files (i.e.journal files). Please keep the
+ * string unique for your application !
+ * @see OPimGlobal
+ *
+ */
+ static T* default( OPimGlobal::PimType type, const QString& appName ){
+
+ return create( type, OPimGlobal::DEFAULT, appName )
+
+ }
};
}