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
@@ -173,32 +173,2 @@ QStringList CategoryGroup::labels(const QArray<int> &catids ) const
 
-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;
-}
-
 /***********************************************************
@@ -345,2 +315,10 @@ QStringList Categories::labels( const QString &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 ) {
@@ -358,10 +336,3 @@ QStringList Categories::labels( const QString &app,
     }
-    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;
@@ -380,10 +351,2 @@ QString Categories::label( const QString &app, int id ) const
 
-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
@@ -419,29 +382,17 @@ QString Categories::displaySingle( const QString &app,
 
-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;
 }
@@ -541,6 +492,11 @@ bool Categories::exists( const QString &appname,
 
+
 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());
@@ -549,11 +505,11 @@ bool Categories::save( const QString &fname ) const
 
-    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";
 
@@ -565,9 +521,24 @@ bool Categories::save( const QString &fname ) const
 	      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;
@@ -580,2 +551,7 @@ bool Categories::load( const QString &fname )
 	qWarning("Unable to open %s", fname.latin1());
+
+	addGlobalCategory(tr("Business"));
+	addGlobalCategory(tr("Personal"));
+	save(fname);
+
 	return FALSE;
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
@@ -73,4 +73,3 @@ public:
     QStringList labels() const;
-    QArray<int> ids( const QStringList &cats ) const;
-    QArray<int> ids() const;
+
     QStringList labels( const QArray<int> &catids ) const;
@@ -132,5 +131,4 @@ public:
 
-    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 */
@@ -155,6 +153,2 @@ public:
 
