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 0c788dd..a6e9761 100644 (file)
--- a/source/contacteditor/ContactDataObject.h
+++ b/source/contacteditor/ContactDataObject.h
@@ -55,11 +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);
@@ -118,6 +120,8 @@ class ContactDataObject{
        wxString GenderTokens;
        
        wxString UIDToken;
+       wxString Revision;
+       wxString RevisionTokens;
        
        std::map<int, wxString> SourceList;
        std::map<int, wxString> SourceListAltID;
@@ -130,6 +134,9 @@ class ContactDataObject{
        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 */
 
@@ -611,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