X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.h;h=0c788ddfc029b4ca90659c122ecb3ab9847c1c2c;hb=db50ff1e15d18ad7e4451279f91086cc4d6050c5;hp=0792954f5b0e8d10566b0ae664367aa668fa31f0;hpb=702ac5127f25499fcd966ae5d9bbc9a6c8e37299;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index 0792954..0c788dd 100644
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -44,8 +44,49 @@ enum ContactKindType{
 	CONTACTKIND_LOCATION
 };
 
+enum PropertyType{
+	PROPERTY_NONE,
+	PROPERTY_HOME,
+	PROPERTY_WORK
+};
+
 class ContactDataObject{
 
+	private:
+	
+	void ProcessKind(wxString KindData);
+	void ProcessSource(wxString PropertySeg1, wxString PropertySeg2, int *SourceCount);
+	void ProcessXML(wxString PropertySeg1, wxString PropertySeg2, int *XMLCount);
+	void ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount);
+	void ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount);
+	void ProcessN(wxString PropertySeg1, wxString PropertySeg2);
+	void ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount);
+	void ProcessGender(wxString PropertySeg1, wxString PropertySeg2);
+	void ProcessBirthday(wxString PropertySeg1, wxString PropertySeg2);
+	void ProcessAnniversary(wxString PropertySeg1, wxString PropertySeg2);
+	void ProcessTimeZone(wxString PropertySeg1, wxString PropertySeg2, int *TimeZoneCount);
+	void ProcessAddress(wxString PropertySeg1, wxString PropertySeg2, int *AddressCount);
+	void ProcessEmail(wxString PropertySeg1, wxString PropertySeg2, int *EmailCount);
+	void ProcessIM(wxString PropertySeg1, wxString PropertySeg2, int *IMCount);
+	void ProcessTelephone(wxString PropertySeg1, wxString PropertySeg2, int *TelephoneCount);
+	void ProcessLanguage(wxString PropertySeg1, wxString PropertySeg2, int *LanguageCount);
+	void ProcessGeographic(wxString PropertySeg1, wxString PropertySeg2, int *GeographicCount);
+	void ProcessRelated(wxString PropertySeg1, wxString PropertySeg2, int *RelatedCount);
+	void ProcessURL(wxString PropertySeg1, wxString PropertySeg2, int *URLCount);
+	void ProcessTitle(wxString PropertySeg1, wxString PropertySeg2, int *TitleCount);
+	void ProcessRole(wxString PropertySeg1, wxString PropertySeg2, int *RoleCount);
+	void ProcessOrganisation(wxString PropertySeg1, wxString PropertySeg2, int *OrganisationCount);
+	void ProcessNote(wxString PropertySeg1, wxString PropertySeg2, int *NoteCount);
+	void ProcessCategory(wxString PropertySeg1, wxString PropertySeg2, int *CategoryCount);
+	void ProcessPhoto(wxString PropertySeg1, wxString PropertySeg2, int *PhotoCount);
+	void ProcessLogo(wxString PropertySeg1, wxString PropertySeg2, int *LogoCount);
+	void ProcessSound(wxString PropertySeg1, wxString PropertySeg2, int *SoundCount);
+	void ProcessCalendarURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrCount);
+	void ProcessCalendarAddressURI(wxString PropertySeg1, wxString PropertySeg2, int *CalAdrURICount);
+	void ProcessCalendarFreeBusy(wxString PropertySeg1, wxString PropertySeg2, int *FreeBusyAddressCount);
+	void ProcessKey(wxString PropertySeg1, wxString PropertySeg2, int *KeyCount);
+	void ProcessVendor(wxString PropertySeg1, wxString PropertySeg2, int *VendorCount);
+
 	public:
 
 	ContactKindType ContactKind = CONTACTKIND_NONE;
