Backing out unintentional merge from TT branch.

9 files changed, 182 insertions, 157 deletions

diff --git a/library/backend/categories.cpp b/library/backend/categories.cpp
index 91331db..6e011c4 100644
--- a/library/backend/categories.cpp
+++ b/library/backend/categories.cpp
@@ -166,46 +166,16 @@ QStringList CategoryGroup::labels(const QArray<int> &catids ) const
         return labels;
     for ( QMap<int, QString>::ConstIterator it = mIdLabelMap.begin();
           it != mIdLabelMap.end(); ++it )
         if ( catids.find( it.key() ) != -1 )
             labels += *it;
     return labels;
 }
 
-QArray<int> CategoryGroup::ids( const QStringList &cats ) const
-{
-    QArray<int> results;
-
-    for ( QStringList::ConstIterator catIt = cats.begin();
-          catIt != cats.end(); ++catIt ) {
-        if ( *catIt == QObject::tr("All") || *catIt == QObject::tr("Unfiled") )
-            continue;
-        int value = id( *catIt );
-        if ( value != 0 ) {
-            int tmp = results.size();
-            results.resize( tmp + 1 );
-            results[ tmp ] = value;
-        }
-    }
-
-    return results;
-}
-
-QArray<int> CategoryGroup::ids() const
-{
-    QArray<int> results( mIdLabelMap.count() );
-    int i = 0;
-    for ( QMap<int, QString>::ConstIterator it = mIdLabelMap.begin();
-          it != mIdLabelMap.end(); ++it )
-        results[i++] = it.key();
-
-    return results;
-}
-
 /***********************************************************
  *
  * Categories
  *
  **********************************************************/
 
 /** Add the category name as long as it doesn't already exist locally
  *  or globally.  Return TRUE if added, FALSE if conflicts.
@@ -338,59 +308,52 @@ bool Categories::removeGlobalCategory( int uid )
  */
 QStringList Categories::labels( const QString &app,
                                 bool includeGlobal,
                                 ExtraLabels extra ) const
 {
     QMap< QString, CategoryGroup >::ConstIterator
         appIt = mAppCats.find( app );
     QStringList cats;
+
+    if ( appIt != mAppCats.end() )
+        cats += (*appIt).labels();
+    else qDebug("Categories::labels didn't find app %s", app.latin1() );
+    if ( includeGlobal )
+        cats += mGlobalCats.labels();
+
+    cats.sort();
     switch ( extra ) {
     case NoExtra: break;
     case AllUnfiled:
         cats.append( tr("All") );
         cats.append( tr("Unfiled") );
         break;
     case AllLabel:
         cats.append( tr("All") );
         break;
     case UnfiledLabel:
         cats.append( tr("Unfiled") );
         break;
     }
-    if ( appIt != mAppCats.end() )
-        cats += (*appIt).labels();
-    else qDebug("Categories::labels didn't find app %s", app.latin1() );
-    if ( includeGlobal )
-        cats += mGlobalCats.labels();
-    // I don't think a sorted list is useful, the user might find prefer
-    // it in the original order.
-//     cats.sort();
+
     return cats;
 }
 
 QString Categories::label( const QString &app, int id ) const
 {
     if ( mGlobalCats.contains( id ) )
         return mGlobalCats.label( id );
     QMap< QString, CategoryGroup >::ConstIterator
         appIt = mAppCats.find( app );
     if ( appIt == mAppCats.end() )
         return QString::null;
     return (*appIt).label( id );
 }
 
-QStringList Categories::labels( const QString & app,
-                                const QArray<int> &catids ) const
-{
-    QStringList strs = mGlobalCats.labels( catids );
-    strs += mAppCats[app].labels( catids );
-    return strs;
-}
-
 /** Returns a single string associated with the cat ids for display in
     *   a combobox or any area that requires one string.  If catids are empty
     *   then "Unfiled" will be returned.  If multiple categories are assigned
     *   the first cat id is shown with " (multi)" appended to the string.
     */
 QString Categories::displaySingle( const QString &app,
                                    const QArray<int> &catids,
                                    DisplaySingle display ) const
