17 files changed, 374 insertions, 202 deletions

diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index 79d15bb..3e6156e 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -19,24 +19,27 @@ HEADERS   = ofontmenu.h \
     pim/otodoaccess.h \
     pim/otodoaccessbackend.h \
     pim/ocontact.h \
     pim/ocontactaccess.h \
     pim/ocontactaccessbackend.h \
     pim/ocontactaccessbackend_xml.h \
     pim/ocontactaccessbackend_vcard.h \
     pim/obackendfactory.h \
     pim/opimcache.h \ 
     pim/otodoaccessvcal.h \
     pim/orecur.h \
     pim/opimstate.h \
+    pim/opimxrefpartner.h \
+    pim/opimxref.h \
+    pim/opimxrefmanager.h \
     orecurrancewidget.h \
     oticker.h 
 #    pim/otodoaccesssql.h \
 
 SOURCES   = ofontmenu.cc  \
         ocolorbutton.cpp \
       xmltree.cc \
       ofiledialog.cc ofileselector.cc \
             ocheckitem.cpp tododb.cpp todoevent.cpp \
       todovcalresource.cpp  colordialog.cpp \
       colorpopupmenu.cpp oclickablelabel.cpp \
       oprocctrl.cpp oprocess.cpp \
@@ -45,24 +48,27 @@ SOURCES   = ofontmenu.cc  \
              ofontselector.cpp \
              pim/otodo.cpp \
              pim/opimrecord.cpp \
        pim/otodoaccess.cpp \
        pim/otodoaccessbackend.cpp \
              pim/otodoaccessxml.cpp \
              pim/ocontact.cpp \
              pim/ocontactaccess.cpp \
              pim/ocontactaccessbackend_vcard.cpp \
        pim/otodoaccessvcal.cpp \
        pim/orecur.cpp \
        pim/opimstate.cpp \
+       pim/opimxrefpartner.cpp \
+       pim/opimxref.cpp \
+       pim/opimxrefmanager.cpp \
        orecurrancewidget.cpp \
        oticker.cpp
 #             pim/otodoaccesssql.cpp \
 
 TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(QTDIR)/lib$(PROJMAK)
 #VERSION = 1.0.0
 
 # LIBS            += -lopiesql
 
 INTERFACES      = otimepickerbase.ui orecurrancebase.ui
