X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.h;h=3a2ca7f50aac4357cb7261ade464aa258e8a10f0;hb=b9c2b33681e480071aa685c157b456bf5990ef41;hp=050bd530b069c7ca28e0046b94d64e672993144c;hpb=d0aff1878b93bd25d923176e4e18829b7040da1c;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index 050bd53..3a2ca7f 100644
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -25,6 +25,7 @@
 #include <wx/tokenzr.h>
 
 #include "../vcard/vcard.h"
+#include "../common/textprocessing.h"
 
 enum ContactLoadStatus{
 	CONTACTLOAD_UNITTESTFAIL = -1,
@@ -35,10 +36,26 @@ enum ContactLoadStatus{
 	CONTACTLOAD_FILEBASESPECFAIL
 };
 
+enum ContactKindType{
+	CONTACTKIND_NONE,
+	CONTACTKIND_INDIVIDUAL,
+	CONTACTKIND_GROUP,
+	CONTACTKIND_ORGANISATION,
+	CONTACTKIND_LOCATION
+};
+
+enum PropertyType{
+	PROPERTY_NONE,
+	PROPERTY_HOME,
+	PROPERTY_WORK
+};
+
 class ContactDataObject{
 
 	public:
 
+	ContactKindType ContactKind = CONTACTKIND_NONE;
+
 	/* Items on General Tab */
 
 	wxString NameTitle;
@@ -457,6 +474,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;
 	
@@ -546,7 +564,26 @@ 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 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