Make it possible to define the filename of a database via factories..

1 files changed, 12 insertions, 10 deletions

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
@@ -61,12 +61,8 @@ namespace Opie {
 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.
@@ -74,21 +70,27 @@ class OPimAccessFactory
          * @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;
                 }
@@ -103,9 +105,9 @@ class OPimAccessFactory
          * @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 ){