@@ -412,43 +375,31 @@ QString Categories::displaySingle( const QString &app,
             r = strs.join(" ");
             break;
         }
     }
             else r = strs.first(); 
     return r;
 }
 
-QArray<int> Categories::ids( const QString &app ) const
-{
-    QArray<int> allIds = mGlobalCats.ids();
-    QArray<int> appIds = mAppCats[app].ids();
-
-    // we should make the guarentee that the ids are in the
-    // same order as the labels, (i.e. app cats then global)
-    // otherwise there is no point in having these two separate functions.
-    uint appSize = appIds.size();
-    appIds.resize( appSize + allIds.size() );
-    for ( uint i = appSize; i < appIds.size(); ++i )
-        appIds[int(i)] = allIds[int(i - appSize)];
-
-    return appIds;
-}
-
-QArray<int> Categories::ids( const QString &app, const QStringList &cats ) const
+QArray<int> Categories::ids( const QString &app, const QStringList &labels) const
 {
-    QArray<int> allIds = mGlobalCats.ids( cats );
-    QArray<int> appIds = mAppCats[app].ids( cats );
-
-    uint appSize = appIds.size();
-    appIds.resize( appSize + allIds.size() );
-    for ( uint i = appSize; i < appIds.size(); ++i )
-        appIds[int(i)] = allIds[int(i - appSize)];
-
-    return appIds;
+  QArray<int> results;
+  QStringList::ConstIterator it;
+  int i;
+  
+  for ( i=0, it=labels.begin(); it!=labels.end(); i++, ++it ) {
+    int value = id( app, *it );
+    if ( value != 0 ) {
+      int tmp = results.size();
+      results.resize( tmp + 1 );
+      results[ tmp ] = value;
+    }
+  }
+  return results;
 }
 
 int Categories::id( const QString &app, const QString &cat ) const
 {
     if ( cat == tr("Unfiled") || cat.contains( tr(" (multi.)") ) )
         return 0;
     int uid = mGlobalCats.id( cat );
     if ( uid != 0 )
@@ -534,55 +485,80 @@ bool Categories::exists( const QString &appname,
         appIt = mAppCats.find( appname );
 
     if ( appIt == mAppCats.end() )
         return FALSE;
 
     return (*appIt).contains( catname );
 }
 
+
 bool Categories::save( const QString &fname ) const
 {
-    QFile file( fname );
-    if ( !file.open( IO_WriteOnly ) ) {
+    QString strNewFile = fname + ".new";
+    QFile f( strNewFile );
+    QString out;
+    int total_written;
+
+    if ( !f.open( IO_WriteOnly|IO_Raw ) ) {
         qWarning("Unable to write to %s", fname.latin1());
         return FALSE;
     }
 
-    QTextStream ts( &file );
-    ts << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    ts << "<!DOCTYPE CategoryList>" << endl;
+    out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    out += "<!DOCTYPE CategoryList>\n";
+
+    out += "<Categories>\n";
 
-    ts << "<Categories>" << endl;
     for ( QMap<int, QString>::ConstIterator git = mGlobalCats.idMap().begin();
           git != mGlobalCats.idMap().end(); ++git )
-        ts << "<Category id=\"" << git.key() << "\""
-           << " name=\"" << escapeString(*git) << "\" />" << endl;
+        out += "<Category id=\"" + QString::number(git.key()) + "\"" +
+          " name=\"" + escapeString(*git) + "\" />\n";
 
     for ( QMap<QString, CategoryGroup>::ConstIterator appsIt=mAppCats.begin();
           appsIt != mAppCats.end(); ++appsIt ) {
         const QString &app = appsIt.key();
         const QMap<int, QString> &appcats = (*appsIt).idMap();
         for ( QMap<int, QString>::ConstIterator appcatit = appcats.begin();
               appcatit != appcats.end(); ++appcatit )
-            ts << "<Category id=\"" << appcatit.key() << "\""
-               << " app=\"" << escapeString(app) << "\""
-               << " name=\"" << escapeString(*appcatit) << "\" />" << endl;
+            out += "<Category id=\"" + QString::number(appcatit.key()) + "\"" +
+              " app=\"" + escapeString(app) + "\"" +
+              " name=\"" + escapeString(*appcatit) + "\" />\n";
+    }
+    out += "</Categories>\n";
+
+    QCString cstr = out.utf8();
+    total_written = f.writeBlock( cstr.data(), cstr.length() );
+    if ( total_written != int(cstr.length()) ) {
+        f.close();
+         QFile::remove( strNewFile );
+         return FALSE;
+    }
+    f.close();
+
+    if ( ::rename( strNewFile.latin1(), fname.latin1() ) < 0 ) {
+        qWarning( "problem renaming file %s to %s",
+                  strNewFile.latin1(), fname.latin1());
+        // remove the tmp file...
+        QFile::remove( strNewFile );
     }
-    ts << "</Categories>" << endl;
 
-    file.close();
     return TRUE;
 }
 
 bool Categories::load( const QString &fname )
 {
     QFile file( fname );
     if ( !file.open( IO_ReadOnly ) ) {
         qWarning("Unable to open %s", fname.latin1());
+
+        addGlobalCategory(tr("Business"));
+        addGlobalCategory(tr("Personal"));
+        save(fname);
+
         return FALSE;
     }
 
     clear();
     QByteArray ba = file.readAll();
     QString data = QString::fromUtf8( ba.data(), ba.size() );
     QChar *uc = (QChar *)data.unicode();
     int len = data.length();
diff --git a/library/backend/categories.h b/library/backend/categories.h
index 82d765b..ba65ee3 100644
--- a/library/backend/categories.h
+++ b/library/backend/categories.h
@@ -66,18 +66,17 @@ public:
     *   not found
     */
     const QString &label(int id) const;
     /** Returns the uid associated with label or 0 if not found */
     int id(const QString &label) const;
 
     /** Returns a sorted list of labels */
     QStringList labels() const;
-    QArray<int> ids( const QStringList &cats ) const;
-    QArray<int> ids() const;
+
     QStringList labels( const QArray<int> &catids ) const;
 
     const QMap<int, QString> &idMap() const { return mIdLabelMap; }
 
 private:
     void insert( int uid, const QString &label );
     QMap<int, QString> mIdLabelMap;
     QMap<QString, int> mLabelIdMap;
@@ -125,19 +124,18 @@ public:
     *   in the application, then it removes it from the global list
     */
     bool removeCategory( const QString &appName, const QString &catName,
                          bool checkGlobal = TRUE);
     bool removeCategory( const QString &appName, int uid );
     bool removeGlobalCategory( const QString &catName );
     bool removeGlobalCategory( int uid );
 
-    QArray<int> ids( const QString &app ) const;
-    QArray<int> ids( const QString &app,
-                     const QStringList &cats ) const;
+    QArray<int> ids( const QString &app, const QStringList &labels) const;
+
     /** Returns the id associated with the app */
     int id( const QString &app, const QString &cat ) const;
     /** Returns the label associated with the id */
     QString label( const QString &app, int id ) const;
 
     enum ExtraLabels { NoExtra, AllUnfiled, AllLabel, UnfiledLabel };
     /** Returns the sorted list of all categories that are
     *   associated with the app.
@@ -148,20 +146,16 @@ public:
     *   the list
     *   If extra = AllLabel, then All is prepended
     *   If extra = UnfiledLabel, then Unfiled is prepended
     */
     QStringList labels( const QString &app,
                         bool includeGlobal = TRUE,
                         ExtraLabels extra = NoExtra ) const;
 
-    /** Returns the labels of the categories associated with the uids */
-    QStringList labels( const QString & app,
-                        const QArray<int> &catids ) const;
-
     enum DisplaySingle { ShowMulti, ShowAll, ShowFirst };
 
     /** Returns a single string associated with the cat ids for display in
     *   a combobox or any area that requires one string.  If catids are empty
     *   then "Unfiled" will be returned.  If multiple categories are assigned
     *   then the behavior depends on the DisplaySingle type.
     *   If /a display is set to ShowMulti then  " (multi)" appended to the
     *   first string. If /a display is set to ShowAll, then a space seperated
diff --git a/library/backend/contact.cpp b/library/backend/contact.cpp
index a5f10ab..b10b19a 100644
--- a/library/backend/contact.cpp
+++ b/library/backend/contact.cpp
@@ -13,19 +13,21 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_CONTACT_MRE
+
 #include "contact.h"
-#include "vobject_p.h"

-#include "qfiledirect_p.h"

+#include "vobject_p.h"
+#include "qfiledirect_p.h"
 
 #include <qpe/stringutil.h>
 #include <qpe/timeconversion.h>
 
 #include <qobject.h>
 #include <qregexp.h>
 #include <qstylesheet.h>
 #include <qfileinfo.h>
@@ -381,109 +383,117 @@ QStringList Contact::fields()
 
     list.append( "Title" );  // Not Used!
     list.append( "FirstName" );
     list.append( "MiddleName" );
     list.append( "LastName" );
     list.append( "Suffix" );
     list.append( "FileAs" );
 
+    list.append( "JobTitle" );
+    list.append( "Department" );
+    list.append( "Company" );
+    list.append( "BusinessPhone" );
+    list.append( "BusinessFax" );
+    list.append( "BusinessMobile" );
+
     list.append( "DefaultEmail" );
     list.append( "Emails" );
 
-    list.append( "HomeStreet" );
-    list.append( "HomeCity" );
-    list.append( "HomeState" );
-    list.append( "HomeZip" );
-    list.append( "HomeCountry" );
     list.append( "HomePhone" );
     list.append( "HomeFax" );
     list.append( "HomeMobile" );
-    list.append( "HomeWebPage" );
 
-    list.append( "Company" );
     list.append( "BusinessStreet" );
     list.append( "BusinessCity" );
     list.append( "BusinessState" );
     list.append( "BusinessZip" );
     list.append( "BusinessCountry" );
+    list.append( "BusinessPager" );
     list.append( "BusinessWebPage" );
-    list.append( "JobTitle" );
-    list.append( "Department" );
+
     list.append( "Office" );
-    list.append( "BusinessPhone" );
-    list.append( "BusinessFax" );
-    list.append( "BusinessMobile" );
-    list.append( "BusinessPager" );
     list.append( "Profession" );
     list.append( "Assistant" );
     list.append( "Manager" );
 
+    list.append( "HomeStreet" );
+    list.append( "HomeCity" );
+    list.append( "HomeState" );
+    list.append( "HomeZip" );
+    list.append( "HomeCountry" );
+    list.append( "HomeWebPage" );
+
     list.append( "Spouse" );
     list.append( "Gender" );
     list.append( "Birthday" );
     list.append( "Anniversary" );
     list.append( "Nickname" );
-
     list.append( "Children" );
+
     list.append( "Notes" );
+    list.append( "Groups" );
 
     return list;
 }
 
 QStringList Contact::trfields()
 {
     QStringList list;
 
     list.append( QObject::tr( "Name Title") );
     list.append( QObject::tr( "First Name" ) );
     list.append( QObject::tr( "Middle Name" ) );
     list.append( QObject::tr( "Last Name" ) );
     list.append( QObject::tr( "Suffix" ) );
     list.append( QObject::tr( "File As" ) );
 
+    list.append( QObject::tr( "Job Title" ) );
+    list.append( QObject::tr( "Department" ) );
+    list.append( QObject::tr( "Company" ) );
+    list.append( QObject::tr( "Business Phone" ) );
+    list.append( QObject::tr( "Business Fax" ) );
+    list.append( QObject::tr( "Business Mobile" ) );
+
     list.append( QObject::tr( "Default Email" ) );
     list.append( QObject::tr( "Emails" ) );
 
-    list.append( QObject::tr( "Home Street" ) );
-    list.append( QObject::tr( "Home City" ) );
-    list.append( QObject::tr( "Home State" ) );
-    list.append( QObject::tr( "Home Zip" ) );
-    list.append( QObject::tr( "Home Country" ) );
     list.append( QObject::tr( "Home Phone" ) );
     list.append( QObject::tr( "Home Fax" ) );
     list.append( QObject::tr( "Home Mobile" ) );
-    list.append( QObject::tr( "Home Web Page" ) );
 
-    list.append( QObject::tr( "Company" ) );
     list.append( QObject::tr( "Business Street" ) );
     list.append( QObject::tr( "Business City" ) );
     list.append( QObject::tr( "Business State" ) );
     list.append( QObject::tr( "Business Zip" ) );
     list.append( QObject::tr( "Business Country" ) );
+    list.append( QObject::tr( "Business Pager" ) );
     list.append( QObject::tr( "Business WebPage" ) );
-    list.append( QObject::tr( "Job Title" ) );
-    list.append( QObject::tr( "Department" ) );
+
     list.append( QObject::tr( "Office" ) );
-    list.append( QObject::tr( "Business Phone" ) );
-    list.append( QObject::tr( "Business Fax" ) );
-    list.append( QObject::tr( "Business Mobile" ) );
-    list.append( QObject::tr( "Business Pager" ) );
     list.append( QObject::tr( "Profession" ) );
     list.append( QObject::tr( "Assistant" ) );
     list.append( QObject::tr( "Manager" ) );
 
+    list.append( QObject::tr( "Home Street" ) );
+    list.append( QObject::tr( "Home City" ) );
+    list.append( QObject::tr( "Home State" ) );
+    list.append( QObject::tr( "Home Zip" ) );
+    list.append( QObject::tr( "Home Country" ) );
+    list.append( QObject::tr( "Home Web Page" ) );
+
     list.append( QObject::tr( "Spouse" ) );
     list.append( QObject::tr( "Gender" ) );
     list.append( QObject::tr( "Birthday" ) );
     list.append( QObject::tr( "Anniversary" ) );
     list.append( QObject::tr( "Nickname" ) );
-
     list.append( QObject::tr( "Children" ) );
+
     list.append( QObject::tr( "Notes" ) );
+    list.append( QObject::tr( "Groups" ) );
 
     return list;
 }
 
 void Contact::setEmails( const QString &v )
 {
     replace( Qtopia::Emails, v );
     if ( v.isEmpty() )
@@ -624,17 +634,17 @@ static Contact parseVObject( VObject *obj )
         VObject *o = nextVObject( &it );
         QCString name = vObjectName( o );
         QCString value = vObjectStringZValue( o );
         if ( name == VCNameProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
-                QCString name = vObjectName( o );
+                QCString name = vObjectTypeInfo( o );
                 QString value = vObjectStringZValue( o );
                 if ( name == VCNamePrefixesProp )
                     c.setTitle( value );
                 else if ( name == VCNameSuffixesProp )
                     c.setSuffix( value );
                 else if ( name == VCFamilyNameProp )
                     c.setLastName( value );
                 else if ( name == VCGivenNameProp )
@@ -697,17 +707,17 @@ static Contact parseVObject( VObject *obj )
                 UNKNOWN = 0x80
             };
             int type = 0;
 
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
-                QCString name = vObjectName( o );
+                QCString name = vObjectTypeInfo( o );
                 if ( name == VCHomeProp )
                     type |= HOME;
                 else if ( name == VCWorkProp )
                     type |= WORK;
                 else if ( name == VCVoiceProp )
                     type |= VOICE;
                 else if ( name == VCCellularProp )
                     type |= CELL;
@@ -744,17 +754,17 @@ static Contact parseVObject( VObject *obj )
         }
         else if ( name == VCEmailAddressProp ) {
             QString email = vObjectStringZValue( o );
             bool valid = TRUE;
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
-                QCString name = vObjectName( o );
+                QCString name = vObjectTypeInfo( o );
                 if ( name != VCInternetProp && name != VCHomeProp &&
                      name != VCWorkProp &&
                      name != VCPreferredProp )
                     // ### preffered should map to default email
                     valid = FALSE;
             }
             if ( valid ) {
                 if ( haveDefaultEmail ) {
@@ -767,17 +777,17 @@ static Contact parseVObject( VObject *obj )
                 }
             }
         }
         else if ( name == VCURLProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
-                QCString name = vObjectName( o );
+                QCString name = vObjectTypeInfo( o );
                 if ( name == VCHomeProp )
                     c.setHomeWebpage( value );
                 else if ( name == VCWorkProp )
                     c.setBusinessWebpage( value );
             }
         }
         else if ( name == VCOrgProp ) {
             VObjectIterator nit;
@@ -837,39 +847,39 @@ static Contact parseVObject( VObject *obj )
         }
 #endif
     }
     c.setFileAs();
     return c;
 }
 
 void Contact::writeVCard( const QString &filename, const QValueList<Contact> &contacts)
-{

-        QFileDirect f( filename.utf8().data() );

-        if ( !f.open( IO_WriteOnly ) ) {

-                qWarning("Unable to open vcard write");

-                return;

-        }

+{
+        QFileDirect f( filename.utf8().data() );
+        if ( !f.open( IO_WriteOnly ) ) {
+                qWarning("Unable to open vcard write");
+                return;
+        }
 
     QValueList<Contact>::ConstIterator it;
     for( it = contacts.begin(); it != contacts.end(); ++it ) {
         VObject *obj = createVObject( *it );
         writeVObject(f.directHandle() , obj );
         cleanVObject( obj );
     }
     cleanStrTbl();
 }
 
 void Contact::writeVCard( const QString &filename, const Contact &contact)
-{

-        QFileDirect f( filename.utf8().data() );

-        if ( !f.open( IO_WriteOnly ) ) {

-                qWarning("Unable to open vcard write");

-                return;

-        }

+{
+        QFileDirect f( filename.utf8().data() );
+        if ( !f.open( IO_WriteOnly ) ) {
+                qWarning("Unable to open vcard write");
+                return;
+        }
 
     VObject *obj = createVObject( contact );
         writeVObject( f.directHandle() , obj );
         cleanVObject( obj );
 
         cleanStrTbl();
 }
 
@@ -889,16 +899,21 @@ QValueList<Contact> Contact::readVCard( const QString &filename )
         VObject *t = obj;
         obj = nextVObjectInList(obj);
         cleanVObject( t );
     }
 
     return contacts;
 }
 
+bool Contact::match( const QString &regexp ) const
+{
+    return match(QRegExp(regexp));
+}
+
 bool Contact::match( const QRegExp &r ) const
 {
     bool match;
     match = false;
     QMap<int, QString>::ConstIterator it;
     for ( it = mMap.begin(); it != mMap.end(); ++it ) {
         if ( (*it).find( r ) > -1 ) {
             match = true;
diff --git a/library/backend/contact.h b/library/backend/contact.h
index 6abdab6..a74cbbe 100644
--- a/library/backend/contact.h
+++ b/library/backend/contact.h
@@ -96,17 +96,22 @@ public:
     void setBirthday( const QString &v ) { replace( Qtopia::Birthday, v ); }
     void setAnniversary( const QString &v ) { replace( Qtopia::Anniversary, v ); }
     void setNickname( const QString &v ) { replace( Qtopia::Nickname, v ); }
     void setChildren( const QString &v );
 
     // other
     void setNotes( const QString &v ) { replace( Qtopia::Notes, v); }
 
-    bool match( const QRegExp &r ) const;
+    bool match( const QString &regexp ) const;
+
+// DON'T ATTEMPT TO USE THIS
+#ifdef QTOPIA_INTERNAL_CONTACT_MRE
+    bool match( const QRegExp &regexp ) const;
+#endif
 
 //     // custom
 //     void setCustomField( const QString &key, const QString &v )
 //         { replace(Custom- + key, v ); }
 
     // name
     QString fullName() const;
     QString title() const { return find( Qtopia::Title ); }
diff --git a/library/backend/event.h b/library/backend/event.h
index 0ebe9ea..277aadd 100644
--- a/library/backend/event.h
+++ b/library/backend/event.h
@@ -135,17 +135,22 @@ private:
     bool endTimeDirty : 1;
     time_t startUTC, endUTC;
     QString tz;
     bool hAlarm, hRepeat;
     int aMinutes;
     SoundTypeChoice aSound;
     RepeatPattern pattern;
     QString note;
+    // ADDITION
+            int mRid;// Recode ID
+            int mRinfo;// Recode Info
+    //
     EventPrivate *d;
+
 };
 
 // Since an event spans multiple day, it is better to have this
 // class to represent a day instead of creating many
 // dummy events...
 
 class EffectiveEventPrivate;
 class QPC_EXPORT EffectiveEvent
diff --git a/library/backend/recordfields.h b/library/backend/recordfields.h
index 3cddde2..4196c8b 100644
--- a/library/backend/recordfields.h
+++ b/library/backend/recordfields.h
@@ -26,81 +26,92 @@
 namespace Qtopia
 {
     static const int UID_ID = 0;
     static const int CATEGORY_ID = 1;
 
     enum AddressBookFields {
                 AddressUid = UID_ID,
         AddressCategory = CATEGORY_ID,
-        
+
+        // NOTE: Order of fields dependency in backend/contact.cpp
+
         Title,
         FirstName,
         MiddleName,
         LastName,
         Suffix,
         FileAs,
 
+        JobTitle,
+        Department,
+        Company,
+        BusinessPhone,
+        BusinessFax,
+        BusinessMobile,
+
         // email
         DefaultEmail,
         Emails,
 
-        // home
-        HomeStreet,
-        HomeCity,
-        HomeState,
-        HomeZip,
-        HomeCountry,
         HomePhone,
         HomeFax,
         HomeMobile,
-        HomeWebPage,
 
         // business
-        Company,
         BusinessStreet,
         BusinessCity,
         BusinessState,
         BusinessZip,
         BusinessCountry,
+        BusinessPager,
         BusinessWebPage,
-        JobTitle,
-        Department,
+
         Office,
-        BusinessPhone,
-        BusinessFax,
-        BusinessMobile,
-        BusinessPager,
         Profession,
         Assistant,
         Manager,
 
+        // home
+        HomeStreet,
+        HomeCity,
+        HomeState,
+        HomeZip,
+        HomeCountry,
+        HomeWebPage,
+
         //personal
         Spouse,
         Gender,
         Birthday,
         Anniversary,
         Nickname,
         Children,
 
         // other
         Notes,
         Groups
+
+        ,rid,
+        rinfo
     };
 
     // dataset = "todolist"
     enum TaskFields {
         TaskUid = UID_ID,
         TaskCategory = CATEGORY_ID,
         
         HasDate,
         Completed,
         TaskDescription,
         Priority,
-                Date
+        Date,
+
+        TaskRid,
+        TaskRinfo
     };
 
     // dataset = "categories" for todos
     enum CategoryFields {
         CatUid = UID_ID,
         CatName,
         CatAppGroup
     };
@@ -123,13 +134,16 @@ namespace Qtopia
         AlarmTime,
 
         RepeatPatternType,
         RepeatPatternFrequency,
         RepeatPatternPosition,
         RepeatPatternDays,
         RepeatPatternHasEndDate,
                 RepeatPatternEndDate,
+
+        DateBookRid,
+        DateBookRinfo
     };
 };
 
 
 #endif
diff --git a/library/backend/task.h b/library/backend/task.h
index ffe26b0..6f383b8 100644
--- a/library/backend/task.h
+++ b/library/backend/task.h
@@ -67,11 +67,15 @@ private:
     static Qtopia::UidGen sUidGen;
 
     bool mDue;
     QDate mDueDate;
     bool mCompleted;
     int mPriority;
     QString mDesc;
     TaskPrivate *d;
+    // ADDITION
+    int recordId;
+    int recordInfo;
+    //
 };
 
 #endif
diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index af112a7..9c2ba3b 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -1202,9 +1202,18 @@ DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)
         }

 

         while (list) {

             writeVObject(f.directHandle(),list);

             list = nextVObjectInList(list);

             }

 }

 

+DLLEXPORT(const char *) vObjectTypeInfo(VObject *o)

+{

+    const char *type = vObjectName( o );

+    if ( strcmp( type, "TYPE" ) == 0 )

+        type = vObjectStringZValue( o );

+    return type;

+}

+

+

 // end of source file vobject.c

diff --git a/library/backend/vobject_p.h b/library/backend/vobject_p.h
index b6a2c0a..a0d921e 100644
--- a/library/backend/vobject_p.h
+++ b/library/backend/vobject_p.h
@@ -391,11 +391,14 @@ will get a link error.
 

 

 #if INCLUDEMFC

 extern VObject* Parse_MIME_FromFile(CFile *file);

 #else

 extern VObject* Parse_MIME_FromFile(FILE *file);

 #endif

 

+extern DLLEXPORT(const char *) vObjectTypeInfo(VObject *o);

+

+

 #endif /* __VOBJECT_H__ */