summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/libopie.pro42
-rw-r--r--libopie/pim/obackendfactory.h17
-rw-r--r--libopie/pim/otodoaccess.cpp9
-rw-r--r--libopie2/opiepim/backend/obackendfactory.h17
-rw-r--r--libopie2/opiepim/core/otodoaccess.cpp9
5 files changed, 74 insertions, 20 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
2CONFIG += qte warn_on release 2CONFIG += qte warn_on release
3HEADERS = ofontmenu.h ofileselector.h \ 3HEADERS = ofontmenu.h \
4 ofiledialog.h tododb.h \ 4 ofiledialog.h ofileselector.h tododb.h \
5 todoevent.h todoresource.h \ 5 ocheckitem.h todoevent.h todoresource.h \
6 todovcalresource.h xmltree.h \ 6 todovcalresource.h xmltree.h \
@@ -11,6 +11,21 @@ HEADERS = ofontmenu.h ofileselector.h \
11 otabbar.h otabinfo.h \ 11 otabbar.h otabinfo.h \
12 ofontselector.h ocolorbutton.h 12 ofontselector.h \
13SOURCES = ofontmenu.cc ofileselector.cc \ 13 pim/opimrecord.h \
14 ofiledialog.cc xmltree.cc \ 14 pim/otodo.h \
15 tododb.cpp todoevent.cpp \ 15 pim/orecordlist.h \
16 pim/opimaccesstemplate.h \
17 pim/opimaccessbackend.h \
18 pim/otodoaccess.h \
19 pim/otodacessbackend.h \
20 pim/ocontact.h \
21 pim/ocontactaccess.h \
22 pim/ocontactaccessbackend.h \
23 pim/ocontactaccessbackend_xml.h \
24 pim/obackendfactory.h
25# pim/otodoaccesssql.h \
26
27SOURCES = ofontmenu.cc \
28 xmltree.cc \
29 ofiledialog.cc ofileselector.cc \
30 ocheckitem.cpp tododb.cpp todoevent.cpp \
16 todovcalresource.cpp colordialog.cpp \ 31 todovcalresource.cpp colordialog.cpp \
@@ -20,3 +35,12 @@ SOURCES = ofontmenu.cc ofileselector.cc \
20 otabwidget.cpp otabbar.cpp \ 35 otabwidget.cpp otabbar.cpp \
21 ofontselector.cpp ocolorbutton.cpp 36 ofontselector.cpp \
37 pim/otodo.cpp \
38 pim/opimrecord.cpp \
39 pim/otodoaccess.cpp \
40 pim/otodoaccessbackend.cpp \
41 pim/otodoaccessxml.cpp \
42 pim/ocontact.cpp \
43 pim/ocontactaccess.cpp
44# pim/otodoaccesssql.cpp \
45
22TARGET = opie 46TARGET = opie
@@ -26,2 +50,4 @@ DESTDIR = $(QTDIR)/lib$(PROJMAK)
26 50
51# LIBS += -lopiesql
52
27INTERFACES = otimepickerbase.ui 53INTERFACES = 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 @@
18 * $Log$ 18 * $Log$
19 * Revision 1.2 2002/10/08 09:27:36 eilers
20 * Fixed libopie.pro to include the new pim-API.
21 * The SQL-Stuff is currently deactivated. Otherwise everyone who wants to
22 * compile itself would need to install libsqlite, libopiesql...
23 * Therefore, the backend currently uses XML only..
24 *
19 * Revision 1.1 2002/10/07 17:35:01 eilers 25 * Revision 1.1 2002/10/07 17:35:01 eilers
@@ -33,4 +39,6 @@
33#include "ocontactaccessbackend_xml.h" 39#include "ocontactaccessbackend_xml.h"
34#include "otodoaccesssql.h"
35 40
41#ifdef __USE_SQL
42#include "otodoaccesssql.h"
43#endif
36 44
@@ -66,5 +74,10 @@ class OBackendFactory
66 case TODO: 74 case TODO:
75#ifdef __USE_SQL
67 if ( backend == "sql" ) 76 if ( backend == "sql" )
68 return (T*) new OTodoAccessBackendSQL(""); 77 return (T*) new OTodoAccessBackendSQL("");
69 78#else
79 if ( backend == "sql" )
80 qWarning ("OBackendFactory:: sql Backend not implemented! Using XML instead!");
81#endif
82
70 return (T*) new OTodoAccessXML( appName ); 83 return (T*) new OTodoAccessXML( appName );
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 )
11{ 11{
12 if (end == 0l ) 12// if (end == 0l )
13 m_todoBackEnd = new OTodoAccessBackendSQL( QString::null); 13// m_todoBackEnd = new OTodoAccessBackendSQL( QString::null);
14 14
15 // if (end == 0l ) 15 // Zecke: Du musst hier noch für das XML-Backend einen Appnamen übergeben !
16 // m_todoBackEnd = OBackendFactory<OTodoAccessBackend>::Default ("todo", QString::null); 16 if (end == 0l )
17 m_todoBackEnd = OBackendFactory<OTodoAccessBackend>::Default ("todo", QString::null);
17 18
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
@@ -18,2 +18,8 @@
18 * $Log$ 18 * $Log$
19 * Revision 1.2 2002/10/08 09:27:36 eilers
20 * Fixed libopie.pro to include the new pim-API.
21 * The SQL-Stuff is currently deactivated. Otherwise everyone who wants to
22 * compile itself would need to install libsqlite, libopiesql...
23 * Therefore, the backend currently uses XML only..
24 *
19 * Revision 1.1 2002/10/07 17:35:01 eilers 25 * Revision 1.1 2002/10/07 17:35:01 eilers
@@ -33,4 +39,6 @@
33#include "ocontactaccessbackend_xml.h" 39#include "ocontactaccessbackend_xml.h"
34#include "otodoaccesssql.h"
35 40
41#ifdef __USE_SQL
42#include "otodoaccesssql.h"
43#endif
36 44
@@ -66,5 +74,10 @@ class OBackendFactory
66 case TODO: 74 case TODO:
75#ifdef __USE_SQL
67 if ( backend == "sql" ) 76 if ( backend == "sql" )
68 return (T*) new OTodoAccessBackendSQL(""); 77 return (T*) new OTodoAccessBackendSQL("");
69 78#else
79 if ( backend == "sql" )
80 qWarning ("OBackendFactory:: sql Backend not implemented! Using XML instead!");
81#endif
82
70 return (T*) new OTodoAccessXML( appName ); 83 return (T*) new OTodoAccessXML( appName );
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
@@ -11,7 +11,8 @@ OTodoAccess::OTodoAccess( OTodoAccessBackend* end )
11{ 11{
12 if (end == 0l ) 12// if (end == 0l )
13 m_todoBackEnd = new OTodoAccessBackendSQL( QString::null); 13// m_todoBackEnd = new OTodoAccessBackendSQL( QString::null);
14 14
15 // if (end == 0l ) 15 // Zecke: Du musst hier noch für das XML-Backend einen Appnamen übergeben !
16 // m_todoBackEnd = OBackendFactory<OTodoAccessBackend>::Default ("todo", QString::null); 16 if (end == 0l )
17 m_todoBackEnd = OBackendFactory<OTodoAccessBackend>::Default ("todo", QString::null);
17 18