-rw-r--r-- | libopie/libopie.pro | 42 | ||||
-rw-r--r-- | libopie/pim/obackendfactory.h | 17 | ||||
-rw-r--r-- | libopie/pim/otodoaccess.cpp | 9 | ||||
-rw-r--r-- | libopie2/opiepim/backend/obackendfactory.h | 17 | ||||
-rw-r--r-- | libopie2/opiepim/core/otodoaccess.cpp | 9 |
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 | |||
@@ -1,7 +1,7 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qte warn_on release | 2 | CONFIG += qte warn_on release |
3 | HEADERS = ofontmenu.h ofileselector.h \ | 3 | HEADERS = 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 \ |
7 | colordialog.h colorpopupmenu.h \ | 7 | colordialog.h colorpopupmenu.h \ |
@@ -10,8 +10,23 @@ HEADERS = ofontmenu.h ofileselector.h \ | |||
10 | otimepicker.h otabwidget.h \ | 10 | otimepicker.h otabwidget.h \ |
11 | otabbar.h otabinfo.h \ | 11 | otabbar.h otabinfo.h \ |
12 | ofontselector.h ocolorbutton.h | 12 | ofontselector.h \ |
13 | SOURCES = 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 | |||
27 | SOURCES = 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 \ |
17 | colorpopupmenu.cpp oclickablelabel.cpp \ | 32 | colorpopupmenu.cpp oclickablelabel.cpp \ |
@@ -19,5 +34,14 @@ SOURCES = ofontmenu.cc ofileselector.cc \ | |||
19 | odevice.cpp otimepicker.cpp \ | 34 | odevice.cpp otimepicker.cpp \ |
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 | |||
22 | TARGET = opie | 46 | TARGET = opie |
23 | INCLUDEPATH += $(OPIEDIR)/include | 47 | INCLUDEPATH += $(OPIEDIR)/include |
@@ -25,4 +49,6 @@ DESTDIR = $(QTDIR)/lib$(PROJMAK) | |||
25 | #VERSION = 1.0.0 | 49 | #VERSION = 1.0.0 |
26 | 50 | ||
51 | # LIBS += -lopiesql | ||
52 | |||
27 | INTERFACES = otimepickerbase.ui | 53 | INTERFACES = otimepickerbase.ui |
28 | 54 | ||
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 | |||
@@ -17,4 +17,10 @@ | |||
17 | * History: | 17 | * History: |
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 |
20 | * added OBackendFactory for advanced backend access | 26 | * added OBackendFactory for advanced backend access |
@@ -32,6 +38,8 @@ | |||
32 | #include "otodoaccessxml.h" | 38 | #include "otodoaccessxml.h" |
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 | ||
37 | template<class T> | 45 | template<class T> |
@@ -65,7 +73,12 @@ class OBackendFactory | |||
65 | switch ( *dict.take( backendName ) ){ | 73 | switch ( *dict.take( backendName ) ){ |
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 ); |
71 | case CONTACT: | 84 | case CONTACT: |
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 | |||
@@ -10,9 +10,10 @@ OTodoAccess::OTodoAccess( OTodoAccessBackend* end ) | |||
10 | : QObject(), OPimAccessTemplate<OTodo>( end ), m_todoBackEnd( end ) | 10 | : QObject(), OPimAccessTemplate<OTodo>( end ), m_todoBackEnd( 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 | ||
18 | setBackEnd( m_todoBackEnd ); | 19 | setBackEnd( m_todoBackEnd ); |
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 | |||
@@ -17,4 +17,10 @@ | |||
17 | * History: | 17 | * History: |
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 |
20 | * added OBackendFactory for advanced backend access | 26 | * added OBackendFactory for advanced backend access |
@@ -32,6 +38,8 @@ | |||
32 | #include "otodoaccessxml.h" | 38 | #include "otodoaccessxml.h" |
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 | ||
37 | template<class T> | 45 | template<class T> |
@@ -65,7 +73,12 @@ class OBackendFactory | |||
65 | switch ( *dict.take( backendName ) ){ | 73 | switch ( *dict.take( backendName ) ){ |
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 ); |
71 | case CONTACT: | 84 | case CONTACT: |
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 | |||
@@ -10,9 +10,10 @@ OTodoAccess::OTodoAccess( OTodoAccessBackend* end ) | |||
10 | : QObject(), OPimAccessTemplate<OTodo>( end ), m_todoBackEnd( end ) | 10 | : QObject(), OPimAccessTemplate<OTodo>( end ), m_todoBackEnd( 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 | ||
18 | setBackEnd( m_todoBackEnd ); | 19 | setBackEnd( m_todoBackEnd ); |