Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
Now using data from the ContactDataObject for saving.
authorSteve Brokenshire <sbrokenshire@xestia.co.uk>
Fri, 1 Jan 2016 16:09:19 +0000 (16:09 +0000)
committerSteve Brokenshire <sbrokenshire@xestia.co.uk>
Fri, 1 Jan 2016 16:09:19 +0000 (16:09 +0000)
source/contacteditor/frmContactEditor-Save.cpp

index 9cb3c71..65e8715 100644 (file)
@@ -1,6 +1,6 @@
 // frmContactEditor-Save.cpp - frmContactEditor save contact subroutines.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -107,8 +107,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Generate a random UUID.
         
-        UIDToken = GenerateUUID();
-        UIDToken = UIDToken.MakeUpper();
+        ContactEditorData.UIDToken = GenerateUUID();
+        ContactEditorData.UIDToken = ContactEditorData.UIDToken.MakeUpper();
         
         // Setup the filename.
         
@@ -121,14 +121,14 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
 #elif defined(__WIN32__)
         
         FilenameFinal = GetAccountDir(wxSContactAccount, FALSE);
-        FilenameFinal.Append(UIDToken);
+        FilenameFinal.Append(ContactEditorData.UIDToken);
         FilenameFinal.Append(wxT(".vcf"));
         wxSContactFilename = FilenameFinal;
         
 #else
         
         FilenameFinal = GetAccountDir(wxSContactAccount, FALSE);
-        FilenameFinal.Append(UIDToken);
+        FilenameFinal.Append(ContactEditorData.UIDToken);
         FilenameFinal.Append(wxT(".vcf"));
         wxSContactFilename = FilenameFinal;
         
