X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FContactDataObject.h;h=b62c6a86e89e43fb6981e9c6e24eb7f67895b492;hb=5ab6af24eb42838438875f9c7af77210ccfa44a8;hp=dda72386ad5828bbbda779842ffd34edbad4d1a4;hpb=cbb594a87fa3bf6d8511d637f8a390f0e9edc9ea;p=xestiaab%2F.git

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index dda7238..b62c6a8 100644
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -22,19 +22,34 @@
 #include <wx/wx.h>
 #include <wx/file.h>
 #include <map>
+#include <wx/tokenzr.h>
+
 #include "../vcard/vcard.h"
+#include "../common/textprocessing.h"
 
 enum ContactLoadStatus{
 	CONTACTLOAD_UNITTESTFAIL = -1,
+	CONTACTLOAD_OK,
 	CONTACTLOAD_FILEMISSING,
 	CONTACTLOAD_FILEERROR,
-	CONTACTLOAD_FILEINVALIDFORMAT
+	CONTACTLOAD_FILEINVALIDFORMAT,
+	CONTACTLOAD_FILEBASESPECFAIL
+};
+
+enum ContactKindType{
+	CONTACTKIND_NONE,
+	CONTACTKIND_INDIVIDUAL,
+	CONTACTKIND_GROUP,
+	CONTACTKIND_ORGANISATION,
+	CONTACTKIND_LOCATION
 };
 
 class ContactDataObject{
 
 	public:
 
+	ContactKindType ContactKind = CONTACTKIND_NONE;
+
 	/* Items on General Tab */
 
 	wxString NameTitle;
@@ -453,6 +468,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;
 	
@@ -542,7 +558,15 @@ 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 SplitValues(wxString *PropertyLine, 
+	std::map<int,int> *SplitPoints, 
+	std::map<int,int> *SplitLength, 
+	int intSize);
+
 #endif
\ No newline at end of file