X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.h;h=116a3b6e9d5ae65c5114242de6c7a466a3c2de73;hb=072925fb1ad8123b6739fdfdaaf490bc8611f381;hp=e55491bf5af9aa3ea2ec7e8c8da99947dfd9b2b6;hpb=c1482227d7cb5d0fdc539682d0fbda830cb28001;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index e55491b..116a3b6 100644
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -52,6 +52,33 @@ enum PropertyType{
 
 class ContactDataObject{
 
+	private:
+	
+	void ProcessKind(wxString KindData);
+	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);
+
 	public:
 
 	ContactKindType ContactKind = CONTACTKIND_NONE;
@@ -142,6 +169,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;
@@ -263,6 +291,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;
@@ -288,15 +317,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;
@@ -383,6 +403,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;
 	
@@ -407,16 +428,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;
@@ -466,6 +478,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 */
@@ -564,18 +577,6 @@ class ContactDataObject{
 	// Subroutines.
 	
 	ContactLoadStatus LoadFile(wxString Filename);
-	void ProcessKind(wxString KindData);
-	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);
 
 };