7 files changed, 74 insertions, 58 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,28 +1,21 @@
 SOURCES += \
-        core/backends/ocontactaccessbackend_vcard.cpp \
+        backend/ocontactaccessbackend_vcard.cpp \
-        core/backends/ocontactaccessbackend_xml.cpp \
+        backend/ocontactaccessbackend_xml.cpp   \
-        core/backends/ocontactaccess.cpp \
+        backend/odatebookaccessbackend.cpp      \
-        core/backends/odatebookaccessbackend.cpp \
+        backend/odatebookaccessbackend_xml.cpp  \
-        core/backends/odatebookaccessbackend_xml.cpp \
+        backend/otodoaccessbackend.cpp          \
-        core/backends/otodoaccessbackend.cpp \
+        backend/otodoaccessvcal.cpp             \
-        core/backends/otodoaccess.cpp \
+        backend/otodoaccessxml.cpp              
-        core/backends/otodoaccessvcal.cpp \
-        core/backends/otodoaccessxml.cpp \
-        core/backends/odatebookaccess.cpp
        
 HEADERS += \
-        core/backends/obackendfactory.h \
+        backend/obackendfactory.h              \
-        core/backends/ocontactaccessbackend.h \
+        backend/ocontactaccessbackend.h        \
-        core/backends/ocontactaccessbackend_vcard.h \
+        backend/ocontactaccessbackend_vcard.h  \
-        core/backends/ocontactaccessbackend_xml.h \
+        backend/ocontactaccessbackend_xml.h    \
-        core/backends/ocontactaccess.h \
+        backend/odatebookaccessbackend.h       \
-        core/backends/odatebookaccessbackend.h \
+        backend/odatebookaccessbackend_xml.h   \
-        core/backends/odatebookaccessbackend_xml.h \
+        backend/opimaccessbackend.h            \        
-        core/backends/opimaccessbackend.h \
+        backend/otodoaccessbackend.h           \
-        core/backends/opimaccesstemplate.h \
+        backend/otodoaccessvcal.h              \
-        core/backends/otodoaccessbackend.h \
+        backend/otodoaccessxml.h               
-        core/backends/otodoaccess.h \
-        core/backends/otodoaccessvcal.h \
-        core/backends/otodoaccessxml.h \
-        core/backends/odatebookaccess.h 
@@ -32,8 +25,8 @@ contains( ENABLE_SQL_PIM_BACKEND, y ) {
        LIBS    += -lopiedb2
-        HEADERS += core/backends/otodoaccesssql.h \
+        HEADERS += backend/otodoaccesssql.h             \
-                   core/backends/ocontactaccessbackend_sql.h \
+                   backend/ocontactaccessbackend_sql.h  \
-                   core/backends/odatebookaccessbackend_sql.h
+                   backend/odatebookaccessbackend_sql.h 
-        SOURCES += core/backends/otodoaccesssql.cpp \
+        SOURCES += backend/otodoaccesssql.cpp            \
-                   core/backends/ocontactaccessbackend_sql.cpp \
+                   backend/ocontactaccessbackend_sql.cpp \
-                   core/backends/odatebookaccessbackend_sql.cpp
+                   backend/odatebookaccessbackend_sql.cpp
 }
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
@@ -33,3 +33,3 @@
-#include "vobject_p.h"
+#include <opie2/private/vobject_p.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
@@ -29,3 +29,3 @@
-#include "vobject_p.h"
+#include <opie2/private/vobject_p.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 @@
 HEADERS += \
+        core/ocontactaccess.h     \
+        core/odatebookaccess.h    \
+        core/opimaccessfactory.h  \
+        core/opimaccesstemplate.h \       
+        core/opimcache.h          \
+        core/opimcontactfields.h  \
+        core/opimcontact.h        \
        core/opimdateconversion.h \
-        core/opimcache.h \
+        core/opimevent.h          \
-        core/opimmaintainer.h \
+        core/opimglobal.h         \
-        core/opimresolver.h \
+        core/opimmaintainer.h     \
-        core/opimstate.h \
+        core/opimnotify.h         \
-        core/opimxref.h \
+        core/opimnotifymanager.h  \       
-        core/opimxrefmanager.h \
+        core/opimrecord.h         \
-        core/opimxrefpartner.h \
+        core/opimrecordlist.h     \
-        core/opimrecurrence.h \
+        core/opimrecurrence.h     \
-        core/opimtemplatebase.h \
+        core/opimresolver.h       \
-        core/opimtimezone.h 
+        core/opimstate.h          \
+        core/opimtemplatebase.h   \
+        core/opimtimezone.h       \
+        core/opimtodo.h           \
+        core/opimxref.h           \
+        core/opimxrefmanager.h    \
+        core/opimxrefpartner.h    \      
+        core/otodoaccess.h
 SOURCES += \
+        core/ocontactaccess.cpp     \
+        core/odatebookaccess.cpp    \                             
+        core/opimcontactfields.cpp  \
+        core/opimcontact.cpp        \
        core/opimdateconversion.cpp \
