X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.h;h=02b682052afc3a0b694125e03754a30428ba2432;hp=fad1f0046591621619272aa5a6c59d189304fdc7;hb=5d618c0c96ee88769cc63b0a6fe03679cf68bd18;hpb=fb85e5194a16222937abf13bcfd53a28e47675ee

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index fad1f00..02b6820 100644
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -52,6 +52,26 @@ 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);
+
 	public:
 
 	ContactKindType ContactKind = CONTACTKIND_NONE;
@@ -290,15 +310,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;
@@ -410,16 +421,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;
@@ -567,21 +569,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);
-	void ProcessTelephone(wxString PropertySeg1, wxString PropertySeg2, int *TelephoneCount);
-	void ProcessLanguage(wxString PropertySeg1, wxString PropertySeg2, int *LanguageCount);
-	void ProcessGeographic(wxString PropertySeg1, wxString PropertySeg2, int *GeographicCount);
 
 };