@@ -136,15 +136,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
     } else {
         
-        if (UIDToken.IsEmpty()){
+        if (ContactEditorData.UIDToken.IsEmpty()){
             
             // UID Token is empty. (Shouldn't be).
             // Generate a new UID Token.
             
-            UIDToken = GenerateUUID();
-            UIDToken = UIDToken.MakeUpper();
+            ContactEditorData.UIDToken = GenerateUUID();
+            ContactEditorData.UIDToken = ContactEditorData.UIDToken.MakeUpper();
             
         }
+       
         FilenameFinal = wxSContactFilename;
         
     }
@@ -189,10 +190,10 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     strValue2 = ContactData.Convert(cmbDisplayAs->GetValue(), FALSE);
     strValue2.Trim();
     
-    if (NameTokens.IsEmpty()){
+    if (ContactEditorData.NameTokens.IsEmpty()){
         ContactData.Add(wxT("N;SORT-AS=\"") + strValue2 + wxT("\""), strValue, FALSE);
     } else {
-        ContactData.Add(wxT("N;SORT-AS=\"") + strValue2 + wxT("\";") + NameTokens, strValue, FALSE);
+        ContactData.Add(wxT("N;SORT-AS=\"") + strValue2 + wxT("\";") + ContactEditorData.NameTokens, strValue, FALSE);
     }
     
     if (cmbType->GetCurrentSelection() == 1){
@@ -205,8 +206,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Go through each of the members and write them out.
         
-        for (std::map<int, wxString>::iterator itemiter = GroupsList.begin();
-             itemiter != GroupsList.end(); ++itemiter){
+        for (std::map<int, wxString>::iterator itemiter = ContactEditorData.GroupsList.begin();
+             itemiter != ContactEditorData.GroupsList.end(); ++itemiter){
             
             ContactData.Add(wxT("MEMBER:urn:uuid"), itemiter->second, FALSE);
             
@@ -279,15 +280,15 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         EscapeString(&strValue2, FALSE);
         
-        if (!GenderTokens.IsEmpty()){
+        if (!ContactEditorData.GenderTokens.IsEmpty()){
             
             if (!strValue2.IsEmpty()){
                 
-                ContactData.AddRaw(wxT("GENDER;") + GenderTokens, strValue + wxT(";") + strValue2);
+                ContactData.AddRaw(wxT("GENDER;") + ContactEditorData.GenderTokens, strValue + wxT(";") + strValue2);
                 
             } else {
                 
-                ContactData.AddRaw(wxT("GENDER;") + GenderTokens, strValue);
+                ContactData.AddRaw(wxT("GENDER;") + ContactEditorData.GenderTokens, strValue);
                 
             }
             
@@ -318,7 +319,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Process Label.
     
-    strValue3 = BirthdayAltID;
+    strValue3 = ContactEditorData.BirthdayAltID;
     
     if (!strValue3.IsEmpty()){
         
@@ -336,7 +337,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Process Language.
     
-    strValue3 = BirthdayCalScale;
+    strValue3 = ContactEditorData.BirthdayCalScale;
     
     if (!strValue3.IsEmpty()){
         
@@ -361,7 +362,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Process Tokens.
     
-    strValue2 = BirthdayTokens;
+    strValue2 = ContactEditorData.BirthdayTokens;
     
     // Get the birthday and write it.
     
@@ -415,7 +416,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
             
             // Look for T and replace data before this.
             
-            wxStringTokenizer wSTDate(Birthday, wxT("T"));
+            wxStringTokenizer wSTDate(ContactEditorData.Birthday, wxT("T"));
             
             while (wSTDate.HasMoreTokens()){
                 
@@ -506,7 +507,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Process Label.
     
-    strValue3 = AnniversaryAltID;
+    strValue3 = ContactEditorData.AnniversaryAltID;
     
     if (!strValue3.IsEmpty()){
         
@@ -524,7 +525,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Process Language.
     
-    strValue3 = AnniversaryCalScale;
+    strValue3 = ContactEditorData.AnniversaryCalScale;
     
     if (!strValue3.IsEmpty()){
         
@@ -549,7 +550,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Process Tokens.
     
-    strValue2 = AnniversaryTokens;
+    strValue2 = ContactEditorData.AnniversaryTokens;
     
     // Deal with ANNIVERSARY.
     
@@ -601,7 +602,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
             
             // Look for T and replace data before this.
             
-            wxStringTokenizer wSTDate(Anniversary, wxT("T"));
+            wxStringTokenizer wSTDate(ContactEditorData.Anniversary, wxT("T"));
             
             while (wSTDate.HasMoreTokens()){
                 
@@ -693,8 +694,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     //intValue = GeneralAddressList.size();
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralAddressList.begin();
-         iter != GeneralAddressList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralAddressList.begin();
+         iter != ContactEditorData.GeneralAddressList.end(); ++iter){
         
         int intSeekValue = iter->first;
         
@@ -706,7 +707,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get Address
         
-        iterValue = GeneralAddressList.find(intSeekValue);
+        iterValue = ContactEditorData.GeneralAddressList.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
         strAddressString.Append(strAddressFinalValue + wxT(";"));
@@ -714,7 +715,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get Town
         
-        iterValue = GeneralAddressListTown.find(intSeekValue);
+        iterValue = ContactEditorData.GeneralAddressListTown.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
         strAddressString.Append(strAddressFinalValue + wxT(";"));
@@ -722,7 +723,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get County
         
-        iterValue = GeneralAddressListCounty.find(intSeekValue);
+        iterValue = ContactEditorData.GeneralAddressListCounty.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
         strAddressString.Append(strAddressFinalValue + wxT(";"));
@@ -730,7 +731,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get Post Code
         
-        iterValue = GeneralAddressListPostCode.find(intSeekValue);
+        iterValue = ContactEditorData.GeneralAddressListPostCode.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
         strAddressString.Append(strAddressFinalValue + wxT(";"));
@@ -738,7 +739,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get Country
         
-        iterValue = GeneralAddressListCountry.find(intSeekValue);
+        iterValue = ContactEditorData.GeneralAddressListCountry.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
         strAddressString.Append(strAddressFinalValue);
@@ -746,15 +747,15 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         ProcessSaveData(wxT("ADR"), &strValue2, &boolValue2, &boolValue,
                         &iter, &strAddressString, &ContactData,
-                        wxT("LABEL"), &GeneralAddressListLabel,
-                        wxT("LANGUAGE"), &GeneralAddressListLang,
-                        wxT("ALTID"), &GeneralAddressListAltID,
-                        wxT("PID"), &GeneralAddressListPID,
-                        wxT("GEO"), &GeneralAddressListGeo,
-                        wxT("TZ"), &GeneralAddressListTimezone,
-                        wxT("MEDIATYPE"), &GeneralAddressListMediatype,
-                        wxT("PREF"), &GeneralAddressListPref,
-                        wxT(""), &GeneralAddressListTokens );
+                        wxT("LABEL"), &ContactEditorData.GeneralAddressListLabel,
+                        wxT("LANGUAGE"), &ContactEditorData.GeneralAddressListLang,
+                        wxT("ALTID"), &ContactEditorData.GeneralAddressListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralAddressListPID,
+                        wxT("GEO"), &ContactEditorData.GeneralAddressListGeo,
+                        wxT("TZ"), &ContactEditorData.GeneralAddressListTimezone,
+                        wxT("MEDIATYPE"), &ContactEditorData.GeneralAddressListMediatype,
+                        wxT("PREF"), &ContactEditorData.GeneralAddressListPref,
+                        wxT(""), &ContactEditorData.GeneralAddressListTokens );
         
         ResetSaveProcessData();
         
@@ -762,8 +763,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeAddressList.begin();
-         iter != HomeAddressList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeAddressList.begin();
+         iter != ContactEditorData.HomeAddressList.end(); ++iter){
         
         int intSeekValue = iter->first;
         
@@ -775,55 +776,50 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get Address
         
-        iterValue = HomeAddressList.find(intSeekValue);
+        iterValue = ContactEditorData.HomeAddressList.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
-        
         strAddressString.Append(strAddressFinalValue + wxT(";"));
         
         // Get Town
         
-        iterValue = HomeAddressListTown.find(intSeekValue);
+        iterValue = ContactEditorData.HomeAddressListTown.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
-        
         strAddressString.Append(strAddressFinalValue + wxT(";"));
         
         // Get County
         
-        iterValue = HomeAddressListCounty.find(intSeekValue);
+        iterValue = ContactEditorData.HomeAddressListCounty.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
-        
         strAddressString.Append(strAddressFinalValue + wxT(";"));
         
         // Get Post Code
         
-        iterValue = HomeAddressListPostCode.find(intSeekValue);
+        iterValue = ContactEditorData.HomeAddressListPostCode.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
-        
         strAddressString.Append(strAddressFinalValue + wxT(";"));
         
         // Get Country
         
-        iterValue = HomeAddressListCountry.find(intSeekValue);
+        iterValue = ContactEditorData.HomeAddressListCountry.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
-        
         strAddressString.Append(strAddressFinalValue);
         
         ProcessSaveData(wxT("ADR;TYPE=home"), &strValue2, &boolValue2, &boolValue,
                         &iter, &strAddressString, &ContactData,
-                        wxT("LABEL"), &HomeAddressListLabel,
-                        wxT("LANGUAGE"), &HomeAddressListLang,
-                        wxT("ALTID"), &HomeAddressListAltID,
-                        wxT("PID"), &HomeAddressListPID,
-                        wxT("GEO"), &HomeAddressListGeo,
-                        wxT("TZ"), &HomeAddressListTimezone,
-                        wxT("MEDIATYPE"), &HomeAddressListMediatype,
-                        wxT("PREF"), &HomeAddressListPref,
-                        wxT(""), &HomeAddressListTokens );
+                        wxT("LABEL"), &ContactEditorData.HomeAddressListLabel,
+                        wxT("LANGUAGE"), &ContactEditorData.HomeAddressListLang,
+                        wxT("ALTID"), &ContactEditorData.HomeAddressListAltID,
+                        wxT("PID"), &ContactEditorData.HomeAddressListPID,
+                        wxT("GEO"), &ContactEditorData.HomeAddressListGeo,
+                        wxT("TZ"), &ContactEditorData.HomeAddressListTimezone,
+                        wxT("MEDIATYPE"), &ContactEditorData.HomeAddressListMediatype,
+                        wxT("PREF"), &ContactEditorData.HomeAddressListPref,
+                        wxT(""), &ContactEditorData.HomeAddressListTokens );
         
         ResetSaveProcessData();
         
@@ -831,8 +827,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessAddressList.begin();
-         iter != BusinessAddressList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessAddressList.begin();
+         iter != ContactEditorData.BusinessAddressList.end(); ++iter){
         
         int intSeekValue = iter->first;
         
@@ -844,7 +840,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get Address
         
-        iterValue = BusinessAddressList.find(intSeekValue);
+        iterValue = ContactEditorData.BusinessAddressList.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
         
@@ -852,7 +848,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get Town
         
-        iterValue = BusinessAddressListTown.find(intSeekValue);
+        iterValue = ContactEditorData.BusinessAddressListTown.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
         
@@ -860,7 +856,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get County
         
-        iterValue = BusinessAddressListCounty.find(intSeekValue);
+        iterValue = ContactEditorData.BusinessAddressListCounty.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
         
@@ -868,7 +864,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get Post Code
         
-        iterValue = BusinessAddressListPostCode.find(intSeekValue);
+        iterValue = ContactEditorData.BusinessAddressListPostCode.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
         
@@ -876,7 +872,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get Country
         
-        iterValue = BusinessAddressListCountry.find(intSeekValue);
+        iterValue = ContactEditorData.BusinessAddressListCountry.find(intSeekValue);
         strAddressFinalValue = iterValue->second;
         ProcessCaptureStrings(&strAddressFinalValue);
         
@@ -884,15 +880,15 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         ProcessSaveData(wxT("ADR;TYPE=work"), &strValue2, &boolValue2, &boolValue,
                         &iter, &strAddressString, &ContactData,
-                        wxT("LABEL"), &BusinessAddressListLabel,
-                        wxT("LANGUAGE"), &BusinessAddressListLang,
-                        wxT("ALTID"), &BusinessAddressListAltID,
-                        wxT("PID"), &BusinessAddressListPID,
-                        wxT("GEO"), &BusinessAddressListGeo,
-                        wxT("TZ"), &BusinessAddressListTimezone,
-                        wxT("MEDIATYPE"), &BusinessAddressListMediatype,
-                        wxT("PREF"), &BusinessAddressListPref,
-                        wxT(""), &BusinessAddressListTokens );
+                        wxT("LABEL"), &ContactEditorData.BusinessAddressListLabel,
+                        wxT("LANGUAGE"), &ContactEditorData.BusinessAddressListLang,
+                        wxT("ALTID"), &ContactEditorData.BusinessAddressListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessAddressListPID,
+                        wxT("GEO"), &ContactEditorData.BusinessAddressListGeo,
+                        wxT("TZ"), &ContactEditorData.BusinessAddressListTimezone,
+                        wxT("MEDIATYPE"), &ContactEditorData.BusinessAddressListMediatype,
+                        wxT("PREF"), &ContactEditorData.BusinessAddressListPref,
+                        wxT(""), &ContactEditorData.BusinessAddressListTokens );
         
         ResetSaveProcessData();
         
@@ -900,20 +896,20 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Sort out nicknames (if any).
     
-    for (std::map<int,wxString>::iterator iter = GeneralNicknamesList.begin();
-         iter != GeneralNicknamesList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralNicknamesList.begin();
+         iter != ContactEditorData.GeneralNicknamesList.end(); ++iter){
         
         intValue2 = iter->first;
         
         // Process Alternative ID.
         
         ProcessSaveData(wxT("NICKNAME"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralNicknamesList, &ContactData,
-                        wxT("LANGUAGE"), &GeneralNicknamesListLanguage,
-                        wxT("ALTID"), &GeneralNicknamesListAltID,
-                        wxT("PID"), &GeneralNicknamesListPID,
-                        wxT("PREF"), &GeneralNicknamesListPref,
-                        wxT(""), &GeneralNicknamesListTokens );
+                        &iter, &ContactEditorData.GeneralNicknamesList, &ContactData,
+                        wxT("LANGUAGE"), &ContactEditorData.GeneralNicknamesListLanguage,
+                        wxT("ALTID"), &ContactEditorData.GeneralNicknamesListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralNicknamesListPID,
+                        wxT("PREF"), &ContactEditorData.GeneralNicknamesListPref,
+                        wxT(""), &ContactEditorData.GeneralNicknamesListTokens );
         
         ResetSaveProcessData();
         
@@ -921,16 +917,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeNicknamesList.begin();
-         iter != HomeNicknamesList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeNicknamesList.begin();
+         iter != ContactEditorData.HomeNicknamesList.end(); ++iter){
         
         ProcessSaveData(wxT("NICKNAME;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeNicknamesList, &ContactData,
-                        wxT("LANGUAGE"), &HomeNicknamesListLanguage,
-                        wxT("ALTID"), &HomeNicknamesListAltID,
-                        wxT("PID"), &HomeNicknamesListPID,
-                        wxT("PREF"), &HomeNicknamesListPref,
-                        wxT(""), &HomeNicknamesListTokens );
+                        &iter, &ContactEditorData.HomeNicknamesList, &ContactData,
+                        wxT("LANGUAGE"), &ContactEditorData.HomeNicknamesListLanguage,
+                        wxT("ALTID"), &ContactEditorData.HomeNicknamesListAltID,
+                        wxT("PID"), &ContactEditorData.HomeNicknamesListPID,
+                        wxT("PREF"), &ContactEditorData.HomeNicknamesListPref,
+                        wxT(""), &ContactEditorData.HomeNicknamesListTokens );
         
         ResetSaveProcessData();
         
@@ -938,16 +934,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessNicknamesList.begin();
-         iter != BusinessNicknamesList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessNicknamesList.begin();
+         iter != ContactEditorData.BusinessNicknamesList.end(); ++iter){
         
         ProcessSaveData(wxT("NICKNAME;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessNicknamesList, &ContactData,
-                        wxT("LANGUAGE"), &BusinessNicknamesListLanguage,
-                        wxT("ALTID"), &BusinessNicknamesListAltID,
-                        wxT("PID"), &BusinessNicknamesListPID,
-                        wxT("PREF"), &BusinessNicknamesListPref,
-                        wxT(""), &BusinessNicknamesListTokens );
+                        &iter, &ContactEditorData.BusinessNicknamesList, &ContactData,
+                        wxT("LANGUAGE"), &ContactEditorData.BusinessNicknamesListLanguage,
+                        wxT("ALTID"), &ContactEditorData.BusinessNicknamesListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessNicknamesListPID,
+                        wxT("PREF"), &ContactEditorData.BusinessNicknamesListPref,
+                        wxT(""), &ContactEditorData.BusinessNicknamesListTokens );
         
         ResetSaveProcessData();
         
@@ -957,8 +953,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Sort out email (general, home and business).
     
-    for (std::map<int,wxString>::iterator iter = GeneralEmailList.begin();
-         iter != GeneralEmailList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralEmailList.begin();
+         iter != ContactEditorData.GeneralEmailList.end(); ++iter){
         
         //strValue3 = ContactData.Convert(GeneralAddressList, FALSE);
         //strValue2 =
@@ -967,11 +963,11 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         std::map<int, wxString>::iterator iterValue;
         
         ProcessSaveData(wxT("EMAIL"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralEmailList, &ContactData,
-                        wxT("ALTID"), &GeneralEmailListAltID,
-                        wxT("PID"), &GeneralEmailListPID,
-                        wxT("PREF"), &GeneralEmailListPref,
-                        wxT(""), &GeneralEmailListTokens );
+                        &iter, &ContactEditorData.GeneralEmailList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.GeneralEmailListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralEmailListPID,
+                        wxT("PREF"), &ContactEditorData.GeneralEmailListPref,
+                        wxT(""), &ContactEditorData.GeneralEmailListTokens );
         
         ResetSaveProcessData();
         
@@ -979,18 +975,18 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeEmailList.begin();
-         iter != HomeEmailList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeEmailList.begin();
+         iter != ContactEditorData.HomeEmailList.end(); ++iter){
         
         //strValue3 = ContactData.Convert(GeneralAddressList, FALSE);
         //strValue2 =
         
         ProcessSaveData(wxT("EMAIL;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeEmailList, &ContactData,
-                        wxT("ALTID"), &HomeEmailListAltID,
-                        wxT("PID"), &HomeEmailListPID,
-                        wxT("PREF"), &HomeEmailListPref,
-                        wxT(""), &HomeEmailListTokens );
+                        &iter, &ContactEditorData.HomeEmailList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.HomeEmailListAltID,
+                        wxT("PID"), &ContactEditorData.HomeEmailListPID,
+                        wxT("PREF"), &ContactEditorData.HomeEmailListPref,
+                        wxT(""), &ContactEditorData.HomeEmailListTokens );
         
         ResetSaveProcessData();
         
@@ -998,18 +994,18 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessEmailList.begin();
-         iter != BusinessEmailList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessEmailList.begin();
+         iter != ContactEditorData.BusinessEmailList.end(); ++iter){
         
         //strValue3 = ContactData.Convert(GeneralAddressList, FALSE);
         //strValue2 =
         
         ProcessSaveData(wxT("EMAIL;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessEmailList, &ContactData,
-                        wxT("ALTID"), &BusinessEmailListAltID,
-                        wxT("PID"), &BusinessEmailListPID,
-                        wxT("PREF"), &BusinessEmailListPref,
-                        wxT(""), &BusinessEmailListTokens );
+                        &iter, &ContactEditorData.BusinessEmailList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.BusinessEmailListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessEmailListPID,
+                        wxT("PREF"), &ContactEditorData.BusinessEmailListPref,
+                        wxT(""), &ContactEditorData.BusinessEmailListTokens );
         
         ResetSaveProcessData();
         
@@ -1017,20 +1013,20 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralIMList.begin();
-         iter != GeneralIMList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralIMList.begin();
+         iter != ContactEditorData.GeneralIMList.end(); ++iter){
         
         intValue2 = iter->first;
         
         // Process Alternative ID.
         
         ProcessSaveData(wxT("IMPP"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralIMList, &ContactData,
-                        wxT("ALTID"), &GeneralIMListAltID,
-                        wxT("PID"), &GeneralIMListPID,
-                        wxT("MEDIATYPE"), &GeneralIMListMediatype,
-                        wxT("PREF"), &GeneralIMListPref,
-                        wxT(""), &GeneralIMListTokens );
+                        &iter, &ContactEditorData.GeneralIMList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.GeneralIMListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralIMListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.GeneralIMListMediatype,
+                        wxT("PREF"), &ContactEditorData.GeneralIMListPref,
+                        wxT(""), &ContactEditorData.GeneralIMListTokens );
         
         ResetSaveProcessData();
         
@@ -1038,16 +1034,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeIMList.begin();
-         iter != HomeIMList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeIMList.begin();
+         iter != ContactEditorData.HomeIMList.end(); ++iter){
         
         ProcessSaveData(wxT("IMPP;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeIMList, &ContactData,
-                        wxT("ALTID"), &HomeIMListAltID,
-                        wxT("PID"), &HomeIMListPID,
-                        wxT("MEDIATYPE"), &HomeIMListMediatype,
-                        wxT("PREF"), &HomeIMListPref,
-                        wxT(""), &HomeIMListTokens );
+                        &iter, &ContactEditorData.HomeIMList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.HomeIMListAltID,
+                        wxT("PID"), &ContactEditorData.HomeIMListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.HomeIMListMediatype,
+                        wxT("PREF"), &ContactEditorData.HomeIMListPref,
+                        wxT(""), &ContactEditorData.HomeIMListTokens );
         
         ResetSaveProcessData();
         
@@ -1055,16 +1051,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessIMList.begin();
-         iter != BusinessIMList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessIMList.begin();
+         iter != ContactEditorData.BusinessIMList.end(); ++iter){
         
         ProcessSaveData(wxT("IMPP;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessIMList, &ContactData,
-                        wxT("ALTID"), &BusinessIMListAltID,
-                        wxT("PID"), &BusinessIMListPID,
-                        wxT("MEDIATYPE"), &BusinessIMListMediatype,
-                        wxT("PREF"), &BusinessIMListPref,
-                        wxT(""), &BusinessIMListTokens );
+                        &iter, &ContactEditorData.BusinessIMList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.BusinessIMListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessIMListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.BusinessIMListMediatype,
+                        wxT("PREF"), &ContactEditorData.BusinessIMListPref,
+                        wxT(""), &ContactEditorData.BusinessIMListTokens );
         
         ResetSaveProcessData();
         
@@ -1072,8 +1068,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralTelephoneList.begin();
-         iter != GeneralTelephoneList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralTelephoneList.begin();
+         iter != ContactEditorData.GeneralTelephoneList.end(); ++iter){
         
         wxString strAddressFinalValue = iter->second;
         
@@ -1083,11 +1079,11 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         ProcessSaveData(wxT("TEL"), &strValue2, &boolValue2, &boolValue,
                         &iter, &strAddressFinalValue, &ContactData,
-                        wxT("ALTID"), &GeneralTelephoneListAltID,
-                        wxT("PID"), &GeneralTelephoneListPID,
-                        wxT("TYPE"), &GeneralTelephoneListType,
-                        wxT("PREF"), &GeneralTelephoneListPref,
-                        wxT(""), &GeneralTelephoneListTokens );
+                        wxT("ALTID"), &ContactEditorData.GeneralTelephoneListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralTelephoneListPID,
+                        wxT("TYPE"), &ContactEditorData.GeneralTelephoneListType,
+                        wxT("PREF"), &ContactEditorData.GeneralTelephoneListPref,
+                        wxT(""), &ContactEditorData.GeneralTelephoneListTokens );
         
         ResetSaveProcessData();
         
@@ -1095,8 +1091,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeTelephoneList.begin();
-         iter != HomeTelephoneList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeTelephoneList.begin();
+         iter != ContactEditorData.HomeTelephoneList.end(); ++iter){
         
         wxString strAddressFinalValue = iter->second;
         
@@ -1106,11 +1102,11 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         ProcessSaveData(wxT("TEL"), &strValue2, &boolValue2, &boolValue,
                         &iter, &strAddressFinalValue, &ContactData,
-                        wxT("ALTID"), &HomeTelephoneListAltID,
-                        wxT("PID"), &HomeTelephoneListPID,
-                        wxT("TYPE"), &HomeTelephoneListType,
-                        wxT("PREF"), &HomeTelephoneListPref,
-                        wxT(""), &HomeTelephoneListTokens );
+                        wxT("ALTID"), &ContactEditorData.HomeTelephoneListAltID,
+                        wxT("PID"), &ContactEditorData.HomeTelephoneListPID,
+                        wxT("TYPE"), &ContactEditorData.HomeTelephoneListType,
+                        wxT("PREF"), &ContactEditorData.HomeTelephoneListPref,
+                        wxT(""), &ContactEditorData.HomeTelephoneListTokens );
         
         ResetSaveProcessData();
         
@@ -1118,8 +1114,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessTelephoneList.begin();
-         iter != BusinessTelephoneList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessTelephoneList.begin();
+         iter != ContactEditorData.BusinessTelephoneList.end(); ++iter){
         
         wxString strAddressFinalValue = iter->second;
         
@@ -1129,11 +1125,11 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         ProcessSaveData(wxT("TEL"), &strValue2, &boolValue2, &boolValue,
                         &iter, &strAddressFinalValue, &ContactData,
-                        wxT("ALTID"), &BusinessTelephoneListAltID,
-                        wxT("PID"), &BusinessTelephoneListPID,
-                        wxT("TYPE"), &BusinessTelephoneListType,
-                        wxT("PREF"), &BusinessTelephoneListPref,
-                        wxT(""), &BusinessTelephoneListTokens );
+                        wxT("ALTID"), &ContactEditorData.BusinessTelephoneListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessTelephoneListPID,
+                        wxT("TYPE"), &ContactEditorData.BusinessTelephoneListType,
+                        wxT("PREF"), &ContactEditorData.BusinessTelephoneListPref,
+                        wxT(""), &ContactEditorData.BusinessTelephoneListTokens );
         
         ResetSaveProcessData();
         
@@ -1141,17 +1137,17 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralLanguageList.begin();
-         iter != GeneralLanguageList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralLanguageList.begin();
+         iter != ContactEditorData.GeneralLanguageList.end(); ++iter){
         
         intValue2 = iter->first;
         
         ProcessSaveData(wxT("LANG"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralLanguageList, &ContactData,
-                        wxT("ALTID"), &GeneralLanguageListAltID,
-                        wxT("PID"), &GeneralLanguageListPID,
-                        wxT("PREF"), &GeneralLanguageListPref,
-                        wxT(""), &GeneralLanguageListTokens );
+                        &iter, &ContactEditorData.GeneralLanguageList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.GeneralLanguageListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralLanguageListPID,
+                        wxT("PREF"), &ContactEditorData.GeneralLanguageListPref,
+                        wxT(""), &ContactEditorData.GeneralLanguageListTokens );
         
         ResetSaveProcessData();
         
@@ -1159,15 +1155,15 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeLanguageList.begin();
-         iter != HomeLanguageList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeLanguageList.begin();
+         iter != ContactEditorData.HomeLanguageList.end(); ++iter){
         
         ProcessSaveData(wxT("LANG;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeLanguageList, &ContactData,
-                        wxT("ALTID"), &HomeLanguageListAltID,
-                        wxT("PID"), &HomeLanguageListPID,
-                        wxT("PREF"), &HomeLanguageListPref,
-                        wxT(""), &HomeLanguageListTokens );
+                        &iter, &ContactEditorData.HomeLanguageList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.HomeLanguageListAltID,
+                        wxT("PID"), &ContactEditorData.HomeLanguageListPID,
+                        wxT("PREF"), &ContactEditorData.HomeLanguageListPref,
+                        wxT(""), &ContactEditorData.HomeLanguageListTokens );
         
         ResetSaveProcessData();
         
@@ -1175,15 +1171,15 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessLanguageList.begin();
-         iter != BusinessLanguageList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessLanguageList.begin();
+         iter != ContactEditorData.BusinessLanguageList.end(); ++iter){
         
         ProcessSaveData(wxT("LANG;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessLanguageList, &ContactData,
-                        wxT("ALTID"), &BusinessLanguageListAltID,
-                        wxT("PID"), &BusinessLanguageListPID,
-                        wxT("PREF"), &BusinessLanguageListPref,
-                        wxT(""), &BusinessLanguageListTokens );
+                        &iter, &ContactEditorData.BusinessLanguageList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.BusinessLanguageListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessLanguageListPID,
+                        wxT("PREF"), &ContactEditorData.BusinessLanguageListPref,
+                        wxT(""), &ContactEditorData.BusinessLanguageListTokens );
         
         ResetSaveProcessData();
         
@@ -1191,16 +1187,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralTZList.begin();
-         iter != GeneralTZList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralTZList.begin();
+         iter != ContactEditorData.GeneralTZList.end(); ++iter){
         
         ProcessSaveData(wxT("TZ"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralTZList, &ContactData,
-                        wxT("ALTID"), &GeneralTZListAltID,
-                        wxT("PID"), &GeneralTZListPID,
-                        wxT("MEDIATYPE"), &GeneralTZListMediatype,
-                        wxT("PREF"), &GeneralTZListPref,
-                        wxT(""), &GeneralTZListTokens );
+                        &iter, &ContactEditorData.GeneralTZList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.GeneralTZListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralTZListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.GeneralTZListMediatype,
+                        wxT("PREF"), &ContactEditorData.GeneralTZListPref,
+                        wxT(""), &ContactEditorData.GeneralTZListTokens );
         
         ResetSaveProcessData();
         
@@ -1208,16 +1204,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeTZList.begin();
-         iter != HomeTZList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeTZList.begin();
+         iter != ContactEditorData.HomeTZList.end(); ++iter){
         
         ProcessSaveData(wxT("TZ;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeTZList, &ContactData,
-                        wxT("ALTID"), &HomeTZListAltID,
-                        wxT("PID"), &HomeTZListPID,
-                        wxT("MEDIATYPE"), &HomeTZListMediatype,
-                        wxT("PREF"), &HomeTZListPref,
-                        wxT(""), &HomeTZListTokens );
+                        &iter, &ContactEditorData.HomeTZList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.HomeTZListAltID,
+                        wxT("PID"), &ContactEditorData.HomeTZListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.HomeTZListMediatype,
+                        wxT("PREF"), &ContactEditorData.HomeTZListPref,
+                        wxT(""), &ContactEditorData.HomeTZListTokens );
         
         ResetSaveProcessData();
         
@@ -1225,16 +1221,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessTZList.begin();
-         iter != BusinessTZList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessTZList.begin();
+         iter != ContactEditorData.BusinessTZList.end(); ++iter){
         
         ProcessSaveData(wxT("TZ;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessTZList, &ContactData,
-                        wxT("ALTID"), &BusinessTZListAltID,
-                        wxT("PID"), &BusinessTZListPID,
-                        wxT("MEDIATYPE"), &BusinessTZListMediatype,
-                        wxT("PREF"), &BusinessTZListPref,
-                        wxT(""), &BusinessTZListTokens );
+                        &iter, &ContactEditorData.BusinessTZList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.BusinessTZListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessTZListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.BusinessTZListMediatype,
+                        wxT("PREF"), &ContactEditorData.BusinessTZListPref,
+                        wxT(""), &ContactEditorData.BusinessTZListTokens );
         
         ResetSaveProcessData();
         
@@ -1242,8 +1238,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralGeographyList.begin();
-         iter != GeneralGeographyList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralGeographyList.begin();
+         iter != ContactEditorData.GeneralGeographyList.end(); ++iter){
         
         wxString strAddressFinalValue = iter->second;
         
@@ -1253,11 +1249,11 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         ProcessSaveData(wxT("GEO"), &strValue2, &boolValue2, &boolValue,
                         &iter, &strAddressFinalValue, &ContactData,
-                        wxT("ALTID"), &GeneralGeographyListAltID,
-                        wxT("PID"), &GeneralGeographyListPID,
-                        wxT("MEDIATYPE"), &GeneralGeographyListMediatype,
-                        wxT("PREF"), &GeneralGeographyListPref,
-                        wxT(""), &GeneralGeographyListTokens );
+                        wxT("ALTID"), &ContactEditorData.GeneralGeographyListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralGeographyListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.GeneralGeographyListMediatype,
+                        wxT("PREF"), &ContactEditorData.GeneralGeographyListPref,
+                        wxT(""), &ContactEditorData.GeneralGeographyListTokens );
         
         ResetSaveProcessData();
         
@@ -1265,8 +1261,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeGeographyList.begin();
-         iter != HomeGeographyList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeGeographyList.begin();
+         iter != ContactEditorData.HomeGeographyList.end(); ++iter){
         
         wxString strAddressFinalValue = iter->second;
         
@@ -1275,12 +1271,12 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         strAddressFinalValue.insert(0, wxT("geo:"));
         
         ProcessSaveData(wxT("GEO;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeGeographyList, &ContactData,
-                        wxT("ALTID"), &HomeGeographyListAltID,
-                        wxT("PID"), &HomeGeographyListPID,
-                        wxT("MEDIATYPE"), &HomeGeographyListMediatype,
-                        wxT("PREF"), &HomeGeographyListPref,
-                        wxT(""), &HomeGeographyListTokens );
+                        &iter, &ContactEditorData.HomeGeographyList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.HomeGeographyListAltID,
+                        wxT("PID"), &ContactEditorData.HomeGeographyListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.HomeGeographyListMediatype,
+                        wxT("PREF"), &ContactEditorData.HomeGeographyListPref,
+                        wxT(""), &ContactEditorData.HomeGeographyListTokens );
         
         ResetSaveProcessData();
         
@@ -1288,8 +1284,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessGeographyList.begin();
-         iter != BusinessGeographyList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessGeographyList.begin();
+         iter != ContactEditorData.BusinessGeographyList.end(); ++iter){
         
         wxString strAddressFinalValue = iter->second;
         
@@ -1298,12 +1294,12 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         strAddressFinalValue.insert(0, wxT("geo:"));
         
         ProcessSaveData(wxT("GEO;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessGeographyList, &ContactData,
-                        wxT("ALTID"), &BusinessGeographyListAltID,
-                        wxT("PID"), &BusinessGeographyListPID,
-                        wxT("MEDIATYPE"), &BusinessGeographyListMediatype,
-                        wxT("PREF"), &BusinessGeographyListPref,
-                        wxT(""), &BusinessGeographyListTokens );
+                        &iter, &ContactEditorData.BusinessGeographyList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.BusinessGeographyListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessGeographyListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.BusinessGeographyListMediatype,
+                        wxT("PREF"), &ContactEditorData.BusinessGeographyListPref,
+                        wxT(""), &ContactEditorData.BusinessGeographyListTokens );
         
         ResetSaveProcessData();
         
@@ -1311,17 +1307,17 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralRelatedList.begin();
-         iter != GeneralRelatedList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralRelatedList.begin();
+         iter != ContactEditorData.GeneralRelatedList.end(); ++iter){
         
         ProcessSaveData(wxT("RELATED"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralRelatedList, &ContactData,
-                        wxT("ALTID"), &GeneralRelatedListAltID,
-                        wxT("PID"), &GeneralRelatedListPID,
-                        wxT("LANGUAGE"), &GeneralRelatedListLanguage,
-                        wxT("TYPE"), &GeneralRelatedListRelType,
-                        wxT("PREF"), &GeneralRelatedListPref,
-                        wxT(""), &GeneralRelatedListTokens );
+                        &iter, &ContactEditorData.GeneralRelatedList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.GeneralRelatedListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralRelatedListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.GeneralRelatedListLanguage,
+                        wxT("TYPE"), &ContactEditorData.GeneralRelatedListRelType,
+                        wxT("PREF"), &ContactEditorData.GeneralRelatedListPref,
+                        wxT(""), &ContactEditorData.GeneralRelatedListTokens );
         
         ResetSaveProcessData();
         
@@ -1329,16 +1325,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralWebsiteList.begin();
-         iter != GeneralWebsiteList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralWebsiteList.begin();
+         iter != ContactEditorData.GeneralWebsiteList.end(); ++iter){
         
         ProcessSaveData(wxT("URL"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralWebsiteList, &ContactData,
-                        wxT("ALTID"), &GeneralWebsiteListAltID,
-                        wxT("PID"), &GeneralWebsiteListPID,
-                        wxT("MEDIATYPE"), &GeneralWebsiteListMediatype,
-                        wxT("PREF"), &GeneralWebsiteListPref,
-                        wxT(""), &GeneralWebsiteListTokens );
+                        &iter, &ContactEditorData.GeneralWebsiteList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.GeneralWebsiteListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralWebsiteListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.GeneralWebsiteListMediatype,
+                        wxT("PREF"), &ContactEditorData.GeneralWebsiteListPref,
+                        wxT(""), &ContactEditorData.GeneralWebsiteListTokens );
         
         ResetSaveProcessData();
         
@@ -1346,16 +1342,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeWebsiteList.begin();
-         iter != HomeWebsiteList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeWebsiteList.begin();
+         iter != ContactEditorData.HomeWebsiteList.end(); ++iter){
         
         ProcessSaveData(wxT("URL;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeWebsiteList, &ContactData,
-                        wxT("ALTID"), &HomeWebsiteListAltID,
-                        wxT("PID"), &HomeWebsiteListPID,
-                        wxT("MEDIATYPE"), &HomeWebsiteListMediatype,
-                        wxT("PREF"), &HomeWebsiteListPref,
-                        wxT(""), &HomeWebsiteListTokens );
+                        &iter, &ContactEditorData.HomeWebsiteList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.HomeWebsiteListAltID,
+                        wxT("PID"), &ContactEditorData.HomeWebsiteListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.HomeWebsiteListMediatype,
+                        wxT("PREF"), &ContactEditorData.HomeWebsiteListPref,
+                        wxT(""), &ContactEditorData.HomeWebsiteListTokens );
         
         ResetSaveProcessData();
         
@@ -1363,16 +1359,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessWebsiteList.begin();
-         iter != BusinessWebsiteList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessWebsiteList.begin();
+         iter != ContactEditorData.BusinessWebsiteList.end(); ++iter){
         
         ProcessSaveData(wxT("URL;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessWebsiteList, &ContactData,
-                        wxT("ALTID"), &BusinessWebsiteListAltID,
-                        wxT("PID"), &BusinessWebsiteListPID,
-                        wxT("MEDIATYPE"), &BusinessWebsiteListMediatype,
-                        wxT("PREF"), &BusinessWebsiteListPref,
-                        wxT(""), &BusinessWebsiteListTokens );
+                        &iter, &ContactEditorData.BusinessWebsiteList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.BusinessWebsiteListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessWebsiteListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.BusinessWebsiteListMediatype,
+                        wxT("PREF"), &ContactEditorData.BusinessWebsiteListPref,
+                        wxT(""), &ContactEditorData.BusinessWebsiteListTokens );
         
         ResetSaveProcessData();
         
@@ -1380,16 +1376,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralTitleList.begin();
-         iter != GeneralTitleList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralTitleList.begin();
+         iter != ContactEditorData.GeneralTitleList.end(); ++iter){
         
         ProcessSaveData(wxT("TITLE"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralTitleList, &ContactData,
-                        wxT("ALTID"), &GeneralTitleListAltID,
-                        wxT("PID"), &GeneralTitleListPID,
-                        wxT("LANGUAGE"), &GeneralTitleListLanguage,
-                        wxT("PREF"), &GeneralTitleListPref,
-                        wxT(""), &GeneralTitleListTokens );
+                        &iter, &ContactEditorData.GeneralTitleList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.GeneralTitleListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralTitleListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.GeneralTitleListLanguage,
+                        wxT("PREF"), &ContactEditorData.GeneralTitleListPref,
+                        wxT(""), &ContactEditorData.GeneralTitleListTokens );
         
         ResetSaveProcessData();
         
@@ -1397,16 +1393,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeTitleList.begin();
-         iter != HomeTitleList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeTitleList.begin();
+         iter != ContactEditorData.HomeTitleList.end(); ++iter){
         
         ProcessSaveData(wxT("TITLE;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeTitleList, &ContactData,
-                        wxT("ALTID"), &HomeTitleListAltID,
-                        wxT("PID"), &HomeTitleListPID,
-                        wxT("LANGUAGE"), &HomeTitleListLanguage,
-                        wxT("PREF"), &HomeTitleListPref,
-                        wxT(""), &HomeTitleListTokens );
+                        &iter, &ContactEditorData.HomeTitleList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.HomeTitleListAltID,
+                        wxT("PID"), &ContactEditorData.HomeTitleListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.HomeTitleListLanguage,
+                        wxT("PREF"), &ContactEditorData.HomeTitleListPref,
+                        wxT(""), &ContactEditorData.HomeTitleListTokens );
         
         ResetSaveProcessData();
         
@@ -1414,16 +1410,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessTitleList.begin();
-         iter != BusinessTitleList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessTitleList.begin();
+         iter != ContactEditorData.BusinessTitleList.end(); ++iter){
         
         ProcessSaveData(wxT("TITLE;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessTitleList, &ContactData,
-                        wxT("ALTID"), &BusinessTitleListAltID,
-                        wxT("PID"), &BusinessTitleListPID,
-                        wxT("LANGUAGE"), &BusinessTitleListLanguage,
-                        wxT("PREF"), &BusinessTitleListPref,
-                        wxT(""), &BusinessTitleListTokens );
+                        &iter, &ContactEditorData.BusinessTitleList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.BusinessTitleListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessTitleListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.BusinessTitleListLanguage,
+                        wxT("PREF"), &ContactEditorData.BusinessTitleListPref,
+                        wxT(""), &ContactEditorData.BusinessTitleListTokens );
         
         ResetSaveProcessData();
         
@@ -1431,16 +1427,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralRoleList.begin();
-         iter != GeneralRoleList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralRoleList.begin();
+         iter != ContactEditorData.GeneralRoleList.end(); ++iter){
         
         ProcessSaveData(wxT("ROLE"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralRoleList, &ContactData,
-                        wxT("ALTID"), &GeneralRoleListAltID,
-                        wxT("PID"), &GeneralRoleListPID,
-                        wxT("LANGUAGE"), &GeneralRoleListLanguage,
-                        wxT("PREF"), &GeneralRoleListPref,
-                        wxT(""), &GeneralRoleListTokens );
+                        &iter, &ContactEditorData.GeneralRoleList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.GeneralRoleListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralRoleListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.GeneralRoleListLanguage,
+                        wxT("PREF"), &ContactEditorData.GeneralRoleListPref,
+                        wxT(""), &ContactEditorData.GeneralRoleListTokens );
         
         ResetSaveProcessData();
         
@@ -1448,16 +1444,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeRoleList.begin();
-         iter != HomeRoleList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeRoleList.begin();
+         iter != ContactEditorData.HomeRoleList.end(); ++iter){
         
         ProcessSaveData(wxT("ROLE;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeRoleList, &ContactData,
-                        wxT("ALTID"), &HomeRoleListAltID,
-                        wxT("PID"), &HomeRoleListPID,
-                        wxT("LANGUAGE"), &HomeRoleListLanguage,
-                        wxT("PREF"), &HomeRoleListPref,
-                        wxT(""), &HomeRoleListTokens );
+                        &iter, &ContactEditorData.HomeRoleList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.HomeRoleListAltID,
+                        wxT("PID"), &ContactEditorData.HomeRoleListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.HomeRoleListLanguage,
+                        wxT("PREF"), &ContactEditorData.HomeRoleListPref,
+                        wxT(""), &ContactEditorData.HomeRoleListTokens );
         
         ResetSaveProcessData();
         
@@ -1465,16 +1461,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessRoleList.begin();
-         iter != BusinessRoleList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessRoleList.begin();
+         iter != ContactEditorData.BusinessRoleList.end(); ++iter){
         
         ProcessSaveData(wxT("ROLE;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessRoleList, &ContactData,
-                        wxT("ALTID"), &BusinessRoleListAltID,
-                        wxT("PID"), &BusinessRoleListPID,
-                        wxT("LANGUAGE"), &BusinessRoleListLanguage,
-                        wxT("PREF"), &BusinessRoleListPref,
-                        wxT(""), &BusinessRoleListTokens );
+                        &iter, &ContactEditorData.BusinessRoleList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.BusinessRoleListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessRoleListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.BusinessRoleListLanguage,
+                        wxT("PREF"), &ContactEditorData.BusinessRoleListPref,
+                        wxT(""), &ContactEditorData.BusinessRoleListTokens );
         
         ResetSaveProcessData();
         
@@ -1482,17 +1478,17 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralOrganisationsList.begin();
-         iter != GeneralOrganisationsList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralOrganisationsList.begin();
+         iter != ContactEditorData.GeneralOrganisationsList.end(); ++iter){
         
         ProcessSaveData(wxT("ORG"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralOrganisationsList, &ContactData,
-                        wxT("ALTID"), &GeneralOrganisationsListAltID,
-                        wxT("PID"), &GeneralOrganisationsListPID,
-                        wxT("LANGUAGE"), &GeneralOrganisationsListLanguage,
-                        wxT("SORT-AS"), &GeneralOrganisationsListSortAs,
-                        wxT("PREF"), &GeneralOrganisationsListPref,
-                        wxT(""), &GeneralOrganisationsListTokens );
+                        &iter, &ContactEditorData.GeneralOrganisationsList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.GeneralOrganisationsListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralOrganisationsListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.GeneralOrganisationsListLanguage,
+                        wxT("SORT-AS"), &ContactEditorData.GeneralOrganisationsListSortAs,
+                        wxT("PREF"), &ContactEditorData.GeneralOrganisationsListPref,
+                        wxT(""), &ContactEditorData.GeneralOrganisationsListTokens );
         
         ResetSaveProcessData();
         
@@ -1500,17 +1496,17 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeOrganisationsList.begin();
-         iter != HomeOrganisationsList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeOrganisationsList.begin();
+         iter != ContactEditorData.HomeOrganisationsList.end(); ++iter){
         
         ProcessSaveData(wxT("ORG;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeOrganisationsList, &ContactData,
-                        wxT("ALTID"), &HomeOrganisationsListAltID,
-                        wxT("PID"), &HomeOrganisationsListPID,
-                        wxT("LANGUAGE"), &HomeOrganisationsListLanguage,
-                        wxT("SORT-AS"), &HomeOrganisationsListSortAs,
-                        wxT("PREF"), &HomeOrganisationsListPref,
-                        wxT(""), &HomeOrganisationsListTokens );
+                        &iter, &ContactEditorData.HomeOrganisationsList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.HomeOrganisationsListAltID,
+                        wxT("PID"), &ContactEditorData.HomeOrganisationsListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.HomeOrganisationsListLanguage,
+                        wxT("SORT-AS"), &ContactEditorData.HomeOrganisationsListSortAs,
+                        wxT("PREF"), &ContactEditorData.HomeOrganisationsListPref,
+                        wxT(""), &ContactEditorData.HomeOrganisationsListTokens );
         
         ResetSaveProcessData();
         
@@ -1518,17 +1514,17 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessOrganisationsList.begin();
-         iter != BusinessOrganisationsList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessOrganisationsList.begin();
+         iter != ContactEditorData.BusinessOrganisationsList.end(); ++iter){
         
         ProcessSaveData(wxT("ORG;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessOrganisationsList, &ContactData,
-                        wxT("ALTID"), &BusinessOrganisationsListAltID,
-                        wxT("PID"), &BusinessOrganisationsListPID,
-                        wxT("LANGUAGE"), &BusinessOrganisationsListLanguage,
-                        wxT("SORT-AS"), &BusinessOrganisationsListSortAs,
-                        wxT("PREF"), &BusinessOrganisationsListPref,
-                        wxT(""), &BusinessOrganisationsListTokens );
+                        &iter, &ContactEditorData.BusinessOrganisationsList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.BusinessOrganisationsListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessOrganisationsListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.BusinessOrganisationsListLanguage,
+                        wxT("SORT-AS"), &ContactEditorData.BusinessOrganisationsListSortAs,
+                        wxT("PREF"), &ContactEditorData.BusinessOrganisationsListPref,
+                        wxT(""), &ContactEditorData.BusinessOrganisationsListTokens );
         
         ResetSaveProcessData();
         
@@ -1536,16 +1532,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = GeneralNoteList.begin();
-         iter != GeneralNoteList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.GeneralNoteList.begin();
+         iter != ContactEditorData.GeneralNoteList.end(); ++iter){
         
         ProcessSaveData(wxT("NOTE"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &GeneralNoteList, &ContactData,
-                        wxT("ALTID"), &GeneralNoteListAltID,
-                        wxT("PID"), &GeneralNoteListPID,
-                        wxT("LANGUAGE"), &GeneralNoteListLanguage,
-                        wxT("PREF"), &GeneralNoteListPref,
-                        wxT(""), &GeneralNoteListTokens );
+                        &iter, &ContactEditorData.GeneralNoteList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.GeneralNoteListAltID,
+                        wxT("PID"), &ContactEditorData.GeneralNoteListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.GeneralNoteListLanguage,
+                        wxT("PREF"), &ContactEditorData.GeneralNoteListPref,
+                        wxT(""), &ContactEditorData.GeneralNoteListTokens );
         
         ResetSaveProcessData();
         
@@ -1553,16 +1549,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = HomeNoteList.begin();
-         iter != HomeNoteList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.HomeNoteList.begin();
+         iter != ContactEditorData.HomeNoteList.end(); ++iter){
         
         ProcessSaveData(wxT("NOTE;TYPE=home"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &HomeNoteList, &ContactData,
-                        wxT("ALTID"), &HomeNoteListAltID,
-                        wxT("PID"), &HomeNoteListPID,
-                        wxT("LANGUAGE"), &HomeNoteListLanguage,
-                        wxT("PREF"), &HomeNoteListPref,
-                        wxT(""), &HomeNoteListTokens );
+                        &iter, &ContactEditorData.HomeNoteList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.HomeNoteListAltID,
+                        wxT("PID"), &ContactEditorData.HomeNoteListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.HomeNoteListLanguage,
+                        wxT("PREF"), &ContactEditorData.HomeNoteListPref,
+                        wxT(""), &ContactEditorData.HomeNoteListTokens );
         
         ResetSaveProcessData();
         
@@ -1570,16 +1566,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = BusinessNoteList.begin();
-         iter != BusinessNoteList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.BusinessNoteList.begin();
+         iter != ContactEditorData.BusinessNoteList.end(); ++iter){
         
         ProcessSaveData(wxT("NOTE;TYPE=work"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &BusinessNoteList, &ContactData,
-                        wxT("ALTID"), &BusinessNoteListAltID,
-                        wxT("PID"), &BusinessNoteListPID,
-                        wxT("LANGUAGE"), &BusinessNoteListLanguage,
-                        wxT("PREF"), &BusinessNoteListPref,
-                        wxT(""), &BusinessNoteListTokens );
+                        &iter, &ContactEditorData.BusinessNoteList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.BusinessNoteListAltID,
+                        wxT("PID"), &ContactEditorData.BusinessNoteListPID,
+                        wxT("LANGUAGE"), &ContactEditorData.BusinessNoteListLanguage,
+                        wxT("PREF"), &ContactEditorData.BusinessNoteListPref,
+                        wxT(""), &ContactEditorData.BusinessNoteListTokens );
         
         ResetSaveProcessData();
         
@@ -1587,16 +1583,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = CategoriesList.begin();
-         iter != CategoriesList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.CategoriesList.begin();
+         iter != ContactEditorData.CategoriesList.end(); ++iter){
         
         ProcessSaveData(wxT("CATEGORIES"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &CategoriesList, &ContactData,
-                        wxT("ALTID"), &CategoriesListAltID,
-                        wxT("PID"), &CategoriesListPID,
-                        wxT("TYPE"), &CategoriesListType,
-                        wxT("PREF"), &CategoriesListPref,
-                        wxT(""), &CategoriesListTokens );
+                        &iter, &ContactEditorData.CategoriesList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.CategoriesListAltID,
+                        wxT("PID"), &ContactEditorData.CategoriesListPID,
+                        wxT("TYPE"), &ContactEditorData.CategoriesListType,
+                        wxT("PREF"), &ContactEditorData.CategoriesListPref,
+                        wxT(""), &ContactEditorData.CategoriesListTokens );
         
         ResetSaveProcessData();
         
@@ -1604,25 +1600,25 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Pictures.
     
-    for (std::map<int, std::string>::iterator iter = PicturesList.begin();
-         iter != PicturesList.end(); ++iter){
+    for (std::map<int, std::string>::iterator iter = ContactEditorData.PicturesList.begin();
+         iter != ContactEditorData.PicturesList.end(); ++iter){
         
         int intValueIndex = iter->first;
         
         std::map<int, std::string>::iterator stdstriter;
         std::map<int, wxString>::iterator enciter;
         
-        striter = PicturesListPictureType.find(intValueIndex);
-        enciter = PicturesListPicEncType.find(intValueIndex);
+        striter = ContactEditorData.PicturesListPictureType.find(intValueIndex);
+        enciter = ContactEditorData.PicturesListPicEncType.find(intValueIndex);
         
         ProcessSaveData(wxT("PHOTO"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &PicturesList, &striter,
+                        &iter, &ContactEditorData.PicturesList, &striter,
                         &enciter, &ContactData,
-                        wxT("ALTID"), &PicturesListAltID,
-                        wxT("PID"), &PicturesListPID,
-                        wxT("TYPE"), &PicturesListType,
-                        wxT("PREF"), &PicturesListPref,
-                        wxT(""), &PicturesListTokens);
+                        wxT("ALTID"), &ContactEditorData.PicturesListAltID,
+                        wxT("PID"), &ContactEditorData.PicturesListPID,
+                        wxT("TYPE"), &ContactEditorData.PicturesListType,
+                        wxT("PREF"), &ContactEditorData.PicturesListPref,
+                        wxT(""), &ContactEditorData.PicturesListTokens);
         
         ResetSaveProcessData();
         
@@ -1632,25 +1628,25 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Logos.
     
-    for (std::map<int, std::string>::iterator iter = LogosList.begin();
-         iter != LogosList.end(); ++iter){
+    for (std::map<int, std::string>::iterator iter = ContactEditorData.LogosList.begin();
+         iter != ContactEditorData.LogosList.end(); ++iter){
         
         int intValueIndex = iter->first;
         
         std::map<int, std::string>::iterator stdstriter;
         std::map<int, wxString>::iterator enciter;
         
-        striter = LogosListPictureType.find(intValueIndex);
-        enciter = LogosListPicEncType.find(intValueIndex);
+        striter = ContactEditorData.LogosListPictureType.find(intValueIndex);
+        enciter = ContactEditorData.LogosListPicEncType.find(intValueIndex);
         
         ProcessSaveData(wxT("LOGO"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &LogosList, &striter,
+                        &iter, &ContactEditorData.LogosList, &striter,
                         &enciter, &ContactData,
-                        wxT("ALTID"), &LogosListAltID,
-                        wxT("PID"), &LogosListPID,
-                        wxT("TYPE"), &LogosListType,
-                        wxT("PREF"), &LogosListPref,
-                        wxT(""), &LogosListTokens );
+                        wxT("ALTID"), &ContactEditorData.LogosListAltID,
+                        wxT("PID"), &ContactEditorData.LogosListPID,
+                        wxT("TYPE"), &ContactEditorData.LogosListType,
+                        wxT("PREF"), &ContactEditorData.LogosListPref,
+                        wxT(""), &ContactEditorData.LogosListTokens );
         
         ResetSaveProcessData();
         
@@ -1660,25 +1656,25 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // Sounds.
     
-    for (std::map<int, std::string>::iterator iter = SoundsList.begin();
-         iter != SoundsList.end(); ++iter){
+    for (std::map<int, std::string>::iterator iter = ContactEditorData.SoundsList.begin();
+         iter != ContactEditorData.SoundsList.end(); ++iter){
         
         int intValueIndex = iter->first;
         
         std::map<int, std::string>::iterator stdstriter;
         std::map<int, wxString>::iterator enciter;
         
-        striter = SoundsListAudioType.find(intValueIndex);
-        enciter = SoundsListAudioEncType.find(intValueIndex);
+        striter = ContactEditorData.SoundsListAudioType.find(intValueIndex);
+        enciter = ContactEditorData.SoundsListAudioEncType.find(intValueIndex);
         
         ProcessSaveData(wxT("SOUND"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &SoundsList, &striter,
+                        &iter, &ContactEditorData.SoundsList, &striter,
                         &enciter, &ContactData,
-                        wxT("ALTID"), &SoundsListAltID,
-                        wxT("PID"), &SoundsListPID,
-                        wxT("TYPE"), &SoundsListType,
-                        wxT("PREF"), &SoundsListPref,
-                        wxT(""), &SoundsListTokens );
+                        wxT("ALTID"), &ContactEditorData.SoundsListAltID,
+                        wxT("PID"), &ContactEditorData.SoundsListPID,
+                        wxT("TYPE"), &ContactEditorData.SoundsListType,
+                        wxT("PREF"), &ContactEditorData.SoundsListPref,
+                        wxT(""), &ContactEditorData.SoundsListTokens );
         
         ResetSaveProcessData();
         
@@ -1686,17 +1682,17 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = CalendarList.begin();
-         iter != CalendarList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.CalendarList.begin();
+         iter != ContactEditorData.CalendarList.end(); ++iter){
         
         ProcessSaveData(wxT("CALURI"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &CalendarList, &ContactData,
-                        wxT("ALTID"), &CalendarListAltID,
-                        wxT("PID"), &CalendarListPID,
-                        wxT("MEDIATYPE"), &CalendarListMediatype,
-                        wxT("TYPE"), &CalendarListType,
-                        wxT("PREF"), &CalendarListPref,
-                        wxT(""), &CalendarListTokens );
+                        &iter, &ContactEditorData.CalendarList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.CalendarListAltID,
+                        wxT("PID"), &ContactEditorData.CalendarListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.CalendarListMediatype,
+                        wxT("TYPE"), &ContactEditorData.CalendarListType,
+                        wxT("PREF"), &ContactEditorData.CalendarListPref,
+                        wxT(""), &ContactEditorData.CalendarListTokens );
         
         ResetSaveProcessData();
         
@@ -1704,17 +1700,17 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = CalendarRequestList.begin();
-         iter != CalendarRequestList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.CalendarRequestList.begin();
+         iter != ContactEditorData.CalendarRequestList.end(); ++iter){
         
         ProcessSaveData(wxT("CALADRURI"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &CalendarRequestList, &ContactData,
-                        wxT("ALTID"), &CalendarRequestListAltID,
-                        wxT("PID"), &CalendarRequestListPID,
-                        wxT("MEDIATYPE"), &CalendarRequestListMediatype,
-                        wxT("TYPE"), &CalendarRequestListType,
-                        wxT("PREF"), &CalendarRequestListPref,
-                        wxT(""), &CalendarRequestListTokens );
+                        &iter, &ContactEditorData.CalendarRequestList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.CalendarRequestListAltID,
+                        wxT("PID"), &ContactEditorData.CalendarRequestListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.CalendarRequestListMediatype,
+                        wxT("TYPE"), &ContactEditorData.CalendarRequestListType,
+                        wxT("PREF"), &ContactEditorData.CalendarRequestListPref,
+                        wxT(""), &ContactEditorData.CalendarRequestListTokens );
         
         ResetSaveProcessData();
         
@@ -1722,30 +1718,30 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    for (std::map<int,wxString>::iterator iter = FreeBusyList.begin();
-         iter != FreeBusyList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.FreeBusyList.begin();
+         iter != ContactEditorData.FreeBusyList.end(); ++iter){
         
         ProcessSaveData(wxT("FBURL"), &strValue2, &boolValue2, &boolValue,
-                        &iter, &FreeBusyList, &ContactData,
-                        wxT("ALTID"), &FreeBusyListAltID,
-                        wxT("PID"), &FreeBusyListPID,
-                        wxT("MEDIATYPE"), &FreeBusyListMediatype,
-                        wxT("TYPE"), &FreeBusyListType,
-                        wxT("PREF"), &FreeBusyListPref,
-                        wxT(""), &FreeBusyListTokens );
+                        &iter, &ContactEditorData.FreeBusyList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.FreeBusyListAltID,
+                        wxT("PID"), &ContactEditorData.FreeBusyListPID,
+                        wxT("MEDIATYPE"), &ContactEditorData.FreeBusyListMediatype,
+                        wxT("TYPE"), &ContactEditorData.FreeBusyListType,
+                        wxT("PREF"), &ContactEditorData.FreeBusyListPref,
+                        wxT(""), &ContactEditorData.FreeBusyListTokens );
         
         ResetSaveProcessData();
         
     }
     
-    for (std::map<int, wxString>::iterator iter = KeyList.begin();
-         iter != KeyList.end(); ++iter){
+    for (std::map<int, wxString>::iterator iter = ContactEditorData.KeyList.begin();
+         iter != ContactEditorData.KeyList.end(); ++iter){
         
         intValue2 = iter->first;
         
         // Process Alternative ID.
         
-        striter = KeyListAltID.find(intValue2);
+        striter = ContactEditorData.KeyListAltID.find(intValue2);
         
         if (striter->first == intValue2){
             
@@ -1776,7 +1772,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Process PID.
         
-        striter = KeyListPID.find(intValue2);
+        striter = ContactEditorData.KeyListPID.find(intValue2);
         
         if (striter->first == intValue2){
             
@@ -1807,7 +1803,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Process Type.
         
-        striter = KeyListType.find(intValue2);
+        striter = ContactEditorData.KeyListType.find(intValue2);
         
         if (striter->first == intValue2){
             
@@ -1836,7 +1832,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
             
         }
         
-        intiter = KeyListPref.find(intValue2);
+        intiter = ContactEditorData.KeyListPref.find(intValue2);
         
         if (intiter->first == intValue2){
             
@@ -1864,7 +1860,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Process Tokens.
         
-        striter = KeyListTokens.find(intValue2);
+        striter = ContactEditorData.KeyListTokens.find(intValue2);
         
         if (striter->first == intValue2){
             
@@ -1897,7 +1893,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         std::map<int, wxString>::iterator enciter;
         
-        striter = KeyListDataType.find(intValue2);     
+        striter = ContactEditorData.KeyListDataType.find(intValue2);   
         //enciter = KeyListAudioEncType.find(intValue2);
         
         wxString strValueData;
@@ -1927,14 +1923,14 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();   
     
-    for (std::map<int,wxString>::iterator iter = VendorList.begin();
-         iter != VendorList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.VendorList.begin();
+         iter != ContactEditorData.VendorList.end(); ++iter){
         
         intValue2 = iter->first;       
         
         // Get the IANA PEN number.
         
-        striter = VendorListPEN.find(intValue2);
+        striter = ContactEditorData.VendorListPEN.find(intValue2);
         
         if (striter->first == intValue2){
             
@@ -1944,7 +1940,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get the element name.
         
-        striter = VendorListElement.find(intValue2);
+        striter = ContactEditorData.VendorListElement.find(intValue2);
         
         if (striter->first == intValue2){
             
@@ -1954,7 +1950,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get the address.
         
-        striter = VendorList.find(intValue2);
+        striter = ContactEditorData.VendorList.find(intValue2);
         
         if (striter->first == intValue2){
             
@@ -1982,14 +1978,14 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     // X-Tokens.
     
-    for (std::map<int,wxString>::iterator iter = XTokenList.begin();
-         iter != XTokenList.end(); ++iter){
+    for (std::map<int,wxString>::iterator iter = ContactEditorData.XTokenList.begin();
+         iter != ContactEditorData.XTokenList.end(); ++iter){
         
         intValue2 = iter->first;       
         
         // Get the element name.
         
-        striter = XTokenListTokens.find(intValue2);
+        striter = ContactEditorData.XTokenListTokens.find(intValue2);
         
         if (striter->first == intValue2){
             
@@ -1999,7 +1995,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         // Get the address.
         
-        striter = XTokenList.find(intValue2);
+        striter = ContactEditorData.XTokenList.find(intValue2);
         
         if (striter->first == intValue2){
             
@@ -2025,22 +2021,22 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     
     ResetSaveProcessData();
     
-    if (FullNamesList.size() == 0){
+    if (ContactEditorData.FullNamesList.size() == 0){
         
         wxString FullName = cmbDisplayAs->GetValue();
-        FullNamesList.insert(std::make_pair(0, FullName));
-        FullNamesListAltID.insert(std::make_pair(0, wxT("")));
-        FullNamesListPID.insert(std::make_pair(0, wxT("")));
-        FullNamesListType.insert(std::make_pair(0, wxT("")));
-        FullNamesListLanguage.insert(std::make_pair(0, wxT("")));
-        FullNamesListPref.insert(std::make_pair(0, 0));
-        FullNamesListTokens.insert(std::make_pair(0, wxT("")));
+        ContactEditorData.FullNamesList.insert(std::make_pair(0, FullName));
+        ContactEditorData.FullNamesListAltID.insert(std::make_pair(0, wxT("")));
+        ContactEditorData.FullNamesListPID.insert(std::make_pair(0, wxT("")));
+        ContactEditorData.FullNamesListType.insert(std::make_pair(0, wxT("")));
+        ContactEditorData.FullNamesListLanguage.insert(std::make_pair(0, wxT("")));
+        ContactEditorData.FullNamesListPref.insert(std::make_pair(0, 0));
+        ContactEditorData.FullNamesListTokens.insert(std::make_pair(0, wxT("")));
         FNFirst = FALSE;
         
     }
     
-    for (std::map<int, wxString>::iterator iter = FullNamesList.begin();
-         iter != FullNamesList.end(); ++iter){
+    for (std::map<int, wxString>::iterator iter = ContactEditorData.FullNamesList.begin();
+         iter != ContactEditorData.FullNamesList.end(); ++iter){
         
         if (FNFirst == TRUE){
             
@@ -2051,16 +2047,16 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
         
         std::map<int,wxString>::iterator mapS;
         
-        mapS = FullNamesListTokens.find(iter->first);
+        mapS = ContactEditorData.FullNamesListTokens.find(iter->first);
         
         ProcessSaveData(wxT("FN"), &strValue2, &boolValue2, &boolValue, 
-                        &iter, &FullNamesList, &ContactData,
-                        wxT("ALTID"), &FullNamesListAltID,
-                        wxT("PID"), &FullNamesListPID,
-                        wxT("TYPE"), &FullNamesListType,
-                        wxT("LANGUAGE"), &FullNamesListLanguage,
-                        wxT("PREF"), &FullNamesListPref,
-                        wxT(""), &FullNamesListTokens );
+                        &iter, &ContactEditorData.FullNamesList, &ContactData,
+                        wxT("ALTID"), &ContactEditorData.FullNamesListAltID,
+                        wxT("PID"), &ContactEditorData.FullNamesListPID,
+                        wxT("TYPE"), &ContactEditorData.FullNamesListType,
+                        wxT("LANGUAGE"), &ContactEditorData.FullNamesListLanguage,
+                        wxT("PREF"), &ContactEditorData.FullNamesListPref,
+                        wxT(""), &ContactEditorData.FullNamesListTokens );
         
         // Get the address.
         
@@ -2152,7 +2148,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     //   DateRev.Append(wxString DateTimeNow->);
     DateRev.Append(wxT("Z"));    
     
-    ContactData.Add(wxT("UID"), UIDToken, FALSE);
+    ContactData.Add(wxT("UID"), ContactEditorData.UIDToken, FALSE);
     
     // End the vCard File.
     
@@ -2302,8 +2298,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
     ucd->ContactName = cmbDisplayAs->GetValue();
     ucd->ContactNameArray = ContactData.GetName();
     
-    for (std::map<int,wxString>::iterator gniter = GeneralNicknamesList.begin();
-         gniter != GeneralNicknamesList.end(); gniter++){
+    for (std::map<int,wxString>::iterator gniter = ContactEditorData.GeneralNicknamesList.begin();
+         gniter != ContactEditorData.GeneralNicknamesList.end(); gniter++){
         
         ucd->ContactNickname = gniter->second;
         break;
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy