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

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index 0792954..f8e79bb 100644
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -44,6 +44,12 @@ enum ContactKindType{
 	CONTACTKIND_LOCATION
 };
 
+enum PropertyType{
+	PROPERTY_NONE,
+	PROPERTY_HOME,
+	PROPERTY_WORK
+};
+
 class ContactDataObject{
 
 	public:
@@ -136,6 +142,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 +264,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;
@@ -377,6 +385,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;
 	
@@ -468,6 +477,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;
 	
@@ -559,6 +569,17 @@ class ContactDataObject{
 	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);
 
 };
 
@@ -566,5 +587,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