Removed ContactDataObject point for ProcessIntegerValue and introduced ProcessStringV...

[xestiaab/.git] / source / contacteditor / ContactDataObject.h

diff --git a/source/contacteditor/ContactDataObject.h b/source/contacteditor/ContactDataObject.h
index 4e834d5..a6e9761 100644 (file)
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -55,9 +55,13 @@ class ContactDataObject{
        private:
        
        void ProcessKind(wxString KindData);
+       void ProcessRevision(wxString PropertySeg1, wxString PropertySeg2);
+       void ProcessSource(wxString PropertySeg1, wxString PropertySeg2, int *SourceCount);
+       void ProcessXML(wxString PropertySeg1, wxString PropertySeg2, int *XMLCount);
        void ProcessMember(wxString PropertySeg1, wxString PropertySeg2, int *GroupCount);
        void ProcessFN(wxString PropertySeg1, wxString PropertySeg2, int *FNCount);
        void ProcessN(wxString PropertySeg1, wxString PropertySeg2);
+       void ProcessClientPIDMap(wxString PropertySeg1, wxString PropertySeg2, int *ClientPIDCount);
        void ProcessNickname(wxString PropertySeg1, wxString PropertySeg2, int *NicknameCount);
        void ProcessGender(wxString PropertySeg1, wxString PropertySeg2);
        void ProcessBirthday(wxString PropertySeg1, wxString PropertySeg2);
@@ -116,6 +120,22 @@ class ContactDataObject{
        wxString GenderTokens;
        
        wxString UIDToken;
+       wxString Revision;
+       wxString RevisionTokens;
+       
+       std::map<int, wxString> SourceList;
+       std::map<int, wxString> SourceListAltID;
+       std::map<int, wxString> SourceListPID;
+       std::map<int, wxString> SourceListType;
+       std::map<int, wxString> SourceListTokens;
+       std::map<int, wxString> SourceListMediatype;            
+       std::map<int, int> SourceListPref;
+       
+       std::map<int, wxString> XMLList;
+       std::map<int, wxString> XMLListAltID;
+
+       std::map<int, wxString> ClientPIDList;
+       std::map<int, wxString> ClientPIDListTokens;
 
        /* We don't use these at the moment but we want to keep
          them for compatability reasons */
@@ -598,4 +618,14 @@ void CheckType(wxString *PropertySeg1,
        int *intPrevValue, 
        PropertyType *intType);
 
+void ProcessIntegerValue(std::map<int,int> *PrefPtr, 
+       wxString *PropertyValue, 
+       int *ItemCount);
+
+void ProcessStringValue(wxString *PropertyName,
+       wxString PropertyNameMatch,
+       std::map<int,wxString> *MapPtr,
+       wxString *PropertyValue,
+       int *ItemCount);
+
 #endif
\ No newline at end of file