| -rw-r--r-- | libopie2/opiepim/backend/obackendfactory.h | 6 | ||||
| -rw-r--r-- | libopie2/opiepim/core/opimaccessfactory.h | 22 |
2 files changed, 16 insertions, 12 deletions
diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h index c8a4627..6f46652 100644 --- a/libopie2/opiepim/backend/obackendfactory.h +++ b/libopie2/opiepim/backend/obackendfactory.h @@ -58,43 +58,44 @@ using namespace Opie::Pim; namespace Opie { class OBackendPrivate; /** * This class is our factory. It will give us the default implementations * of at least Todolist, Contacts and Datebook. In the future this class will * allow users to switch the backend with ( XML->SQLite ) without the need * to recompile.# * This class - as the whole PIM Api - is making use of templates * * <pre> - * OPimTodoAccessBackend* backend = OBackEndFactory<OPimTodoAccessBackend>::Default("todo", QString::null ); + * OPimTodoAccessBackend* backend = OBackEndFactory<OPimTodoAccessBackend>::Default( OPimGlobal::TODOLIST, 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. * @param filename Filename of the database file if you don't want to access the default + * @see OPimGlobal() */ static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle database, 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 use_database = database; if ( use_database == OPimGlobal::DEFAULT ){ use_database = defaultDB( type ); } switch ( type ){ case OPimGlobal::TODOLIST: @@ -156,25 +157,25 @@ class OBackendFactory 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 + * @see OPimGlobal() */ static OPimGlobal::DatabaseStyle defaultDB( OPimGlobal::PimType type ){ QString group_name; switch ( type ){ case OPimGlobal::TODOLIST: group_name = "todo"; break; case OPimGlobal::CONTACTLIST: group_name = "contact"; break; case OPimGlobal::DATEBOOK: group_name = "datebook"; @@ -199,24 +200,25 @@ class OBackendFactory if ( !db_find ) return OPimGlobal::UNKNOWN; return (OPimGlobal::DatabaseStyle) *db_find; } /** * Returns the default backend implementation for backendName. Which one is used, is defined * by the configfile "pimaccess.conf". * @param type The type of the backend (@see OPimGlobal()) * @param appName The name of your application. It will be passed on to the backend + * @see OPimGlobal() */ static T* defaultBackend( OPimGlobal::PimType type, const QString& appName ){ return create( type, OPimGlobal::DEFAULT, appName ); } private: OBackendPrivate* d; }; } #endif diff --git a/libopie2/opiepim/core/opimaccessfactory.h b/libopie2/opiepim/core/opimaccessfactory.h index ee55ba5..3cd448e 100644 --- a/libopie2/opiepim/core/opimaccessfactory.h +++ b/libopie2/opiepim/core/opimaccessfactory.h @@ -53,67 +53,69 @@ namespace Opie { * <pre> * OPimTodoAccess* access = OPimAccessFactory<OPimTodoAccess>::create( OPimGlobal::TODOLIST, OPimGlobal::XML, "example" ); * </pre> * * @author Stefan Eilers * @version 0.1 */ template<class T> class OPimAccessFactory { public: - - // Maybe we should introduce a global class for storing such global enums - // (something like opimglobal.h) ? (eilers) - 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 + * @param fileName Filename of database if something different as the default should be used. + * @see OPimGlobal() */ - static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle dbStyle, const QString& appName ){ + static T* create( OPimGlobal::PimType type, OPimGlobal::DatabaseStyle dbStyle, const QString& appName, + const QString& fileName = QString::null ){ OPimBase *base; switch ( type ){ case OPimGlobal::TODOLIST: - base = new OPimTodoAccess( OBackendFactory<OPimTodoAccessBackend>::create( type, dbStyle, appName ) ); + base = new OPimTodoAccess( OBackendFactory<OPimTodoAccessBackend>::create( type, dbStyle, + appName, fileName ) ); break; case OPimGlobal::CONTACTLIST: - base = new OPimContactAccess( QString::null, QString::null, OBackendFactory<OPimContactAccessBackend>::create( type, dbStyle, appName ) ); + base = new OPimContactAccess( QString::null, QString::null, + OBackendFactory<OPimContactAccessBackend>::create( type, dbStyle, + appName, fileName ) ); break; case OPimGlobal::DATEBOOK: - base = new ODateBookAccess( OBackendFactory<ODateBookAccessBackend>::create( type, dbStyle, appName ) ); + base = new ODateBookAccess( OBackendFactory<ODateBookAccessBackend>::create( type, dbStyle, + appName, fileName ) ); break; default: return 0l; } return static_cast<T*>( base ); } /** * 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 + * @see OPimGlobal() * */ static T* defaultAccess( typename OPimGlobal::PimType type, const QString& appName ){ return create( type, OPimGlobal::DEFAULT, appName ); } }; } |