-        core/opimmaintainer.cpp \
+        core/opimevent.cpp          \     
-        core/opimresolver.cpp \
+        core/opimmaintainer.cpp     \
-        core/opimstate.cpp \
+        core/opimnotify.cpp         \
-        core/opimxref.cpp \
+        core/opimnotifymanager.cpp  \       
-        core/opimxrefmanager.cpp \
+        core/opimrecord.cpp         \      
-        core/opimxrefpartner.cpp \
+        core/opimrecurrence.cpp     \
-        core/opimrecurrence.cpp \
+        core/opimresolver.cpp       \
-        core/opimtimezone.cpp 
+        core/opimstate.cpp          \       
+        core/opimtimezone.cpp       \
+        core/opimtodo.cpp           \
+        core/opimxref.cpp           \
+        core/opimxrefmanager.cpp    \
+        core/opimxrefpartner.cpp    \        
+        core/otodoaccess.cpp
+ 
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
@@ -35,4 +35,4 @@
-#include "ocontactaccess.h"
+#include <opie2/ocontactaccess.h>
-#include "obackendfactory.h"
+#include <opie2/obackendfactory.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
@@ -3,7 +3,3 @@ CONFIG      += qt warn_on
 DESTDIR     = $(OPIEDIR)/lib
-HEADERS     = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \
-              opimnotifymanager.h opimevent.h
-SOURCES     = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \
-              opimnotifymanager.cpp opimevent.cpp
 INTERFACES  =
@@ -17,3 +13,3 @@ include ( $(OPIEDIR)/gen.pro )
 include ( core/core.pro )
-include ( core/backends/backends.pro )
+include ( backend/backends.pro )
 include ( ui/ui.pro )
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,3 +1,5 @@
 HEADERS += ui/opimmainwindow.h         \
-           ui/opimrecurrencewidget.h
+           ui/opimrecurrencewidget.h   \
+           ui/todayconfigwidget.h      \
+           ui/todayplugininterface.h

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,28 +1,21 @@
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
@@ -32,8 +25,8 @@ contains( ENABLE_SQL_PIM_BACKEND, y ) {
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	}


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
@@ -33,3 +33,3 @@
33		33
34	#include "vobject_p.h"	34	#include <opie2/private/vobject_p.h>
35		35


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
@@ -29,3 +29,3 @@
29		29
30	#include "vobject_p.h"	30	#include <opie2/private/vobject_p.h>
31		31


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/ocontactaccess.h \
		3	core/odatebookaccess.h \
		4	core/opimaccessfactory.h \
		5	core/opimaccesstemplate.h \
		6	core/opimcache.h \
		7	core/opimcontactfields.h \
		8	core/opimcontact.h \
2	core/opimdateconversion.h \	9	core/opimdateconversion.h \
3	core/opimcache.h \	10	core/opimevent.h \
4	core/opimmaintainer.h \	11	core/opimglobal.h \
5	core/opimresolver.h \	12	core/opimmaintainer.h \
6	core/opimstate.h \	13	core/opimnotify.h \
7	core/opimxref.h \	14	core/opimnotifymanager.h \
8	core/opimxrefmanager.h \	15	core/opimrecord.h \
9	core/opimxrefpartner.h \	16	core/opimrecordlist.h \
10	core/opimrecurrence.h \	17	core/opimrecurrence.h \
11	core/opimtemplatebase.h \	18	core/opimresolver.h \
12	core/opimtimezone.h	19	core/opimstate.h \
		20	core/opimtemplatebase.h \
		21	core/opimtimezone.h \
		22	core/opimtodo.h \
		23	core/opimxref.h \
		24	core/opimxrefmanager.h \
		25	core/opimxrefpartner.h \
		26	core/otodoaccess.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 \
16	core/opimmaintainer.cpp \	34	core/opimevent.cpp \
17	core/opimresolver.cpp \	35	core/opimmaintainer.cpp \
18	core/opimstate.cpp \	36	core/opimnotify.cpp \
19	core/opimxref.cpp \	37	core/opimnotifymanager.cpp \
20	core/opimxrefmanager.cpp \	38	core/opimrecord.cpp \
21	core/opimxrefpartner.cpp \	39	core/opimrecurrence.cpp \
22	core/opimrecurrence.cpp \	40	core/opimresolver.cpp \
23	core/opimtimezone.cpp	41	core/opimstate.cpp \
		42	core/opimtimezone.cpp \
		43	core/opimtodo.cpp \
		44	core/opimxref.cpp \
		45	core/opimxrefmanager.cpp \
		46	core/opimxrefpartner.cpp \
		47	core/otodoaccess.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
@@ -35,4 +35,4 @@
35		35
36	#include "ocontactaccess.h"	36	#include <opie2/ocontactaccess.h>
37	#include "obackendfactory.h"	37	#include <opie2/obackendfactory.h>
38		38


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
@@ -3,7 +3,3 @@ 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 =
@@ -17,3 +13,3 @@ 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 )


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,3 +1,5 @@
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