X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.h;h=f5beef92808774ff22fc1f06db0c02045345894b;hb=825e100fbd7f2492240af1d8688356fc210aeaae;hp=ead05b8b629453cbddc8d3ad3df0bf5b6a5ae14b;hpb=02c28b750d6eb441da1053646ca981a4a6473b75;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index ead05b8..f5beef9 100644
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -44,8 +44,37 @@ enum ContactKindType{
 	CONTACTKIND_LOCATION
 };
 
+enum PropertyType{
+	PROPERTY_NONE,
+	PROPERTY_HOME,
+	PROPERTY_WORK
+};
+
 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);
+
 	public:
 
 	ContactKindType ContactKind = CONTACTKIND_NONE;
@@ -136,6 +165,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 +287,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 +313,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 +399,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 +424,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;
@@ -558,10 +572,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);
 
 };
 
@@ -569,5 +579,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