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

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index 00b9a72..ead05b8 100644
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -20,17 +20,36 @@
 #define __CLIENTDATAOBJECT_H__
 
 #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_FILEMISSING
+	CONTACTLOAD_OK,
+	CONTACTLOAD_FILEMISSING,
+	CONTACTLOAD_FILEERROR,
+	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;
@@ -449,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;
 	
@@ -538,7 +558,16 @@ 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 SplitValues(wxString *PropertyLine, 
+	std::map<int,int> *SplitPoints, 
+	std::map<int,int> *SplitLength, 
+	int intSize);
+
 #endif
\ No newline at end of file