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
@@ -132,68 +132,70 @@ $(TOPDIR)/.depends.cfgs:
 # config.in interdependencies
         @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
         @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
         @-rm -f dirs
 
 $(QTDIR)/stamp-headers :
         @-rm -f $(QTDIR)/stamp-headers*
         ( cd $(QTDIR)/include; \
                 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
                 qcopchannel_qws.h qwindowsystem_qws.h \
                 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
         touch $@
 
 $(QTDIR)/stamp-headers-x11 :
         @-rm -f $(QTDIR)/stamp-headers*
         cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
         touch $@
 
 $(OPIEDIR)/stamp-headers :
         @-rm -f $(OPIEDIR)/stamp-headers*
         mkdir -p $(TOPDIR)/include/qpe \
                 $(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; )
         ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
         ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
 ifeq ($(CONFIG_LIBOPIE),y)
         # libopie1
         ( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
         ( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
         ( cd include/opie &&  ln -sf ../../libopie/big-screen/*.h .; )
 endif
         # libopie2
         ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
         ( 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 .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
         # auxilliary libraries
         ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
         ( cd include/sl && ln -sf ../../libslcompat/*.h .; )
         ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
         ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
         ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
         # all
 ifeq ($(CONFIG_LIBOPIE),y)
         ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
         ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
 endif
         ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
         ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
         ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
         ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
         ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
         touch $@
 
 $(OPIEDIR)/stamp-headers-x11 :
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 @@
 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 ) {
         message ( No SQL Backend in libopiepim2 )
 }
 
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
@@ -10,49 +10,49 @@
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 /*
  * VCard Backend for the OPIE-Contact Database.
  */
 
 
-#include "vobject_p.h"
+#include <opie2/private/vobject_p.h>
 
 /* OPIE */
 #include <opie2/ocontactaccessbackend_vcard.h>
 #include <opie2/odebug.h>
 
 #include <qpe/timeconversion.h>
 
 //FIXME: Hack to allow direct access to FILE* fh. Rewrite this!
 #define protected public
 #include <qfile.h>
 #undef protected
 
 namespace Opie {
 
 OPimContactAccessBackend_VCard::OPimContactAccessBackend_VCard ( const QString& , const QString& filename ):
     m_dirty( false ),
     m_file( filename )
 {
     load();
 }
 
 
 bool OPimContactAccessBackend_VCard::load ()
 {
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
@@ -6,49 +6,49 @@
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
-#include "vobject_p.h"
+#include <opie2/private/vobject_p.h>
 
 /* OPIE */
 #include <opie2/otodoaccessvcal.h>
 #include <opie2/odebug.h>
 
 #include <qpe/timeconversion.h>
 
 /* QT */
 //FIXME: Hack to allow direct access to FILE* fh. Rewrite this!
 #define protected public
 #include <qfile.h>
 #undef protected
 
 using namespace Opie;
 
 namespace {
     static OPimTodo eventByVObj( VObject *obj ){
         OPimTodo event;
         VObject *ob;
         QCString name;
         // no uid, attendees, ... and no fun
         // description
         if( ( ob = isAPropertyOf( obj, VCDescriptionProp )) != 0 ){
             name = vObjectStringZValue( ob );
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
@@ -12,50 +12,50 @@
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 /*
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  */
 
-#include "ocontactaccess.h"
-#include "obackendfactory.h"
+#include <opie2/ocontactaccess.h>
+#include <opie2/obackendfactory.h>
 
 /* OPIE */
 #include <opie2/ocontactaccessbackend_xml.h>
 #include <opie2/opimresolver.h>
 #include <opie2/opimglobal.h>
 #include <opie2/odebug.h>
 
 //#include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 
 /* QT */
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <qlist.h>
 #include <qcopchannel_qws.h>
 
 /* STD */
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.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,27 +1,23 @@
 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
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 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 ) {
   include ( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
   LIBS        = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
 }
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 @@
 HEADERS += ui/opimmainwindow.h         \
-           ui/opimrecurrencewidget.h
+           ui/opimrecurrencewidget.h   \
+           ui/todayconfigwidget.h      \
+           ui/todayplugininterface.h   
 
 SOURCES += ui/opimmainwindow.cpp       \
            ui/opimrecurrencewidget.cpp
 
 INTERFACES += ui/opimrecurrencebase.ui
\ No newline at end of file