get in sync with HEAD again

-OPimBase was added to be used as a default struct inside OPimResolver
and to work with DSOs
-TodoListXML backend now uses mmap and madvise to load data
-OContact added/changed rtti
-OTodo added changed rtti
OPimAccess* added stuff necessary for the Resolver and a 'state'/'hint'
on how to load data
OPimResolver which resolves uid + services to Records, rtti to QCOPChannels
 loads arbitary Service backends ( will work with DSOs soon )
-OPimMainWindow added some setDocument scripting possibility and
 internal marshalling and demarshalling of Records
-OPimRecord added loadDataFromm and saveDataTo for marshalling purposes
much more :)

1 files changed, 6 insertions, 5 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 6aec62e..38cba72 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -21,8 +21,9 @@
 
 #define QTOPIA_INTERNAL_CONTACT_MRE
 
 #include "ocontact.h"
+#include "opimresolver.h"
 
 #include <qpe/stringutil.h>
 #include <qpe/timeconversion.h>
 #include <qpe/timestring.h>
@@ -828,9 +829,9 @@ void OContact::save( QString &buf ) const
 /*!
   \internal
   Returns the list of fields belonging to a contact
   Never change order of this list ! It has to be regarding
-  enum AddressBookFields !! 
+  enum AddressBookFields !!
 */
 QStringList OContact::fields()
 {
     QStringList list;
@@ -1099,11 +1100,11 @@ void OContact::insertEmails( const QStringList &v )
     for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it )
 	insertEmail( *it );
 }
 int OContact::rtti() {
-    return 2;
+    return OPimResolver::AddressBook;
 }
 void OContact::setUid( int i )
-{ 
-	OPimRecord::setUid(i); 
-	replace( Qtopia::AddressUid , QString::number(i)); 
+{
+	OPimRecord::setUid(i);
+	replace( Qtopia::AddressUid , QString::number(i));
 }