Using ContactDataObject for N.

[xestiaab/.git] / source / contacteditor / frmContactEditor-Load.cpp

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 8449f61..4049a22 100644 (file)
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -90,13 +90,13 @@ bool frmContactEditor::LoadContact(wxString Filename){
        bool HasExtraNicknames = FALSE;
        bool IgnoreGender = FALSE;
        bool ExtraLineSeek = TRUE;
-       bool BirthdayProcessed = FALSE;
-       bool AnniversaryProcessed = FALSE;
+       //bool BirthdayProcessed = FALSE;
+       //bool AnniversaryProcessed = FALSE;
        bool FNProcessed = FALSE;
        bool GenderProcessed = FALSE;
        bool NameProcessed = FALSE;
-       bool UIDProcessed = FALSE;
-       bool KindProcessed = FALSE;
+       //bool UIDProcessed = FALSE;
+       //bool KindProcessed = FALSE;
        bool ETagFound = FALSE;
        bool ETagOrigFound = FALSE;
        bool VersionProcessed = FALSE;
@@ -136,6 +136,14 @@ bool frmContactEditor::LoadContact(wxString Filename){
        int XTokenCount = 0;
        //int intValueSeek = 1;
 
+       // Process the unique ID (UID)
+       
+       UIDToken = ContactEditorData.UIDToken;
+
+       // Process the contact type (KIND) (frmContactEditor-LoadGroup.cpp)
+
+       LoadKind(&ContactEditorData.ContactKind);
+
        // Process the Birthday (BDAY) (frmContactEditor-LoadBADays.cpp)
        
        LoadBirthday(&ContactEditorData.Birthday, &ContactEditorData.BirthdayText);
@@ -147,6 +155,12 @@ bool frmContactEditor::LoadContact(wxString Filename){
        // Process the Gender (GENDER) (frmContactEditor-LoadGender.cpp)
        
        LoadGender(&ContactEditorData.Gender, &ContactEditorData.GenderDetails);
+       
+       // Process the Name (N) (frmContactEditor-LoadName.cpp)
+       
+       LoadName(&ContactEditorData.NameTitle, &ContactEditorData.NameForename,
+               &ContactEditorData.NameSurname, &ContactEditorData.NameOtherNames,
+               &ContactEditorData.NameSuffix);
 
        for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
         iter != ContactFileLines.end(); ++iter){
@@ -249,13 +263,13 @@ bool frmContactEditor::LoadContact(wxString Filename){
                        
                        VersionProcessed = TRUE;
                
-               } if (wxSProperty == wxT("KIND") && KindProcessed == FALSE){
+               }/* if (wxSProperty == wxT("KIND") && KindProcessed == FALSE){
                
                        // See frmContactEditor-LoadGroup.cpp
                
                        LoadKind(wxSPropertySeg2);
                
-               } else if (wxSProperty == wxT("MEMBER")){
+               }*/ else if (wxSProperty == wxT("MEMBER")){
 
                        // See frmContactEditor-LoadGroup.cpp
 
@@ -267,13 +281,13 @@ bool frmContactEditor::LoadContact(wxString Filename){
                
                        LoadFN(wxSPropertySeg1, wxSPropertySeg2, &FNCount, &FNProcessed, &ContactData);
                
-               } else if (wxSProperty == wxT("N") && NameProcessed == FALSE){
+               }/* else if (wxSProperty == wxT("N") && NameProcessed == FALSE){
                
                        // See frmContactEditor-LoadName.cpp
                
                        LoadN(wxSPropertySeg1, wxSPropertySeg2, &NameProcessed, &ContactData);
                
-               } else if (wxSProperty == wxT("NICKNAME")){
+               }*/ else if (wxSProperty == wxT("NICKNAME")){
                        
                        // See frmContactEditor-LoadNickname.cpp
                        
@@ -423,12 +437,12 @@ bool frmContactEditor::LoadContact(wxString Filename){
                        
                        LoadKey(wxSPropertySeg1, wxSPropertySeg2, &KeyCount);
                
-               } else if (wxSProperty == wxT("UID") && UIDProcessed == FALSE){
+               }/* else if (wxSProperty == wxT("UID") && UIDProcessed == FALSE){
                
                        UIDToken = wxSPropertySeg2;
                        UIDProcessed = TRUE;
                
-               } else if (wxSProperty.Mid(0, 3) == wxT("VND")){
+               }*/ else if (wxSProperty.Mid(0, 3) == wxT("VND")){
                
                        // Split the Vendor three ways.