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

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
@@ -69,3 +69,3 @@ class OBackendPrivate;
  * <pre>
- *   OPimTodoAccessBackend* backend = OBackEndFactory<OPimTodoAccessBackend>::Default("todo", QString::null );
+ *   OPimTodoAccessBackend* backend = OBackEndFactory<OPimTodoAccessBackend>::Default( OPimGlobal::TODOLIST, QString::null );
  *   backend->load();
@@ -88,2 +88,3 @@ class OBackendFactory
          * @param filename Filename of the database file if you don't want to access the default 
+         * @see OPimGlobal()
          */
@@ -167,3 +168,3 @@ class OBackendFactory
          * @param type the type of the backend
-         * @see OPimGlobal
+         * @see OPimGlobal()
          */
@@ -210,2 +211,3 @@ class OBackendFactory
          * @param appName The name of your application. It will be passed on to the backend
+         * @see OPimGlobal()
          */
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
@@ -64,6 +64,2 @@ class OPimAccessFactory
  public:
-
-        // Maybe we should introduce a global class for storing such global enums
-        // (something like opimglobal.h) ? (eilers)
-
         OPimAccessFactory() {};
@@ -77,5 +73,7 @@ class OPimAccessFactory
          *                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;
@@ -83,9 +81,13 @@ class OPimAccessFactory
                 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;
@@ -106,3 +108,3 @@ class OPimAccessFactory
          *                string unique for your application !
-         * @see OPimGlobal
+         * @see OPimGlobal()
          *