Backing out unintentional merge from TT branch.

1 files changed, 30 insertions, 16 deletions

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
@@ -32,5 +32,7 @@ namespace Qtopia
 	AddressUid = UID_ID,	
 	AddressCategory = CATEGORY_ID,
-	
+
+	// NOTE: Order of fields dependency in backend/contact.cpp
+
 	Title,
 	FirstName,
@@ -40,21 +42,20 @@ namespace Qtopia
 	FileAs,
 
+	JobTitle,
+	Department,
+	Company,
+	BusinessPhone,
+	BusinessFax,
+	BusinessMobile,
+
 	// email
 	DefaultEmail,
 	Emails,
 
-	// home
-	HomeStreet,
-	HomeCity,
-	HomeState,
-	HomeZip,
-	HomeCountry,
 	HomePhone,
 	HomeFax,
 	HomeMobile,
-	HomeWebPage,
 
 	// business
-	Company,
 	BusinessStreet,
 	BusinessCity,
@@ -62,16 +63,20 @@ namespace Qtopia
 	BusinessZip,
 	BusinessCountry,
+	BusinessPager,
 	BusinessWebPage,
-	JobTitle,
-	Department,
+
 	Office,
-	BusinessPhone,
-	BusinessFax,
-	BusinessMobile,
-	BusinessPager,
 	Profession,
 	Assistant,
 	Manager,
 
+	// home
+	HomeStreet,
+	HomeCity,
+	HomeState,
+	HomeZip,
+	HomeCountry,
+	HomeWebPage,
+
 	//personal
 	Spouse,
@@ -85,4 +90,7 @@ namespace Qtopia
 	Notes,
 	Groups
+
+	,rid,
+	rinfo
     };
 
@@ -96,5 +104,8 @@ namespace Qtopia
 	TaskDescription,
 	Priority,
-	Date	
+	Date,
+
+	TaskRid,
+	TaskRinfo
     };
 
@@ -129,4 +140,7 @@ namespace Qtopia
 	RepeatPatternHasEndDate,
 	RepeatPatternEndDate,	
+
+	DateBookRid,
+	DateBookRinfo
     };
 };