3 files changed, 25 insertions, 32 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,41 +1,34 @@
 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 
 contains( ENABLE_SQL_PIM_BACKEND, y ) {
        message ( Enabling the SQL Backend for libopiepim2 )
        DEFINES += __USE_SQL
        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
 }
 !contains( ENABLE_SQL_PIM_BACKEND, y ) {
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
@@ -31,7 +31,7 @@
 */
-#include "vobject_p.h"
+#include <opie2/private/vobject_p.h>
 /* OPIE */
 #include <opie2/ocontactaccessbackend_vcard.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
@@ -27,7 +27,7 @@
                             Boston, MA 02111-1307, USA.
 */
-#include "vobject_p.h"
+#include <opie2/private/vobject_p.h>
 /* OPIE */
 #include <opie2/otodoaccessvcal.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,41 +1,34 @@
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 ) {


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
@@ -31,7 +31,7 @@
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>


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
@@ -27,7 +27,7 @@
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>