-rw-r--r-- | libopie/libopie.pro | 42 | ||||
-rw-r--r-- | libopie/pim/obackendfactory.h | 15 | ||||
-rw-r--r-- | libopie/pim/otodoaccess.cpp | 9 |
3 files changed, 53 insertions, 13 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro index 6a1f1b3..c99db9b 100644 --- a/libopie/libopie.pro +++ b/libopie/libopie.pro @@ -2,5 +2,5 @@ TEMPLATE = lib CONFIG += qte warn_on release -HEADERS = ofontmenu.h ofileselector.h \ - ofiledialog.h tododb.h \ - todoevent.h todoresource.h \ +HEADERS = ofontmenu.h \ + ofiledialog.h ofileselector.h tododb.h \ + ocheckitem.h todoevent.h todoresource.h \ todovcalresource.h xmltree.h \ @@ -11,6 +11,21 @@ HEADERS = ofontmenu.h ofileselector.h \ otabbar.h otabinfo.h \ - ofontselector.h ocolorbutton.h -SOURCES = ofontmenu.cc ofileselector.cc \ - ofiledialog.cc xmltree.cc \ - tododb.cpp todoevent.cpp \ + ofontselector.h \ + pim/opimrecord.h \ + pim/otodo.h \ + pim/orecordlist.h \ + pim/opimaccesstemplate.h \ + pim/opimaccessbackend.h \ + pim/otodoaccess.h \ + pim/otodacessbackend.h \ + pim/ocontact.h \ + pim/ocontactaccess.h \ + pim/ocontactaccessbackend.h \ + pim/ocontactaccessbackend_xml.h \ + pim/obackendfactory.h +# pim/otodoaccesssql.h \ + +SOURCES = ofontmenu.cc \ + xmltree.cc \ + ofiledialog.cc ofileselector.cc \ + ocheckitem.cpp tododb.cpp todoevent.cpp \ todovcalresource.cpp colordialog.cpp \ @@ -20,3 +35,12 @@ SOURCES = ofontmenu.cc ofileselector.cc \ otabwidget.cpp otabbar.cpp \ - ofontselector.cpp ocolorbutton.cpp + ofontselector.cpp \ + pim/otodo.cpp \ + pim/opimrecord.cpp \ + pim/otodoaccess.cpp \ + pim/otodoaccessbackend.cpp \ + pim/otodoaccessxml.cpp \ + pim/ocontact.cpp \ + pim/ocontactaccess.cpp +# pim/otodoaccesssql.cpp \ + TARGET = opie @@ -26,2 +50,4 @@ DESTDIR = $(QTDIR)/lib$(PROJMAK) +# LIBS += -lopiesql + INTERFACES = otimepickerbase.ui diff --git a/libopie/pim/obackendfactory.h b/libopie/pim/obackendfactory.h index 599fbf2..f11f029 100644 --- a/libopie/pim/obackendfactory.h +++ b/libopie/pim/obackendfactory.h @@ -18,2 +18,8 @@ * $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 @@ -33,4 +39,6 @@ #include "ocontactaccessbackend_xml.h" -#include "otodoaccesssql.h" +#ifdef __USE_SQL +#include "otodoaccesssql.h" +#endif @@ -66,4 +74,9 @@ class OBackendFactory 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 diff --git a/libopie/pim/otodoaccess.cpp b/libopie/pim/otodoaccess.cpp index 4468812..80424d9 100644 --- a/libopie/pim/otodoaccess.cpp +++ b/libopie/pim/otodoaccess.cpp @@ -11,7 +11,8 @@ OTodoAccess::OTodoAccess( OTodoAccessBackend* end ) { - if (end == 0l ) - m_todoBackEnd = new OTodoAccessBackendSQL( QString::null); - // if (end == 0l ) - // m_todoBackEnd = OBackendFactory<OTodoAccessBackend>::Default ("todo", QString::null); +// m_todoBackEnd = new OTodoAccessBackendSQL( 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); |