-    /** 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 };
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
@@ -20,5 +20,7 @@
 
+#define QTOPIA_INTERNAL_CONTACT_MRE
+
 #include "contact.h"
-#include "vobject_p.h"

-#include "qfiledirect_p.h"

+#include "vobject_p.h"
+#include "qfiledirect_p.h"
 
@@ -388,2 +390,9 @@ QStringList Contact::fields()
 
+    list.append( "JobTitle" );
+    list.append( "Department" );
+    list.append( "Company" );
+    list.append( "BusinessPhone" );
+    list.append( "BusinessFax" );
+    list.append( "BusinessMobile" );
+
     list.append( "DefaultEmail" );
@@ -391,7 +400,2 @@ QStringList Contact::fields()
 
-    list.append( "HomeStreet" );
-    list.append( "HomeCity" );
-    list.append( "HomeState" );
-    list.append( "HomeZip" );
-    list.append( "HomeCountry" );
     list.append( "HomePhone" );
@@ -399,5 +403,3 @@ QStringList Contact::fields()
     list.append( "HomeMobile" );
-    list.append( "HomeWebPage" );
 
-    list.append( "Company" );
     list.append( "BusinessStreet" );
@@ -407,10 +409,6 @@ QStringList Contact::fields()
     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" );
@@ -419,2 +417,9 @@ QStringList Contact::fields()
 
+    list.append( "HomeStreet" );
+    list.append( "HomeCity" );
+    list.append( "HomeState" );
+    list.append( "HomeZip" );
+    list.append( "HomeCountry" );
+    list.append( "HomeWebPage" );
+
     list.append( "Spouse" );
@@ -424,5 +429,6 @@ QStringList Contact::fields()
     list.append( "Nickname" );
-
     list.append( "Children" );
+
     list.append( "Notes" );
+    list.append( "Groups" );
 
@@ -442,2 +448,9 @@ QStringList Contact::trfields()
 
+    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" ) );
@@ -445,7 +458,2 @@ QStringList Contact::trfields()
 
-    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" ) );
@@ -453,5 +461,3 @@ QStringList Contact::trfields()
     list.append( QObject::tr( "Home Mobile" ) );
-    list.append( QObject::tr( "Home Web Page" ) );
 
-    list.append( QObject::tr( "Company" ) );
     list.append( QObject::tr( "Business Street" ) );
@@ -461,10 +467,6 @@ QStringList Contact::trfields()
     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" ) );
@@ -473,2 +475,9 @@ QStringList Contact::trfields()
 
+    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" ) );
@@ -478,5 +487,6 @@ QStringList Contact::trfields()
     list.append( QObject::tr( "Nickname" ) );
-
     list.append( QObject::tr( "Children" ) );
+
     list.append( QObject::tr( "Notes" ) );
+    list.append( QObject::tr( "Groups" ) );
 
@@ -631,3 +641,3 @@ static Contact parseVObject( VObject *obj )
 		VObject *o = nextVObject( &nit );
-		QCString name = vObjectName( o );
+		QCString name = vObjectTypeInfo( o );
 		QString value = vObjectStringZValue( o );
@@ -704,3 +714,3 @@ static Contact parseVObject( VObject *obj )
 		VObject *o = nextVObject( &nit );
-		QCString name = vObjectName( o );
+		QCString name = vObjectTypeInfo( o );
 		if ( name == VCHomeProp )
@@ -751,3 +761,3 @@ static Contact parseVObject( VObject *obj )
 		VObject *o = nextVObject( &nit );
-		QCString name = vObjectName( o );
+		QCString name = vObjectTypeInfo( o );
 		if ( name != VCInternetProp && name != VCHomeProp &&
@@ -774,3 +784,3 @@ static Contact parseVObject( VObject *obj )
 		VObject *o = nextVObject( &nit );
-		QCString name = vObjectName( o );
+		QCString name = vObjectTypeInfo( o );
 		if ( name == VCHomeProp )
@@ -844,8 +854,8 @@ static Contact parseVObject( VObject *obj )
 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;
+	}
 
@@ -861,8 +871,8 @@ void Contact::writeVCard( const QString &filename, const QValueList<Contact> &co
 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;
+	}
 
@@ -896,2 +906,7 @@ QValueList<Contact> Contact::readVCard( const QString &filename )
 
+bool Contact::match( const QString &regexp ) const
+{
+    return match(QRegExp(regexp));
+}
+
 bool Contact::match( const QRegExp &r ) const
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
@@ -103,3 +103,8 @@ public:
 
-    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
 
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
@@ -142,3 +142,8 @@ private:
     QString note;
+    // ADDITION
+    int mRid;	// Recode ID
+    int mRinfo;	// Recode Info
+    //
     EventPrivate *d;
+
 };
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
@@ -33,3 +33,5 @@ namespace Qtopia
 	AddressCategory = CATEGORY_ID,
-	
+
+	// NOTE: Order of fields dependency in backend/contact.cpp
+
 	Title,
@@ -41,2 +43,9 @@ namespace Qtopia
 
+	JobTitle,
+	Department,
+	Company,
+	BusinessPhone,
+	BusinessFax,
+	BusinessMobile,
+
 	// email
@@ -45,8 +54,2 @@ namespace Qtopia
 
-	// home
-	HomeStreet,
-	HomeCity,
-	HomeState,
-	HomeZip,
-	HomeCountry,
 	HomePhone,
@@ -54,6 +57,4 @@ namespace Qtopia
 	HomeMobile,
-	HomeWebPage,
 
 	// business
-	Company,
 	BusinessStreet,
@@ -63,10 +64,6 @@ namespace Qtopia
 	BusinessCountry,
+	BusinessPager,
 	BusinessWebPage,
-	JobTitle,
-	Department,
+
 	Office,
-	BusinessPhone,
-	BusinessFax,
-	BusinessMobile,
-	BusinessPager,
 	Profession,
@@ -75,2 +72,10 @@ namespace Qtopia
 
+	// home
+	HomeStreet,
+	HomeCity,
+	HomeState,
+	HomeZip,
+	HomeCountry,
+	HomeWebPage,
+
 	//personal
@@ -86,2 +91,5 @@ namespace Qtopia
 	Groups
+
+	,rid,
+	rinfo
     };
@@ -97,3 +105,6 @@ namespace Qtopia
 	Priority,
-	Date	
+	Date,
+
+	TaskRid,
+	TaskRinfo
     };
@@ -130,2 +141,5 @@ namespace Qtopia
 	RepeatPatternEndDate,	
+
+	DateBookRid,
+	DateBookRinfo
     };
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
@@ -74,2 +74,6 @@ private:
     TaskPrivate *d;
+    // ADDITION
+    int recordId;
+    int recordInfo;
+    //
 };
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
@@ -1209,2 +1209,11 @@ DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *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
@@ -398,2 +398,5 @@ extern VObject* Parse_MIME_FromFile(FILE *file);
 

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

+

+

 #endif /* __VOBJECT_H__ */