1 files changed, 13 insertions, 3 deletions

diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h
index f3c339d..3567687 100644
--- a/libopie2/opiepim/backend/obackendfactory.h
+++ b/libopie2/opiepim/backend/obackendfactory.h
@@ -7,24 +7,29 @@
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation;
  *      either version 2 of the License, or (at your option) any later
  *      version.
  * =====================================================================
  * ToDo: Use plugins
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.8  2003/09/22 14:31:16  eilers
+ * Added first experimental incarnation of sql-backend for addressbook.
+ * Some modifications to be able to compile the todo sql-backend.
+ * A lot of changes fill follow...
+ *
  * Revision 1.7  2003/08/01 12:30:16  eilers
  * Merging changes from BRANCH_1_0 to HEAD
  *
  * Revision 1.6.4.1  2003/06/30 14:34:19  eilers
  * Patches from Zecke:
  * Fixing and cleaning up extraMap handling
  * Adding d_ptr for binary compatibility in the future
  *
  * Revision 1.6  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
@@ -65,24 +70,25 @@
 #define OPIE_BACKENDFACTORY_H_
 
 #include <qstring.h>
 #include <qasciidict.h>
 #include <qpe/config.h>
 
 #include "otodoaccessxml.h"
 #include "ocontactaccessbackend_xml.h"
 #include "odatebookaccessbackend_xml.h"
 
 #ifdef __USE_SQL
 #include "otodoaccesssql.h"
+#include "ocontactaccessbackend_sql.h"
 #endif
 
 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>
@@ -109,51 +115,55 @@ class OBackendFactory
          * Returns a backend implementation for backendName
          * @param backendName the type of the backend
          * @param appName will be passed on to the backend
          */
         static T* Default( const QString backendName, const QString& appName ){
 
                 // __asm__("int3");
 
                 Config config( "pimaccess" );
                 config.setGroup ( backendName );
                 QString backend = config.readEntry( "usebackend" );
 
+                qWarning("Selected backend for %s is: %s", backendName.latin1(), backend.latin1() ); 
+
                 QAsciiDict<int> dict ( 3 );
                 dict.setAutoDelete ( TRUE );
 
                 dict.insert( "todo", new int (TODO) );
                 dict.insert( "contact", new int (CONTACT) );
                 dict.insert( "datebook", new int(DATE) );
 
-                qWarning ("TODO is: %d", TODO);
-                qWarning ("CONTACT is: %d", CONTACT);
-
                 int *find = dict[ backendName ];
                 if (!find ) return 0;
 
                 switch ( *find ){
                 case TODO:
 #ifdef __USE_SQL
                         if ( backend == "sql" )
                                 return (T*) new OTodoAccessBackendSQL("");
 #else
                         if ( backend == "sql" )
                                 qWarning ("OBackendFactory:: sql Backend not implemented! Using XML instead!");
 #endif
 
                         return (T*) new OTodoAccessXML( appName );
                 case CONTACT:
+#ifdef __USE_SQL
+                        if ( backend == "sql" )
+                                return (T*) new OContactAccessBackend_SQL("");
+#else
                         if ( backend == "sql" )
                                 qWarning ("OBackendFactory:: sql Backend not implemented! Using XML instead!");
+#endif
 
                         return (T*) new OContactAccessBackend_XML( appName );
                 case DATE:
                         if ( backend == "sql" )
                             qWarning("OBackendFactory:: sql Backend not implemented! Using XML instead!");
 
                         return (T*) new ODateBookAccessBackend_XML( appName );
                 default:
                         return NULL;
                 }