| -rw-r--r-- | libopie2/opiepim/backend/obackendfactory.h | 30 | ||||
| -rw-r--r-- | libopie2/opiepim/core/opimaccessfactory.h | 18 |
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 @@ -64,92 +64,102 @@ class OBackendPrivate; * 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. */ 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"; break; default: group_name = "unknown"; } Config config( "pimaccess" ); config.setGroup ( group_name ); QString db_String = config.readEntry( "usebackend" ); 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) ); 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 @@ -71,30 +71,48 @@ class OPimAccessFactory /** * Returns the selected PIM access-object. * @param type Type of the selected database (addressbook, todolist or datebook) * @param dbStyle Which database style should be used (xml, sql, vcard) * @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* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle dbStyle, const QString& appName ){ switch ( type ){ case OPimGlobal::TODOLIST: return dynamic_cast<T*>( new OPimTodoAccess( OBackendFactory<OPimTodoAccessBackend>::create( type, dbStyle, appName ) ) ); case OPimGlobal::CONTACTLIST: 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 |