Oh OContact what a sucker ;)

first of all UID generation belongs to OPimRecord
and was removed from OContact
then setUid now actually calls OPimRecord::setUid instead
of Record::setUid
This finally fixes the problem with wrong uids
after beaming... At least locally on my machine

3 files changed, 4 insertions, 9 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index cd238ef..8a0930b 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -43,17 +43,16 @@
 
   This data includes information the name of the person, contact
   information, and business information such as deparment and job title.
 
   \ingroup qtopiaemb
   \ingroup qtopiadesktop
 */
 
-Qtopia::UidGen OContact::sUidGen( Qtopia::UidGen::Qtopia );
 
 /*!
   Creates a new, empty contact.
 */
 OContact::OContact()
     : OPimRecord(), mMap(), d( 0 )
 {
 }
@@ -1465,18 +1464,20 @@ QValueList<OContact> OContact::readVCard( const QString &filename )
 
     while ( obj ) {
         OContact con = parseVObject( obj );
         /*
          * if uid is 0 assign a new one
          * this at least happens on
          * Nokia6210
          */
-        if ( con.uid() == 0 )
+        if ( con.uid() == 0 ){
             con.setUid( 1 );
+            qWarning("assigned new uid %d",con.uid() );
+        }
 
         contacts.append(con  );
 
         VObject *t = obj;
         obj = nextVObjectInList(obj);
         cleanVObject( t );
     }
 
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index 038a59f..81ac1c1 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/ocontact.h
@@ -195,17 +195,17 @@ public:
     QString field( int key ) const { return find( key ); }
 
 
     // journaling...
     void saveJournal( journal_action action, const QString &key = QString::null );
     void save( QString &buf ) const;
 
     void setUid( int i )
-{ Record::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); }
+{ OPimRecord::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); }
 
     QString toShortText()const;
     QString OContact::type()const;
     QMap<QString,QString> OContact::toExtraMap() const;
     class QString OContact::recordField(int) const;
 
     // Why private ? (eilers,se)
     QString emailSeparator() const { return " "; }
@@ -225,18 +225,14 @@ private:
     QString find( int key ) const;
 
     QString displayAddress( const QString &street,
                             const QString &city,
                             const QString &state,
                             const QString &zip,
                             const QString &country ) const;
 
-    Qtopia::UidGen &uidGen() { return sUidGen; }
-
-
-    static Qtopia::UidGen sUidGen;
     QMap<int, QString> mMap;
     ContactPrivate *d;
 };
 
 
 #endif
diff --git a/libopie/pim/opimrecord.cpp b/libopie/pim/opimrecord.cpp
index 62dc353..21cf131 100644
--- a/libopie/pim/opimrecord.cpp
+++ b/libopie/pim/opimrecord.cpp
@@ -117,18 +117,16 @@ QString OPimRecord::crossToString()const {
     }
     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 ) {
-//    qWarning("setting uid" );
     if ( uid == 1)
         uid = uidGen().generate();
 
-//    qWarning(" uid %d",  uid);
     Qtopia::Record::setUid( uid );
 };
 Qtopia::UidGen &OPimRecord::uidGen() {
     return m_uidGen;
 }