summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make4
-rw-r--r--libopie2/opiepim/backend/backends.pro53
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp2
-rw-r--r--libopie2/opiepim/backend/otodoaccessvcal.cpp2
-rw-r--r--libopie2/opiepim/core/core.pro61
-rw-r--r--libopie2/opiepim/core/ocontactaccess.cpp4
-rw-r--r--libopie2/opiepim/opiepim.pro6
-rw-r--r--libopie2/opiepim/ui/ui.pro4
8 files changed, 77 insertions, 59 deletions
diff --git a/Rules.make b/Rules.make
index 0dce8d5..e89b129 100644
--- a/Rules.make
+++ b/Rules.make
@@ -150,12 +150,13 @@ $(QTDIR)/stamp-headers-x11 :
150$(OPIEDIR)/stamp-headers : 150$(OPIEDIR)/stamp-headers :
151 @-rm -f $(OPIEDIR)/stamp-headers* 151 @-rm -f $(OPIEDIR)/stamp-headers*
152 mkdir -p $(TOPDIR)/include/qpe \ 152 mkdir -p $(TOPDIR)/include/qpe \
153 $(TOPDIR)/include/qtopia \ 153 $(TOPDIR)/include/qtopia \
154 $(TOPDIR)/include/opie \ 154 $(TOPDIR)/include/opie \
155 $(TOPDIR)/include/opie2 \ 155 $(TOPDIR)/include/opie2 \
156 $(TOPDIR)/include/opie2/private \
156 $(TOPDIR)/include/qtopia/private \ 157 $(TOPDIR)/include/qtopia/private \
157 $(TOPDIR)/include/sl 158 $(TOPDIR)/include/sl
158 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 159 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
159 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 160 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
160 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 161 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
161ifeq ($(CONFIG_LIBOPIE),y) 162ifeq ($(CONFIG_LIBOPIE),y)
@@ -169,13 +170,14 @@ endif
169 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) 170 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
170 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 171 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
171 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 172 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
172 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 173 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
173 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 174 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
174 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) 175 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
175 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; ) 176 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; )
177 ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; )
176 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) 178 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
177 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 179 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
178 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) 180 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
179 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) 181 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
180 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) 182 ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
181 # auxilliary libraries 183 # auxilliary libraries
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 @@
1SOURCES += \ 1SOURCES += \
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
13HEADERS += \ 10HEADERS += \
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
29contains( ENABLE_SQL_PIM_BACKEND, y ) { 22contains( 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 @@
1HEADERS += \ 1HEADERS += \
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
14SOURCES += \ 28SOURCES += \
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
@@ -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 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \
5 opimnotifymanager.h opimevent.h
6 4
7SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \
8 opimnotifymanager.cpp opimevent.cpp
9INTERFACES = 5INTERFACES =
10TARGET = opiepim2 6TARGET = opiepim2
11VERSION = 1.8.6 7VERSION = 1.8.6
12INCLUDEPATH += $(OPIEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
13DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
14LIBS += -lopiecore2 10LIBS += -lopiecore2
15 11
16include ( $(OPIEDIR)/gen.pro ) 12include ( $(OPIEDIR)/gen.pro )
17include ( core/core.pro ) 13include ( core/core.pro )
18include ( core/backends/backends.pro ) 14include ( backend/backends.pro )
19include ( ui/ui.pro ) 15include ( 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 @@
1HEADERS += ui/opimmainwindow.h \ 1HEADERS += ui/opimmainwindow.h \
2 ui/opimrecurrencewidget.h 2 ui/opimrecurrencewidget.h \
3 ui/todayconfigwidget.h \
4 ui/todayplugininterface.h
3 5
4SOURCES += ui/opimmainwindow.cpp \ 6SOURCES += ui/opimmainwindow.cpp \
5 ui/opimrecurrencewidget.cpp 7 ui/opimrecurrencewidget.cpp
6 8
7INTERFACES += ui/opimrecurrencebase.ui \ No newline at end of file 9INTERFACES += ui/opimrecurrencebase.ui \ No newline at end of file