summaryrefslogtreecommitdiff
authoreilers <eilers>2004-05-16 16:21:51 (UTC)
committer eilers <eilers>2004-05-16 16:21:51 (UTC)
commit0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914 (patch) (side-by-side diff)
treebca776a6ab6d751bdbd9861f95c4dc5bc57752a0
parent52691aca593d6b321597d26467b9e9af9ec0b6fe (diff)
downloadopie-0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914.zip
opie-0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914.tar.gz
opie-0c5c6279a7eaadf61bfe5f113a4f6cd3558c7914.tar.bz2
Improved accessing of default database style by using OPimGlobal::DEFAULT
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/backend/obackendfactory.h30
-rw-r--r--libopie2/opiepim/core/opimaccessfactory.h18
2 files changed, 38 insertions, 10 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
@@ -80,60 +80,70 @@ class 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.
*/
static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database,
const QString& appName ){
- qWarning("Selected backend for %d is: %d", type, database );
+ 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
return (T*) new ODateBookAccessBackend_XML( appName );
default:
return (T*) NULL;
}
}
-
- 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;
case OPimGlobal::CONTACTLIST:
group_name = "contact";
break;
case OPimGlobal::DATEBOOK:
group_name = "datebook";
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
@@ -87,14 +87,32 @@ class OPimAccessFactory
return dynamic_cast<T*>( new OPimContactAccess( QString::null, QString::null, OBackendFactory<OPimContactAccessBackend>::create( type, dbStyle, appName ) ) );
case OPimGlobal::DATEBOOK:
return dynamic_cast<T*>( new ODateBookAccess( OBackendFactory<ODateBookAccessBackend>::create( type, dbStyle, appName ) ) );
default:
return 0l;
}
}
+
+
+ /**
+ * 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 )
+
+ }
};
}
#endif