@@ -77,6 +118,17 @@ class ContactDataObject{
 	wxString GenderTokens;
 	
 	wxString UIDToken;
+	
+	std::map<int, wxString> SourceList;
+	std::map<int, wxString> SourceListAltID;
+	std::map<int, wxString> SourceListPID;
+	std::map<int, wxString> SourceListType;
+	std::map<int, wxString> SourceListTokens;
+	std::map<int, wxString> SourceListMediatype;		
+	std::map<int, int> SourceListPref;
+	
+	std::map<int, wxString> XMLList;
+	std::map<int, wxString> XMLListAltID;
 
 	/* We don't use these at the moment but we want to keep
 	  them for compatability reasons */
@@ -136,6 +188,7 @@ class ContactDataObject{
 	std::map<int, wxString> GeneralTelephoneListPID;
 	std::map<int, wxString> GeneralTelephoneListType;
 	std::map<int, wxString> GeneralTelephoneListTokens;
+	std::map<int, wxString> GeneralTelephoneListTypeInfo;
 	std::map<int, int> GeneralTelephoneListPref;
 	
 	std::map<int, wxString> GeneralLanguageList;
@@ -257,6 +310,7 @@ class ContactDataObject{
 	std::map<int, wxString> HomeTelephoneListPID;
 	std::map<int, wxString> HomeTelephoneListType;
 	std::map<int, wxString> HomeTelephoneListTokens;
+	std::map<int, wxString> HomeTelephoneListTypeInfo;
 	std::map<int, int> HomeTelephoneListPref;
 	
 	std::map<int, wxString> HomeLanguageList;
@@ -282,15 +336,6 @@ class ContactDataObject{
 	std::map<int, wxString> HomeGeographyListMediatype;
 	std::map<int, int> HomeGeographyListPref;
 	
-	std::map<int, wxString> HomeRelatedList;
-	std::map<int, wxString> HomeRelatedListRelType;
-	std::map<int, wxString> HomeRelatedListLanguage;
-	std::map<int, wxString> HomeRelatedListAltID;
-	std::map<int, wxString> HomeRelatedListPID;
-	std::map<int, wxString> HomeRelatedListType;
-	std::map<int, wxString> HomeRelatedListTokens;
-	std::map<int, int> HomeRelatedListPref;		
-	
 	std::map<int, wxString> HomeWebsiteList;
 	std::map<int, wxString> HomeWebsiteListAltID;
 	std::map<int, wxString> HomeWebsiteListPID;
@@ -377,6 +422,7 @@ class ContactDataObject{
 	std::map<int, wxString> BusinessTelephoneListAltID;
 	std::map<int, wxString> BusinessTelephoneListPID;
 	std::map<int, wxString> BusinessTelephoneListType;
+	std::map<int, wxString> BusinessTelephoneListTypeInfo;
 	std::map<int, wxString> BusinessTelephoneListTokens;
 	std::map<int, int> BusinessTelephoneListPref;
 	
@@ -401,16 +447,7 @@ class ContactDataObject{
 	std::map<int, wxString> BusinessGeographyListType;
 	std::map<int, wxString> BusinessGeographyListTokens;
 	std::map<int, wxString> BusinessGeographyListMediatype;
-	std::map<int, int> BusinessGeographyListPref;
-	
-	std::map<int, wxString> BusinessRelatedList;
-	std::map<int, wxString> BusinessRelatedListRelType;
-	std::map<int, wxString> BusinessRelatedListLanguage;
-	std::map<int, wxString> BusinessRelatedListAltID;
-	std::map<int, wxString> BusinessRelatedListPID;
-	std::map<int, wxString> BusinessRelatedListType;
-	std::map<int, wxString> BusinessRelatedListTokens;
-	std::map<int, int> BusinessRelatedListPref;			
+	std::map<int, int> BusinessGeographyListPref;			
 	
 	std::map<int, wxString> BusinessWebsiteList;
 	std::map<int, wxString> BusinessWebsiteListAltID;
@@ -460,6 +497,7 @@ class ContactDataObject{
 	std::map<int, wxString> CategoriesListPID;
 	std::map<int, wxString> CategoriesListType;
 	std::map<int, wxString> CategoriesListTokens;
+	std::map<int, wxString> CategoriesListLanguage;
 	std::map<int, int> CategoriesListPref;	
 	
 	/* Items on the Groups tab */
@@ -468,6 +506,7 @@ class ContactDataObject{
 	std::map<int, wxString> GroupsListAltID;
 	std::map<int, wxString> GroupsListPID;
 	std::map<int, wxString> GroupsListType;
+	std::map<int, wxString> GroupsListMediaType;
 	std::map<int, wxString> GroupsListTokens;
 	std::map<int, int> GroupsListPref;
 	
@@ -504,7 +543,8 @@ class ContactDataObject{
 	std::map<int, wxString> SoundsListAudioEncType;		
 	std::map<int, wxString> SoundsListAudioType;		
 	std::map<int, wxString> SoundsListTokens;
-	std::map<int, wxString> SoundsListMediatype;		
+	std::map<int, wxString> SoundsListMediatype;
+	std::map<int, wxString> SoundsListLanguage;	
 	std::map<int, int> SoundsListPref;	
 	
 	/* Items on the Calendaring tab */
@@ -557,8 +597,6 @@ class ContactDataObject{
 	// Subroutines.
 	
 	ContactLoadStatus LoadFile(wxString Filename);
-	void ProcessKind(wxString KindData);
-	void ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount);
 
 };
 
@@ -566,5 +604,11 @@ void SplitValues(wxString *PropertyLine,
 	std::map<int,int> *SplitPoints, 
 	std::map<int,int> *SplitLength, 
 	int intSize);
+	
+void CheckType(wxString *PropertySeg1, 
+	std::map<int,int> *SplitPoints, 
+	std::map<int,int> *SplitLength, 
+	int *intPrevValue, 
+	PropertyType *intType);
 
 #endif
\ No newline at end of file