| -rw-r--r-- | Rules.make | 4 | ||||
| -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 | 61 | ||||
| -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 |
8 files changed, 77 insertions, 59 deletions
@@ -153,6 +153,7 @@ $(OPIEDIR)/stamp-headers : $(TOPDIR)/include/qtopia \ $(TOPDIR)/include/opie \ $(TOPDIR)/include/opie2 \ + $(TOPDIR)/include/opie2/private \ $(TOPDIR)/include/qtopia/private \ $(TOPDIR)/include/sl ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) @@ -172,7 +173,8 @@ endif ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) - ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; ) + ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; ) + ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; ) ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.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 @@ SOURCES += \ - core/backends/ocontactaccessbackend_vcard.cpp \ - core/backends/ocontactaccessbackend_xml.cpp \ - core/backends/ocontactaccess.cpp \ - core/backends/odatebookaccessbackend.cpp \ - core/backends/odatebookaccessbackend_xml.cpp \ - core/backends/otodoaccessbackend.cpp \ - core/backends/otodoaccess.cpp \ - core/backends/otodoaccessvcal.cpp \ - core/backends/otodoaccessxml.cpp \ - core/backends/odatebookaccess.cpp + backend/ocontactaccessbackend_vcard.cpp \ + backend/ocontactaccessbackend_xml.cpp \ + backend/odatebookaccessbackend.cpp \ + backend/odatebookaccessbackend_xml.cpp \ + backend/otodoaccessbackend.cpp \ + backend/otodoaccessvcal.cpp \ + backend/otodoaccessxml.cpp HEADERS += \ - core/backends/obackendfactory.h \ - core/backends/ocontactaccessbackend.h \ - core/backends/ocontactaccessbackend_vcard.h \ - core/backends/ocontactaccessbackend_xml.h \ - core/backends/ocontactaccess.h \ - core/backends/odatebookaccessbackend.h \ - core/backends/odatebookaccessbackend_xml.h \ - core/backends/opimaccessbackend.h \ - core/backends/opimaccesstemplate.h \ - core/backends/otodoaccessbackend.h \ - core/backends/otodoaccess.h \ - core/backends/otodoaccessvcal.h \ - core/backends/otodoaccessxml.h \ - core/backends/odatebookaccess.h + backend/obackendfactory.h \ + backend/ocontactaccessbackend.h \ + backend/ocontactaccessbackend_vcard.h \ + backend/ocontactaccessbackend_xml.h \ + backend/odatebookaccessbackend.h \ + backend/odatebookaccessbackend_xml.h \ + backend/opimaccessbackend.h \ + backend/otodoaccessbackend.h \ + backend/otodoaccessvcal.h \ + backend/otodoaccessxml.h contains( ENABLE_SQL_PIM_BACKEND, y ) { message ( Enabling the SQL Backend for libopiepim2 ) DEFINES += __USE_SQL LIBS += -lopiedb2 - HEADERS += core/backends/otodoaccesssql.h \ - core/backends/ocontactaccessbackend_sql.h \ - core/backends/odatebookaccessbackend_sql.h - SOURCES += core/backends/otodoaccesssql.cpp \ - core/backends/ocontactaccessbackend_sql.cpp \ - core/backends/odatebookaccessbackend_sql.cpp + HEADERS += backend/otodoaccesssql.h \ + backend/ocontactaccessbackend_sql.h \ + backend/odatebookaccessbackend_sql.h + SOURCES += backend/otodoaccesssql.cpp \ + backend/ocontactaccessbackend_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/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/opimmaintainer.h \ - core/opimresolver.h \ - core/opimstate.h \ - core/opimxref.h \ - core/opimxrefmanager.h \ - core/opimxrefpartner.h \ - core/opimrecurrence.h \ - core/opimtemplatebase.h \ - core/opimtimezone.h + core/opimevent.h \ + core/opimglobal.h \ + core/opimmaintainer.h \ + core/opimnotify.h \ + core/opimnotifymanager.h \ + core/opimrecord.h \ + core/opimrecordlist.h \ + core/opimrecurrence.h \ + core/opimresolver.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/opimresolver.cpp \ - core/opimstate.cpp \ - core/opimxref.cpp \ - core/opimxrefmanager.cpp \ - core/opimxrefpartner.cpp \ - core/opimrecurrence.cpp \ - core/opimtimezone.cpp + core/opimevent.cpp \ + core/opimmaintainer.cpp \ + core/opimnotify.cpp \ + core/opimnotifymanager.cpp \ + core/opimrecord.cpp \ + core/opimrecurrence.cpp \ + core/opimresolver.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 @@ -33,8 +33,8 @@ * */ -#include "ocontactaccess.h" -#include "obackendfactory.h" +#include <opie2/ocontactaccess.h> +#include <opie2/obackendfactory.h> /* OPIE */ #include <opie2/ocontactaccessbackend_xml.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,11 +1,7 @@ TEMPLATE = lib 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 = TARGET = opiepim2 VERSION = 1.8.6 @@ -15,7 +11,7 @@ LIBS += -lopiecore2 include ( $(OPIEDIR)/gen.pro ) include ( core/core.pro ) -include ( core/backends/backends.pro ) +include ( backend/backends.pro ) include ( ui/ui.pro ) !contains( platform, x11 ) { 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,5 +1,7 @@ HEADERS += ui/opimmainwindow.h \ - ui/opimrecurrencewidget.h + ui/opimrecurrencewidget.h \ + ui/todayconfigwidget.h \ + ui/todayplugininterface.h SOURCES += ui/opimmainwindow.cpp \ ui/opimrecurrencewidget.cpp |