diff --git a/libopie/pim/opimrecord.cpp b/libopie/pim/opimrecord.cpp
index 21cf131..0e3be9d 100644
--- a/libopie/pim/opimrecord.cpp
+++ b/libopie/pim/opimrecord.cpp
@@ -12,25 +12,25 @@ OPimRecord::OPimRecord( int uid )
     setUid( uid );
 }
 OPimRecord::~OPimRecord() {
 }
 OPimRecord::OPimRecord( const OPimRecord& rec )
     : Qtopia::Record( rec )
 {
     (*this) = rec;
 }
 
 OPimRecord &OPimRecord::operator=( const OPimRecord& rec) {
     Qtopia::Record::operator=( rec );
-    m_relations = rec.m_relations;
+    m_xrefman = rec.m_xrefman;
 
     return  *this;
 }
 /*
  * category names
  */
 QStringList OPimRecord::categoryNames()const {
     QStringList list;
     QArray<int> cats = categories();
     Categories catDB;
     catDB.load( categoryFileName() );
 
@@ -43,90 +43,39 @@ QStringList OPimRecord::categoryNames()const {
 void OPimRecord::setCategoryNames( const QStringList& ) {
 
 }
 void OPimRecord::addCategoryName( const QString& ) {
     Categories catDB;
     catDB.load( categoryFileName() );
 
 
 }
 bool OPimRecord::isEmpty()const {
     return ( uid() == 0 );
 }
-QStringList OPimRecord::relatedApps()const{
-    QStringList list;
-    QMap<QString, QArray<int> >::ConstIterator it;
-    for ( it = m_relations.begin(); it != m_relations.end(); ++it ) {
-        list << it.key();
-    }
-    return list;
-}
-QArray<int> OPimRecord::relations(const QString& app )const {
-    QArray<int> tmp;
-    QMap<QString, QArray<int> >::ConstIterator it;
-    it = m_relations.find( app);
-    if ( it != m_relations.end() )
-        tmp = it.data();
-    return tmp;
-}
-void OPimRecord::clearRelation( const QString& app ) {
-    m_relations.remove( app );
-}
-void OPimRecord::addRelation( const QString& app,  int id ) {
-
-    QMap<QString, QArray<int> >::Iterator  it;
-    QArray<int> tmp;
-
-    it = m_relations.find( app );
-    if ( it == m_relations.end() ) {
-        tmp.resize(1 );
-        tmp[0] = id;
-    }else{
-        tmp = it.data();
-        tmp.resize( tmp.size() + 1 );
-        tmp[tmp.size() - 1] = id;
-    }
-    m_relations.replace( app,  tmp );
-}
-void OPimRecord::setRelations( const QString& app,  QArray<int> ids ) {
-
-    QMap<QString, QArray<int> >::Iterator it;
-    QArray<int> tmp;
-
-    it = m_relations.find( app);
-    if ( it == m_relations.end() ) {
-        tmp = ids;
-    }else{
-        tmp = it.data();
-        int offset = tmp.size()-1;
-        tmp.resize( tmp.size() + ids.size() );
-        for (uint i = 0; i < ids.size(); i++ ) {
-            tmp[offset+i] = ids[i];
-        }
-
-    }
-    m_relations.replace( app,  tmp );
-}
-QString OPimRecord::crossToString()const {
+/*QString OPimRecord::crossToString()const {
     QString str;
     QMap<QString, QArray<int> >::ConstIterator it;
     for (it = m_relations.begin(); it != m_relations.end(); ++it ) {
         QArray<int> id = it.data();
         for ( uint i = 0; i < id.size(); ++i ) {
             str += it.key() + "," + QString::number( i ) + ";";
         }
     }
     str = str.remove( str.length()-1, 1); // strip the ;
     //qWarning("IDS " + str );
 
     return str;
-}
+    }*/
 /* if uid = 1 assign a new one */
 void OPimRecord::setUid( int uid ) {
     if ( uid == 1)
         uid = uidGen().generate();
 
     Qtopia::Record::setUid( uid );
 };
 Qtopia::UidGen &OPimRecord::uidGen() {
     return m_uidGen;
 }
+OPimXRefManager &OPimRecord::xrefmanager() {
+    return m_xrefman;
+}
diff --git a/libopie/pim/opimrecord.h b/libopie/pim/opimrecord.h
index d9ccad4..1642a5e 100644
--- a/libopie/pim/opimrecord.h
+++ b/libopie/pim/opimrecord.h
@@ -1,21 +1,22 @@
 #ifndef OPIE_PIM_RECORD_H
 #define OPIE_PIM_RECORD_H
 
 #include <qmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
 
 #include <qpe/palmtoprecord.h>
 
+#include <opie/opimxrefmanager.h>
 
 /**
  * This is the base class for
  * all PIM Records
  *
  */
 class OPimRecord : public Qtopia::Record {
 public:
     /**
      * c'tor
      * uid of 0 isEmpty
      * uid of 1 will be assigned a new one
@@ -77,57 +78,39 @@ public:
 
     /**
      * key value representation of extra items
      */
     virtual QMap<QString, QString> toExtraMap()const = 0;
 
     /**
      * the name for a recordField
      */
     virtual QString recordField(int)const = 0;
 
     /**
-     * the related apps names
+     * returns a reference of the
+     * Cross Reference Manager
+     * Partner One is THIS PIM RECORD!
+     * Two is the Partner where we link to
      */
-    QStringList relatedApps()const;
-
-    /**
-     * the realtions between an app
-     */
-    QArray<int> relations( const QString& app )const;
-
-    /**
-     * clear the relations for all relations
-     * with app
-     */
-    void clearRelation( const QString& app );
-
-    /**
-     * add a relation
-     */
-    void addRelation( const QString& app,  int id );
-
-    /**
-     * set the relations for an app
-     */
-    void setRelations( const QString&, QArray<int> ids );
+    OPimXRefManager& xrefmanager();
 
     /**
      * set the uid
      */
     virtual void setUid( int uid );
 
 protected:
     Qtopia::UidGen &uidGen();
-    QString crossToString()const;
+//    QString crossToString()const;
 
 private:
     class OPimRecordPrivate;
     OPimRecordPrivate *d;
-    QMap<QString, QArray<int> > m_relations;
+    OPimXRefManager m_xrefman;
     static Qtopia::UidGen m_uidGen;
 
 };
 
 
 
 #endif
diff --git a/libopie/pim/opimxref.cpp b/libopie/pim/opimxref.cpp
new file mode 100644
index 0000000..5cae871
--- a/dev/null
+++ b/libopie/pim/opimxref.cpp
@@ -0,0 +1,47 @@
+#include "opimxref.h"
+
+OPimXRef::OPimXRef( const OPimXRefPartner& one, const OPimXRefPartner& two )
+    : m_partners(2)
+{
+    m_partners[0] = one;
+    m_partners[1] = two;
+}
+OPimXRef::OPimXRef()
+    : m_partners(2)
+{
+
+}
+OPimXRef::OPimXRef( const OPimXRef& ref) {
+    *this = ref;
+}
+OPimXRef::~OPimXRef() {
+}
+OPimXRef &OPimXRef::operator=( const OPimXRef& ref) {
+    m_partners = ref.m_partners;
+    m_partners.detach();
+
+    return* this;
+}
+bool OPimXRef::operator==( const OPimXRef& oper ) {
+    if ( m_partners == oper.m_partners ) return true;
+
+    return false;
+}
+OPimXRefPartner OPimXRef::partner( enum Partners par) const{
+    return m_partners[par];
+}
+void OPimXRef::setPartner( enum Partners par,  const OPimXRefPartner& part) {
+    m_partners[par] = part;
+}
+bool OPimXRef::containsString( const QString& string ) const{
+    if ( m_partners[One].appName() == string ||
+         m_partners[Two].appName() == string ) return true;
+
+    return false;
+}
+bool OPimXRef::containsUid( int uid ) const{
+    if ( m_partners[One].uid() == uid ||
+         m_partners[Two].uid() == uid ) return true;
+
+    return false;
+}
diff --git a/libopie/pim/opimxref.h b/libopie/pim/opimxref.h
index 72154ac..354739a 100644
--- a/libopie/pim/opimxref.h
+++ b/libopie/pim/opimxref.h
@@ -11,26 +11,29 @@
  * two Cross Reference Partners
  */
 class OPimXRef {
 public:
     typedef QValueList<OPimXRef> ValueList;
     enum Partners { One, Two };
     OPimXRef( const OPimXRefPartner& ONE, const OPimXRefPartner& );
     OPimXRef();
     OPimXRef( const OPimXRef& );
     ~OPimXRef();
 
     OPimXRef &operator=( const OPimXRef& );
-    bool operator==( const OPimXRef );
+    bool operator==( const OPimXRef& );
 
-    OPimXRefPartner partner( enum Partners );
+    OPimXRefPartner partner( enum Partners )const;
 
     void setPartner( enum Partners,  const OPimXRefPartner& );
 
+    bool containsString( const QString& appName)const;
+    bool containsUid( int uid )const;
+
 private:
     QArray<OPimXRefPartner> m_partners;
 
     class Private;
     Private *d;
 };
 
 #endif
diff --git a/libopie/pim/opimxrefmanager.cpp b/libopie/pim/opimxrefmanager.cpp
new file mode 100644
index 0000000..d49f5f5
--- a/dev/null
+++ b/libopie/pim/opimxrefmanager.cpp
@@ -0,0 +1,69 @@
+#include "opimxrefmanager.h"
+
+
+OPimXRefManager::OPimXRefManager() {
+}
+OPimXRefManager::OPimXRefManager( const OPimXRefManager& ref) {
+    m_list = ref.m_list;
+}
+OPimXRefManager &OPimXRefManager::operator=( const OPimXRefManager& ref) {
+    m_list = ref.m_list;
+    return *this;
+}
+bool OPimXRefManager::operator==( const OPimXRefManager& /*ref*/) {
+    //   if ( m_list == ref.m_list ) return true;
+
+    return false;
+}
+void OPimXRefManager::add( const OPimXRef& ref) {
+    m_list.append( ref );
+}
+void OPimXRefManager::remove( const OPimXRef& ref) {
+    m_list.remove( ref );
+}
+void OPimXRefManager::replace( const OPimXRef& ref) {
+    m_list.remove( ref );
+    m_list.append( ref );
+}
+void OPimXRefManager::clear() {
+    m_list.clear();
+}
+QStringList OPimXRefManager::apps()const {
+    OPimXRef::ValueList::ConstIterator it;
+    QStringList list;
+
+    QString str;
+    for ( it = m_list.begin(); it != m_list.end(); ++it ) {
+        str = (*it).partner( OPimXRef::One ).appName();
+        if ( !list.contains( str ) ) list << str;
+
+        str = (*it).partner( OPimXRef::Two ).appName();
+        if ( !list.contains( str ) ) list << str;
+    }
+    return list;
+}
+OPimXRef::ValueList OPimXRefManager::list()const {
+    return m_list;
+}
+OPimXRef::ValueList OPimXRefManager::list( const QString& appName )const{
+    OPimXRef::ValueList list;
+    OPimXRef::ValueList::ConstIterator it;
+
+    for ( it = m_list.begin(); it != m_list.end(); ++it ) {
+        if ( (*it).containsString( appName ) )
+            list.append( (*it) );
+    }
+
+    return list;
+}
+OPimXRef::ValueList OPimXRefManager::list( int uid )const {
+    OPimXRef::ValueList list;
+    OPimXRef::ValueList::ConstIterator it;
+
+    for ( it = m_list.begin(); it != m_list.end(); ++it ) {
+        if ( (*it).containsUid( uid ) )
+            list.append( (*it) );
+    }
+
+    return list;
+}
diff --git a/libopie/pim/opimxrefmanager.h b/libopie/pim/opimxrefmanager.h
index 147895d..9b003a3 100644
--- a/libopie/pim/opimxrefmanager.h
+++ b/libopie/pim/opimxrefmanager.h
@@ -1,15 +1,17 @@
 #ifndef OPIM_XREF_MANAGER_H
 #define OPIM_XREF_MANAGER_H
 
+#include <qstringlist.h>
+
 #include <opie/opimxref.h>
 
 /**
  * This is a simple manager for
  * OPimXRefs.
  * It allows addition, removing, replacing
  * clearing and 'querying' the XRef...
  */
 class OPimXRefManager {
 public:
     OPimXRefManager();
     OPimXRefManager( const OPimXRefManager& );
@@ -22,15 +24,18 @@ public:
     void remove( const OPimXRef& );
     void replace( const OPimXRef& );
 
     void clear();
 
     /**
      * apps participating
      */
     QStringList apps()const;
     OPimXRef::ValueList list()const;
     OPimXRef::ValueList list( const QString& appName )const;
     OPimXRef::ValueList list( int uid )const;
+
+private:
+    OPimXRef::ValueList m_list;
 };
 
 #endif
diff --git a/libopie/pim/opimxrefpartner.cpp b/libopie/pim/opimxrefpartner.cpp
new file mode 100644
index 0000000..028f4e6
--- a/dev/null
+++ b/libopie/pim/opimxrefpartner.cpp
@@ -0,0 +1,43 @@
+#include "opimxrefpartner.h"
+
+OPimXRefPartner::OPimXRefPartner( const QString& appName,
+                                  int uid, int field )
+    : m_app(appName), m_uid(uid), m_field( field ) {
+}
+OPimXRefPartner::OPimXRefPartner( const OPimXRefPartner& ref ) {
+    *this = ref;
+}
+OPimXRefPartner::~OPimXRefPartner() {
+}
+OPimXRefPartner &OPimXRefPartner::operator=( const OPimXRefPartner& par ) {
+    m_app = par.m_app;
+    m_uid = par.m_uid;
+    m_field = par.m_field;
+
+    return *this;
+}
+bool OPimXRefPartner::operator==( const OPimXRefPartner& par ) {
+    if ( m_app != par.m_app ) return false;
+    if ( m_uid != par.m_uid ) return false;
+    if ( m_field != par.m_field ) return false;
+
+    return true;
+}
+QString OPimXRefPartner::appName()const {
+    return m_app;
+}
+int OPimXRefPartner::uid()const {
+    return m_uid;
+}
+int OPimXRefPartner::field()const {
+    return m_field;
+}
+void OPimXRefPartner::setAppName( const QString& appName ) {
+    m_app = appName;
+}
+void OPimXRefPartner::setUid( int uid ) {
+    m_uid = uid;
+}
+void OPimXRefPartner::setField( int field ) {
+    m_field = field;
+}
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 591e467..c1682c6 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -322,25 +322,25 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev,
     case OTodo::CrossReference:
     {
         /*
          * A cross refernce looks like
          * appname,id;appname,id
          * we need to split it up
          */
         QStringList  refs = QStringList::split(';', val );
         QStringList::Iterator strIt;
         for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) {
             int pos = (*strIt).find(',');
             if ( pos > -1 )
-                ev.addRelation( (*strIt).left(pos),  (*strIt).mid(pos+1).toInt() );
+                ; // ev.addRelation( (*strIt).left(pos),  (*strIt).mid(pos+1).toInt() );
 
         }
         break;
     }
     case OTodo::HasAlarmDateTime:
         ev.setHasAlarmDateTime( val.toInt() );
         break;
     case OTodo::AlarmDateTime: {
         /* this sounds better ;) zecke */
         ev.setAlarmDateTime( TimeConversion::fromISO8601( val.local8Bit() ) );
         break;
     }
@@ -373,40 +373,24 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
      * possible you can set custom fields
      * but don' iterate over the list
      * I may do #define private protected
      * for this case - cough  --zecke
      */
     /*
     QMap<QString, QString> extras = ev.extras();
     QMap<QString, QString>::Iterator extIt;
     for (extIt = extras.begin(); extIt != extras.end(); ++extIt )
         str += extIt.key() + "=\"" +  extIt.data() + "\" ";
     */
     // cross refernce
-    QStringList list = ev.relatedApps();
-    QStringList::Iterator listIt;
-    QString refs;
-    str += "CrossReference=\"";
-    bool added = false;
-    for ( listIt = list.begin(); listIt != list.end(); ++listIt ) {
-        added = true;
-        QArray<int> ints = ev.relations( (*listIt) );
-        for ( uint i = 0; i< ints.count(); i++ ) {
-            str += (*listIt) + "," + QString::number( i ) + ";";
-        }
-    }
-    if ( added )
-        str = str.remove( str.length()-1, 1 );
-
-    str += "\" ";
 
     str += "AlarmDateTime=\"" + TimeConversion::toISO8601( ev.alarmDateTime() ) + "\" ";
 
     return str;
 }
 QString OTodoAccessXML::toString( const QArray<int>& ints ) const {
     return Qtopia::Record::idsToString( ints );
 }
 
 /* internal class for sorting
  *
  * Inspired by todoxmlio.cpp from TT
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 591e467..c1682c6 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -322,25 +322,25 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev,
     case OTodo::CrossReference:
     {
         /*
          * A cross refernce looks like
          * appname,id;appname,id
          * we need to split it up
          */
         QStringList  refs = QStringList::split(';', val );
         QStringList::Iterator strIt;
         for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) {
             int pos = (*strIt).find(',');
             if ( pos > -1 )
-                ev.addRelation( (*strIt).left(pos),  (*strIt).mid(pos+1).toInt() );
+                ; // ev.addRelation( (*strIt).left(pos),  (*strIt).mid(pos+1).toInt() );
 
         }
         break;
     }
     case OTodo::HasAlarmDateTime:
         ev.setHasAlarmDateTime( val.toInt() );
         break;
     case OTodo::AlarmDateTime: {
         /* this sounds better ;) zecke */
         ev.setAlarmDateTime( TimeConversion::fromISO8601( val.local8Bit() ) );
         break;
     }
