author | eilers <eilers> | 2002-10-08 09:27:36 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-10-08 09:27:36 (UTC) |
commit | 21766cbcf4b4ca84da82a83f1b87d1366e75dd86 (patch) (side-by-side diff) | |
tree | 864f72273936128dd3db596e9e535165bf60a7fd /libopie2 | |
parent | f4559c166ae156b14a6cae518ede0496e83dad49 (diff) | |
download | opie-21766cbcf4b4ca84da82a83f1b87d1366e75dd86.zip opie-21766cbcf4b4ca84da82a83f1b87d1366e75dd86.tar.gz opie-21766cbcf4b4ca84da82a83f1b87d1366e75dd86.tar.bz2 |
Fixed libopie.pro to include the new pim-API.
The SQL-Stuff is currently deactivated. Otherwise everyone who wants to
compile itself would need to install libsqlite, libopiesql...
Therefore, the backend currently uses XML only..
-rw-r--r-- | libopie2/opiepim/backend/obackendfactory.h | 17 | ||||
-rw-r--r-- | libopie2/opiepim/core/otodoaccess.cpp | 9 |
2 files changed, 20 insertions, 6 deletions
diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h index 599fbf2..f11f029 100644 --- a/libopie2/opiepim/backend/obackendfactory.h +++ b/libopie2/opiepim/backend/obackendfactory.h @@ -16,6 +16,12 @@ * ===================================================================== * History: * $Log$ + * Revision 1.2 2002/10/08 09:27:36 eilers + * Fixed libopie.pro to include the new pim-API. + * The SQL-Stuff is currently deactivated. Otherwise everyone who wants to + * compile itself would need to install libsqlite, libopiesql... + * Therefore, the backend currently uses XML only.. + * * Revision 1.1 2002/10/07 17:35:01 eilers * added OBackendFactory for advanced backend access * @@ -31,8 +37,10 @@ #include "otodoaccessxml.h" #include "ocontactaccessbackend_xml.h" -#include "otodoaccesssql.h" +#ifdef __USE_SQL +#include "otodoaccesssql.h" +#endif template<class T> class OBackendFactory @@ -64,9 +72,14 @@ class OBackendFactory switch ( *dict.take( backendName ) ){ 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: if ( backend == "sql" ) diff --git a/libopie2/opiepim/core/otodoaccess.cpp b/libopie2/opiepim/core/otodoaccess.cpp index 4468812..80424d9 100644 --- a/libopie2/opiepim/core/otodoaccess.cpp +++ b/libopie2/opiepim/core/otodoaccess.cpp @@ -9,11 +9,12 @@ OTodoAccess::OTodoAccess( OTodoAccessBackend* end ) : QObject(), OPimAccessTemplate<OTodo>( end ), m_todoBackEnd( end ) { - if (end == 0l ) - m_todoBackEnd = new OTodoAccessBackendSQL( QString::null); +// if (end == 0l ) +// m_todoBackEnd = new OTodoAccessBackendSQL( QString::null); - // if (end == 0l ) - // m_todoBackEnd = OBackendFactory<OTodoAccessBackend>::Default ("todo", QString::null); + // Zecke: Du musst hier noch für das XML-Backend einen Appnamen übergeben ! + if (end == 0l ) + m_todoBackEnd = OBackendFactory<OTodoAccessBackend>::Default ("todo", QString::null); setBackEnd( m_todoBackEnd ); } |