author | zecke <zecke> | 2004-08-06 12:10:04 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-06 12:10:04 (UTC) |
commit | cf4207c5c299812e46f40aaee307100f58317a97 (patch) (unidiff) | |
tree | 5ddff7987fb9010c2940c3e8b4f68852774c93d6 /libopie2/opiepim | |
parent | 20e6c238513eb91f47c3030c2db7ada7cf4b7f25 (diff) | |
download | opie-cf4207c5c299812e46f40aaee307100f58317a97.zip opie-cf4207c5c299812e46f40aaee307100f58317a97.tar.gz opie-cf4207c5c299812e46f40aaee307100f58317a97.tar.bz2 |
Update to the on-server move.
We now have
core/ with DataTypes, PUBLIC API
backend/ for concrete implementation of backends and the 'Interface description'
ui/ For UI related classes
private/ For private implementation details
-rw-r--r-- | libopie2/opiepim/backend/backends.pro | 53 | ||||
-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessvcal.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/core.pro | 37 | ||||
-rw-r--r-- | libopie2/opiepim/core/ocontactaccess.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiepim/opiepim.pro | 6 | ||||
-rw-r--r-- | libopie2/opiepim/ui/ui.pro | 4 |
7 files changed, 62 insertions, 46 deletions
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro index f91e98a..42d807c 100644 --- a/libopie2/opiepim/backend/backends.pro +++ b/libopie2/opiepim/backend/backends.pro | |||
@@ -1,44 +1,37 @@ | |||
1 | SOURCES += \ | 1 | SOURCES += \ |
2 | core/backends/ocontactaccessbackend_vcard.cpp \ | 2 | backend/ocontactaccessbackend_vcard.cpp \ |
3 | core/backends/ocontactaccessbackend_xml.cpp \ | 3 | backend/ocontactaccessbackend_xml.cpp \ |
4 | core/backends/ocontactaccess.cpp \ | 4 | backend/odatebookaccessbackend.cpp \ |
5 | core/backends/odatebookaccessbackend.cpp \ | 5 | backend/odatebookaccessbackend_xml.cpp \ |
6 | core/backends/odatebookaccessbackend_xml.cpp \ | 6 | backend/otodoaccessbackend.cpp \ |
7 | core/backends/otodoaccessbackend.cpp \ | 7 | backend/otodoaccessvcal.cpp \ |
8 | core/backends/otodoaccess.cpp \ | 8 | backend/otodoaccessxml.cpp |
9 | core/backends/otodoaccessvcal.cpp \ | ||
10 | core/backends/otodoaccessxml.cpp \ | ||
11 | core/backends/odatebookaccess.cpp | ||
12 | 9 | ||
13 | HEADERS += \ | 10 | HEADERS += \ |
14 | core/backends/obackendfactory.h \ | 11 | backend/obackendfactory.h \ |
15 | core/backends/ocontactaccessbackend.h \ | 12 | backend/ocontactaccessbackend.h \ |
16 | core/backends/ocontactaccessbackend_vcard.h \ | 13 | backend/ocontactaccessbackend_vcard.h \ |
17 | core/backends/ocontactaccessbackend_xml.h \ | 14 | backend/ocontactaccessbackend_xml.h \ |
18 | core/backends/ocontactaccess.h \ | 15 | backend/odatebookaccessbackend.h \ |
19 | core/backends/odatebookaccessbackend.h \ | 16 | backend/odatebookaccessbackend_xml.h \ |
20 | core/backends/odatebookaccessbackend_xml.h \ | 17 | backend/opimaccessbackend.h \ |
21 | core/backends/opimaccessbackend.h \ | 18 | backend/otodoaccessbackend.h \ |
22 | core/backends/opimaccesstemplate.h \ | 19 | backend/otodoaccessvcal.h \ |
23 | core/backends/otodoaccessbackend.h \ | 20 | backend/otodoaccessxml.h |
24 | core/backends/otodoaccess.h \ | ||
25 | core/backends/otodoaccessvcal.h \ | ||
26 | core/backends/otodoaccessxml.h \ | ||
27 | core/backends/odatebookaccess.h | ||
28 | 21 | ||
29 | contains( ENABLE_SQL_PIM_BACKEND, y ) { | 22 | contains( ENABLE_SQL_PIM_BACKEND, y ) { |
30 | message ( Enabling the SQL Backend for libopiepim2 ) | 23 | message ( Enabling the SQL Backend for libopiepim2 ) |
31 | DEFINES += __USE_SQL | 24 | DEFINES += __USE_SQL |
32 | LIBS += -lopiedb2 | 25 | LIBS += -lopiedb2 |
33 | HEADERS += core/backends/otodoaccesssql.h \ | 26 | HEADERS += backend/otodoaccesssql.h \ |
34 | core/backends/ocontactaccessbackend_sql.h \ | 27 | backend/ocontactaccessbackend_sql.h \ |
35 | core/backends/odatebookaccessbackend_sql.h | 28 | backend/odatebookaccessbackend_sql.h |
36 | SOURCES += core/backends/otodoaccesssql.cpp \ | 29 | SOURCES += backend/otodoaccesssql.cpp \ |
37 | core/backends/ocontactaccessbackend_sql.cpp \ | 30 | backend/ocontactaccessbackend_sql.cpp \ |
38 | core/backends/odatebookaccessbackend_sql.cpp | 31 | backend/odatebookaccessbackend_sql.cpp |
39 | } | 32 | } |
40 | 33 | ||
41 | !contains( ENABLE_SQL_PIM_BACKEND, y ) { | 34 | !contains( ENABLE_SQL_PIM_BACKEND, y ) { |
42 | message ( No SQL Backend in libopiepim2 ) | 35 | message ( No SQL Backend in libopiepim2 ) |
43 | } | 36 | } |
44 | 37 | ||
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp index 6b66814..af77a05 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp | |||
@@ -28,13 +28,13 @@ | |||
28 | */ | 28 | */ |
29 | /* | 29 | /* |
30 | * VCard Backend for the OPIE-Contact Database. | 30 | * VCard Backend for the OPIE-Contact Database. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | 33 | ||
34 | #include "vobject_p.h" | 34 | #include <opie2/private/vobject_p.h> |
35 | 35 | ||
36 | /* OPIE */ | 36 | /* OPIE */ |
37 | #include <opie2/ocontactaccessbackend_vcard.h> | 37 | #include <opie2/ocontactaccessbackend_vcard.h> |
38 | #include <opie2/odebug.h> | 38 | #include <opie2/odebug.h> |
39 | 39 | ||
40 | #include <qpe/timeconversion.h> | 40 | #include <qpe/timeconversion.h> |
diff --git a/libopie2/opiepim/backend/otodoaccessvcal.cpp b/libopie2/opiepim/backend/otodoaccessvcal.cpp index 14a325e..7d58a40 100644 --- a/libopie2/opiepim/backend/otodoaccessvcal.cpp +++ b/libopie2/opiepim/backend/otodoaccessvcal.cpp | |||
@@ -24,13 +24,13 @@ | |||
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "vobject_p.h" | 30 | #include <opie2/private/vobject_p.h> |
31 | 31 | ||
32 | /* OPIE */ | 32 | /* OPIE */ |
33 | #include <opie2/otodoaccessvcal.h> | 33 | #include <opie2/otodoaccessvcal.h> |
34 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
35 | 35 | ||
36 | #include <qpe/timeconversion.h> | 36 | #include <qpe/timeconversion.h> |
diff --git a/libopie2/opiepim/core/core.pro b/libopie2/opiepim/core/core.pro index 597b1e8..b1b5655 100644 --- a/libopie2/opiepim/core/core.pro +++ b/libopie2/opiepim/core/core.pro | |||
@@ -1,23 +1,48 @@ | |||
1 | HEADERS += \ | 1 | HEADERS += \ |
2 | core/opimdateconversion.h \ | 2 | core/ocontactaccess.h \ |
3 | core/odatebookaccess.h \ | ||
4 | core/opimaccessfactory.h \ | ||
5 | core/opimaccesstemplate.h \ | ||
3 | core/opimcache.h \ | 6 | core/opimcache.h \ |
7 | core/opimcontactfields.h \ | ||
8 | core/opimcontact.h \ | ||
9 | core/opimdateconversion.h \ | ||
10 | core/opimevent.h \ | ||
11 | core/opimglobal.h \ | ||
4 | core/opimmaintainer.h \ | 12 | core/opimmaintainer.h \ |
13 | core/opimnotify.h \ | ||
14 | core/opimnotifymanager.h \ | ||
15 | core/opimrecord.h \ | ||
16 | core/opimrecordlist.h \ | ||
17 | core/opimrecurrence.h \ | ||
5 | core/opimresolver.h \ | 18 | core/opimresolver.h \ |
6 | core/opimstate.h \ | 19 | core/opimstate.h \ |
20 | core/opimtemplatebase.h \ | ||
21 | core/opimtimezone.h \ | ||
22 | core/opimtodo.h \ | ||
7 | core/opimxref.h \ | 23 | core/opimxref.h \ |
8 | core/opimxrefmanager.h \ | 24 | core/opimxrefmanager.h \ |
9 | core/opimxrefpartner.h \ | 25 | core/opimxrefpartner.h \ |
10 | core/opimrecurrence.h \ | 26 | core/otodoaccess.h |
11 | core/opimtemplatebase.h \ | ||
12 | core/opimtimezone.h | ||
13 | 27 | ||
14 | SOURCES += \ | 28 | SOURCES += \ |
29 | core/ocontactaccess.cpp \ | ||
30 | core/odatebookaccess.cpp \ | ||
31 | core/opimcontactfields.cpp \ | ||
32 | core/opimcontact.cpp \ | ||
15 | core/opimdateconversion.cpp \ | 33 | core/opimdateconversion.cpp \ |
34 | core/opimevent.cpp \ | ||
16 | core/opimmaintainer.cpp \ | 35 | core/opimmaintainer.cpp \ |
36 | core/opimnotify.cpp \ | ||
37 | core/opimnotifymanager.cpp \ | ||
38 | core/opimrecord.cpp \ | ||
39 | core/opimrecurrence.cpp \ | ||
17 | core/opimresolver.cpp \ | 40 | core/opimresolver.cpp \ |
18 | core/opimstate.cpp \ | 41 | core/opimstate.cpp \ |
42 | core/opimtimezone.cpp \ | ||
43 | core/opimtodo.cpp \ | ||
19 | core/opimxref.cpp \ | 44 | core/opimxref.cpp \ |
20 | core/opimxrefmanager.cpp \ | 45 | core/opimxrefmanager.cpp \ |
21 | core/opimxrefpartner.cpp \ | 46 | core/opimxrefpartner.cpp \ |
22 | core/opimrecurrence.cpp \ | 47 | core/otodoaccess.cpp |
23 | core/opimtimezone.cpp | 48 | |
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp index 2602493..771d855 100644 --- a/libopie2/opiepim/core/ocontactaccess.cpp +++ b/libopie2/opiepim/core/ocontactaccess.cpp | |||
@@ -30,14 +30,14 @@ | |||
30 | * ===================================================================== | 30 | * ===================================================================== |
31 | * ToDo: XML-Backend: Automatic reload if something was changed... | 31 | * ToDo: XML-Backend: Automatic reload if something was changed... |
32 | * | 32 | * |
33 | * | 33 | * |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "ocontactaccess.h" | 36 | #include <opie2/ocontactaccess.h> |
37 | #include "obackendfactory.h" | 37 | #include <opie2/obackendfactory.h> |
38 | 38 | ||
39 | /* OPIE */ | 39 | /* OPIE */ |
40 | #include <opie2/ocontactaccessbackend_xml.h> | 40 | #include <opie2/ocontactaccessbackend_xml.h> |
41 | #include <opie2/opimresolver.h> | 41 | #include <opie2/opimresolver.h> |
42 | #include <opie2/opimglobal.h> | 42 | #include <opie2/opimglobal.h> |
43 | #include <opie2/odebug.h> | 43 | #include <opie2/odebug.h> |
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro index 318aecf..af8e63d 100644 --- a/libopie2/opiepim/opiepim.pro +++ b/libopie2/opiepim/opiepim.pro | |||
@@ -1,24 +1,20 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \ | ||
5 | opimnotifymanager.h opimevent.h | ||
6 | 4 | ||
7 | SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \ | ||
8 | opimnotifymanager.cpp opimevent.cpp | ||
9 | INTERFACES = | 5 | INTERFACES = |
10 | TARGET = opiepim2 | 6 | TARGET = opiepim2 |
11 | VERSION = 1.8.6 | 7 | VERSION = 1.8.6 |
12 | INCLUDEPATH += $(OPIEDIR)/include | 8 | INCLUDEPATH += $(OPIEDIR)/include |
13 | DEPENDPATH += $(OPIEDIR)/include | 9 | DEPENDPATH += $(OPIEDIR)/include |
14 | LIBS += -lopiecore2 | 10 | LIBS += -lopiecore2 |
15 | 11 | ||
16 | include ( $(OPIEDIR)/gen.pro ) | 12 | include ( $(OPIEDIR)/gen.pro ) |
17 | include ( core/core.pro ) | 13 | include ( core/core.pro ) |
18 | include ( core/backends/backends.pro ) | 14 | include ( backend/backends.pro ) |
19 | include ( ui/ui.pro ) | 15 | include ( ui/ui.pro ) |
20 | 16 | ||
21 | !contains( platform, x11 ) { | 17 | !contains( platform, x11 ) { |
22 | include ( $(OPIEDIR)/include.pro ) | 18 | include ( $(OPIEDIR)/include.pro ) |
23 | } | 19 | } |
24 | 20 | ||
diff --git a/libopie2/opiepim/ui/ui.pro b/libopie2/opiepim/ui/ui.pro index 530bd9f..6aa01a7 100644 --- a/libopie2/opiepim/ui/ui.pro +++ b/libopie2/opiepim/ui/ui.pro | |||
@@ -1,7 +1,9 @@ | |||
1 | HEADERS += ui/opimmainwindow.h \ | 1 | HEADERS += ui/opimmainwindow.h \ |
2 | ui/opimrecurrencewidget.h | 2 | ui/opimrecurrencewidget.h \ |
3 | ui/todayconfigwidget.h \ | ||
4 | ui/todayplugininterface.h | ||
3 | 5 | ||
4 | SOURCES += ui/opimmainwindow.cpp \ | 6 | SOURCES += ui/opimmainwindow.cpp \ |
5 | ui/opimrecurrencewidget.cpp | 7 | ui/opimrecurrencewidget.cpp |
6 | 8 | ||
7 | INTERFACES += ui/opimrecurrencebase.ui \ No newline at end of file | 9 | INTERFACES += ui/opimrecurrencebase.ui \ No newline at end of file |