@@ -373,40 +373,24 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
      * possible you can set custom fields
      * but don' iterate over the list
      * I may do #define private protected
      * for this case - cough  --zecke
      */
     /*
     QMap<QString, QString> extras = ev.extras();
     QMap<QString, QString>::Iterator extIt;
     for (extIt = extras.begin(); extIt != extras.end(); ++extIt )
         str += extIt.key() + "=\"" +  extIt.data() + "\" ";
     */
     // cross refernce
-    QStringList list = ev.relatedApps();
-    QStringList::Iterator listIt;
-    QString refs;
-    str += "CrossReference=\"";
-    bool added = false;
-    for ( listIt = list.begin(); listIt != list.end(); ++listIt ) {
-        added = true;
-        QArray<int> ints = ev.relations( (*listIt) );
-        for ( uint i = 0; i< ints.count(); i++ ) {
-            str += (*listIt) + "," + QString::number( i ) + ";";
-        }
-    }
-    if ( added )
-        str = str.remove( str.length()-1, 1 );
-
-    str += "\" ";
 
     str += "AlarmDateTime=\"" + TimeConversion::toISO8601( ev.alarmDateTime() ) + "\" ";
 
     return str;
 }
 QString OTodoAccessXML::toString( const QArray<int>& ints ) const {
     return Qtopia::Record::idsToString( ints );
 }
 
 /* internal class for sorting
  *
  * Inspired by todoxmlio.cpp from TT
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp
index 21cf131..0e3be9d 100644
--- a/libopie2/opiepim/core/opimrecord.cpp
+++ b/libopie2/opiepim/core/opimrecord.cpp
@@ -12,25 +12,25 @@ OPimRecord::OPimRecord( int uid )
     setUid( uid );
 }
 OPimRecord::~OPimRecord() {
 }
 OPimRecord::OPimRecord( const OPimRecord& rec )
     : Qtopia::Record( rec )
 {
     (*this) = rec;
 }
 
 OPimRecord &OPimRecord::operator=( const OPimRecord& rec) {
     Qtopia::Record::operator=( rec );
-    m_relations = rec.m_relations;
+    m_xrefman = rec.m_xrefman;
 
     return  *this;
 }
 /*
  * category names
  */
 QStringList OPimRecord::categoryNames()const {
     QStringList list;
     QArray<int> cats = categories();
     Categories catDB;
     catDB.load( categoryFileName() );
 
@@ -43,90 +43,39 @@ QStringList OPimRecord::categoryNames()const {
 void OPimRecord::setCategoryNames( const QStringList& ) {
 
 }
 void OPimRecord::addCategoryName( const QString& ) {
     Categories catDB;
     catDB.load( categoryFileName() );
 
 
 }
 bool OPimRecord::isEmpty()const {
     return ( uid() == 0 );
 }
-QStringList OPimRecord::relatedApps()const{
-    QStringList list;
-    QMap<QString, QArray<int> >::ConstIterator it;
-    for ( it = m_relations.begin(); it != m_relations.end(); ++it ) {
-        list << it.key();
-    }
-    return list;
-}
-QArray<int> OPimRecord::relations(const QString& app )const {
-    QArray<int> tmp;
-    QMap<QString, QArray<int> >::ConstIterator it;
-    it = m_relations.find( app);
-    if ( it != m_relations.end() )
-        tmp = it.data();
-    return tmp;
-}
-void OPimRecord::clearRelation( const QString& app ) {
-    m_relations.remove( app );
-}
-void OPimRecord::addRelation( const QString& app,  int id ) {
-
-    QMap<QString, QArray<int> >::Iterator  it;
-    QArray<int> tmp;
-
-    it = m_relations.find( app );
-    if ( it == m_relations.end() ) {
-        tmp.resize(1 );
-        tmp[0] = id;
-    }else{
-        tmp = it.data();
-        tmp.resize( tmp.size() + 1 );
-        tmp[tmp.size() - 1] = id;
-    }
-    m_relations.replace( app,  tmp );
-}
-void OPimRecord::setRelations( const QString& app,  QArray<int> ids ) {
-
-    QMap<QString, QArray<int> >::Iterator it;
-    QArray<int> tmp;
-
-    it = m_relations.find( app);
-    if ( it == m_relations.end() ) {
-        tmp = ids;
-    }else{
-        tmp = it.data();
-        int offset = tmp.size()-1;
-        tmp.resize( tmp.size() + ids.size() );
-        for (uint i = 0; i < ids.size(); i++ ) {
-            tmp[offset+i] = ids[i];
-        }
-
-    }
-    m_relations.replace( app,  tmp );
-}
-QString OPimRecord::crossToString()const {
+/*QString OPimRecord::crossToString()const {
     QString str;
     QMap<QString, QArray<int> >::ConstIterator it;
     for (it = m_relations.begin(); it != m_relations.end(); ++it ) {
         QArray<int> id = it.data();
         for ( uint i = 0; i < id.size(); ++i ) {
             str += it.key() + "," + QString::number( i ) + ";";
         }
     }
     str = str.remove( str.length()-1, 1); // strip the ;
     //qWarning("IDS " + str );
 
     return str;
-}
+    }*/
 /* if uid = 1 assign a new one */
 void OPimRecord::setUid( int uid ) {
     if ( uid == 1)
         uid = uidGen().generate();
 
     Qtopia::Record::setUid( uid );
 };
 Qtopia::UidGen &OPimRecord::uidGen() {
     return m_uidGen;
 }
+OPimXRefManager &OPimRecord::xrefmanager() {
+    return m_xrefman;
+}
diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h
index d9ccad4..1642a5e 100644
--- a/libopie2/opiepim/core/opimrecord.h
+++ b/libopie2/opiepim/core/opimrecord.h
@@ -1,21 +1,22 @@
 #ifndef OPIE_PIM_RECORD_H
 #define OPIE_PIM_RECORD_H
 
 #include <qmap.h>
 #include <qstring.h>
 #include <qstringlist.h>
 
 #include <qpe/palmtoprecord.h>
 
+#include <opie/opimxrefmanager.h>
 
 /**
  * This is the base class for
  * all PIM Records
  *
  */
 class OPimRecord : public Qtopia::Record {
 public:
     /**
      * c'tor
      * uid of 0 isEmpty
      * uid of 1 will be assigned a new one
@@ -77,57 +78,39 @@ public:
 
     /**
      * key value representation of extra items
      */
     virtual QMap<QString, QString> toExtraMap()const = 0;
 
     /**
      * the name for a recordField
      */
     virtual QString recordField(int)const = 0;
 
     /**
-     * the related apps names
+     * returns a reference of the
+     * Cross Reference Manager
+     * Partner One is THIS PIM RECORD!
+     * Two is the Partner where we link to
      */
-    QStringList relatedApps()const;
-
-    /**
-     * the realtions between an app
-     */
-    QArray<int> relations( const QString& app )const;
-
-    /**
-     * clear the relations for all relations
-     * with app
-     */
-    void clearRelation( const QString& app );
-
-    /**
-     * add a relation
-     */
-    void addRelation( const QString& app,  int id );
-
-    /**
-     * set the relations for an app
-     */
-    void setRelations( const QString&, QArray<int> ids );
+    OPimXRefManager& xrefmanager();
 
     /**
      * set the uid
      */
     virtual void setUid( int uid );
 
 protected:
     Qtopia::UidGen &uidGen();
-    QString crossToString()const;
+//    QString crossToString()const;
 
 private:
     class OPimRecordPrivate;
     OPimRecordPrivate *d;
-    QMap<QString, QArray<int> > m_relations;
+    OPimXRefManager m_xrefman;
     static Qtopia::UidGen m_uidGen;
 
 };
 
 
 
 #endif
diff --git a/libopie2/opiepim/core/opimxref.cpp b/libopie2/opiepim/core/opimxref.cpp
new file mode 100644
index 0000000..5cae871
--- a/dev/null
+++ b/libopie2/opiepim/core/opimxref.cpp
@@ -0,0 +1,47 @@
+#include "opimxref.h"
+
+OPimXRef::OPimXRef( const OPimXRefPartner& one, const OPimXRefPartner& two )
+    : m_partners(2)
+{
+    m_partners[0] = one;
+    m_partners[1] = two;
+}
+OPimXRef::OPimXRef()
+    : m_partners(2)
+{
+
+}
+OPimXRef::OPimXRef( const OPimXRef& ref) {
+    *this = ref;
+}
+OPimXRef::~OPimXRef() {
+}
+OPimXRef &OPimXRef::operator=( const OPimXRef& ref) {
+    m_partners = ref.m_partners;
+    m_partners.detach();
+
+    return* this;
+}
+bool OPimXRef::operator==( const OPimXRef& oper ) {
+    if ( m_partners == oper.m_partners ) return true;
+
+    return false;
+}
+OPimXRefPartner OPimXRef::partner( enum Partners par) const{
+    return m_partners[par];
+}
+void OPimXRef::setPartner( enum Partners par,  const OPimXRefPartner& part) {
+    m_partners[par] = part;
+}
+bool OPimXRef::containsString( const QString& string ) const{
+    if ( m_partners[One].appName() == string ||
+         m_partners[Two].appName() == string ) return true;
+
+    return false;
+}
+bool OPimXRef::containsUid( int uid ) const{
+    if ( m_partners[One].uid() == uid ||
+         m_partners[Two].uid() == uid ) return true;
+
+    return false;
+}
diff --git a/libopie2/opiepim/core/opimxref.h b/libopie2/opiepim/core/opimxref.h
index 72154ac..354739a 100644
--- a/libopie2/opiepim/core/opimxref.h
+++ b/libopie2/opiepim/core/opimxref.h
@@ -11,26 +11,29 @@
  * two Cross Reference Partners
  */
 class OPimXRef {
 public:
     typedef QValueList<OPimXRef> ValueList;
     enum Partners { One, Two };
     OPimXRef( const OPimXRefPartner& ONE, const OPimXRefPartner& );
     OPimXRef();
     OPimXRef( const OPimXRef& );
     ~OPimXRef();
 
     OPimXRef &operator=( const OPimXRef& );
-    bool operator==( const OPimXRef );
+    bool operator==( const OPimXRef& );
 
-    OPimXRefPartner partner( enum Partners );
+    OPimXRefPartner partner( enum Partners )const;
 
     void setPartner( enum Partners,  const OPimXRefPartner& );
 
+    bool containsString( const QString& appName)const;
+    bool containsUid( int uid )const;
+
 private:
     QArray<OPimXRefPartner> m_partners;
 
     class Private;
     Private *d;
 };
 
 #endif
diff --git a/libopie2/opiepim/core/opimxrefmanager.cpp b/libopie2/opiepim/core/opimxrefmanager.cpp
new file mode 100644
index 0000000..d49f5f5
--- a/dev/null
+++ b/libopie2/opiepim/core/opimxrefmanager.cpp
@@ -0,0 +1,69 @@
+#include "opimxrefmanager.h"
+
+
+OPimXRefManager::OPimXRefManager() {
+}
+OPimXRefManager::OPimXRefManager( const OPimXRefManager& ref) {
+    m_list = ref.m_list;
+}
+OPimXRefManager &OPimXRefManager::operator=( const OPimXRefManager& ref) {
+    m_list = ref.m_list;
+    return *this;
+}
+bool OPimXRefManager::operator==( const OPimXRefManager& /*ref*/) {
+    //   if ( m_list == ref.m_list ) return true;
+
+    return false;
+}
+void OPimXRefManager::add( const OPimXRef& ref) {
+    m_list.append( ref );
+}
+void OPimXRefManager::remove( const OPimXRef& ref) {
+    m_list.remove( ref );
+}
+void OPimXRefManager::replace( const OPimXRef& ref) {
+    m_list.remove( ref );
+    m_list.append( ref );
+}
+void OPimXRefManager::clear() {
+    m_list.clear();
+}
+QStringList OPimXRefManager::apps()const {
+    OPimXRef::ValueList::ConstIterator it;
+    QStringList list;
+
+    QString str;
+    for ( it = m_list.begin(); it != m_list.end(); ++it ) {
+        str = (*it).partner( OPimXRef::One ).appName();
+        if ( !list.contains( str ) ) list << str;
+
+        str = (*it).partner( OPimXRef::Two ).appName();
+        if ( !list.contains( str ) ) list << str;
+    }
+    return list;
+}
+OPimXRef::ValueList OPimXRefManager::list()const {
+    return m_list;
+}
+OPimXRef::ValueList OPimXRefManager::list( const QString& appName )const{
+    OPimXRef::ValueList list;
+    OPimXRef::ValueList::ConstIterator it;
+
+    for ( it = m_list.begin(); it != m_list.end(); ++it ) {
+        if ( (*it).containsString( appName ) )
+            list.append( (*it) );
+    }
+
+    return list;
+}
+OPimXRef::ValueList OPimXRefManager::list( int uid )const {
+    OPimXRef::ValueList list;
+    OPimXRef::ValueList::ConstIterator it;
+
+    for ( it = m_list.begin(); it != m_list.end(); ++it ) {
+        if ( (*it).containsUid( uid ) )
+            list.append( (*it) );
+    }
+
+    return list;
+}
diff --git a/libopie2/opiepim/core/opimxrefmanager.h b/libopie2/opiepim/core/opimxrefmanager.h
index 147895d..9b003a3 100644
--- a/libopie2/opiepim/core/opimxrefmanager.h
+++ b/libopie2/opiepim/core/opimxrefmanager.h
@@ -1,15 +1,17 @@
 #ifndef OPIM_XREF_MANAGER_H
 #define OPIM_XREF_MANAGER_H
 
+#include <qstringlist.h>
+
 #include <opie/opimxref.h>
 
 /**
  * This is a simple manager for
  * OPimXRefs.
  * It allows addition, removing, replacing
  * clearing and 'querying' the XRef...
  */
 class OPimXRefManager {
 public:
     OPimXRefManager();
     OPimXRefManager( const OPimXRefManager& );
@@ -22,15 +24,18 @@ public:
     void remove( const OPimXRef& );
     void replace( const OPimXRef& );
 
     void clear();
 
     /**
      * apps participating
      */
     QStringList apps()const;
     OPimXRef::ValueList list()const;
     OPimXRef::ValueList list( const QString& appName )const;
     OPimXRef::ValueList list( int uid )const;
+
+private:
+    OPimXRef::ValueList m_list;
 };
 
 #endif
diff --git a/libopie2/opiepim/core/opimxrefpartner.cpp b/libopie2/opiepim/core/opimxrefpartner.cpp
new file mode 100644
index 0000000..028f4e6
--- a/dev/null
+++ b/libopie2/opiepim/core/opimxrefpartner.cpp
@@ -0,0 +1,43 @@
+#include "opimxrefpartner.h"
+
+OPimXRefPartner::OPimXRefPartner( const QString& appName,
+                                  int uid, int field )
+    : m_app(appName), m_uid(uid), m_field( field ) {
+}
+OPimXRefPartner::OPimXRefPartner( const OPimXRefPartner& ref ) {
+    *this = ref;
+}
+OPimXRefPartner::~OPimXRefPartner() {
+}
+OPimXRefPartner &OPimXRefPartner::operator=( const OPimXRefPartner& par ) {
+    m_app = par.m_app;
+    m_uid = par.m_uid;
+    m_field = par.m_field;
+
+    return *this;
+}
+bool OPimXRefPartner::operator==( const OPimXRefPartner& par ) {
+    if ( m_app != par.m_app ) return false;
+    if ( m_uid != par.m_uid ) return false;
+    if ( m_field != par.m_field ) return false;
+
+    return true;
+}
+QString OPimXRefPartner::appName()const {
+    return m_app;
+}
+int OPimXRefPartner::uid()const {
+    return m_uid;
+}
+int OPimXRefPartner::field()const {
+    return m_field;
+}
+void OPimXRefPartner::setAppName( const QString& appName ) {
+    m_app = appName;
+}
+void OPimXRefPartner::setUid( int uid ) {
+    m_uid = uid;
+}
+void OPimXRefPartner::setField( int field ) {
+    m_field = field;
+}