X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.h;h=67775449d265b6e079b5b5769cacc72617388085;hb=0a90006dce811f5df16fabea1a13c26232a4b775;hp=1ea9ebaa417c174ea97f1ab8b1a1e8af13ac7d9a;hpb=c1f0c1c8b56a8304a894dea7f361bda8cbc8d11a;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index 1ea9eba..6777544 100644
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -55,9 +55,13 @@ class ContactDataObject{
 	private:
 	
 	void ProcessKind(wxString KindData);
+	void ProcessRevision(wxString PropertySeg1, wxString PropertySeg2);
+	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 ProcessClientPIDMap(wxString PropertySeg1, wxString PropertySeg2, int *ClientPIDCount);
 	void ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount);
 	void ProcessGender(wxString PropertySeg1, wxString PropertySeg2);
 	void ProcessBirthday(wxString PropertySeg1, wxString PropertySeg2);
@@ -75,6 +79,15 @@ class ContactDataObject{
 	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:
 
@@ -107,6 +120,22 @@ class ContactDataObject{
 	wxString GenderTokens;
 	
 	wxString UIDToken;
+	wxString Revision;
+	wxString RevisionTokens;
+	
+	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;
+
+	std::map<int, wxString> ClientPIDList;
+	std::map<int, wxString> ClientPIDListTokens;
 
 	/* We don't use these at the moment but we want to keep
 	  them for compatability reasons */
@@ -475,6 +504,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 */
@@ -520,7 +550,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 */
@@ -587,4 +618,18 @@ void CheckType(wxString *PropertySeg1,
 	int *intPrevValue, 
 	PropertyType *intType);
 
+void ProcessIntegerValue(wxString *PropertyName,
+	wxString PropertyNameMatch,
+	std::map<int,int> *PrefPtr, 
+	wxString *PropertyValue, 
+	int *ItemCount,
+	bool *PropertyMatched);
+
+void ProcessStringValue(wxString *PropertyName,
+	wxString PropertyNameMatch,
+	std::map<int,wxString> *MapPtr,
+	wxString *PropertyValue,
+	int *ItemCount,
+	bool *PropertyMatched);
+
 #endif
\ No newline at end of file