Removed unused variables from contacteditor/frmContactEditor-Business.cpp

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

diff --git a/source/contacteditor/frmContactEditor-Business.cpp b/source/contacteditor/frmContactEditor-Business.cpp
index 81ce5cd..923d57e 100644 (file)
--- a/source/contacteditor/frmContactEditor-Business.cpp
+++ b/source/contacteditor/frmContactEditor-Business.cpp
@@ -35,11 +35,9 @@
 
 void frmContactEditor::AddBusinessNickname( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorNickname *frameCENickname = new frmContactEditorNickname ( this );
     frameCENickname->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessNicknamesList);
     frameCENickname->SetupPointers(&ContactEditorData.BusinessNicknamesList,
                                    &ContactEditorData.BusinessNicknamesListAltID,
                                    &ContactEditorData.BusinessNicknamesListPID,
@@ -106,11 +104,9 @@ void frmContactEditor::DeleteBusinessNickname( wxCommandEvent& event )
 
 void frmContactEditor::AddBusinessAddress( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorAddress *frameCEAddress = new frmContactEditorAddress ( this );
     frameCEAddress->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessAddressList);
     frameCEAddress->SetupPointers(&ContactEditorData.BusinessAddressList,
                                   &ContactEditorData.BusinessAddressListTown,
                                   &ContactEditorData.BusinessAddressListCounty,
@@ -194,11 +190,9 @@ void frmContactEditor::DeleteBusinessAddress( wxCommandEvent& event )
 
 void frmContactEditor::AddBusinessEmail( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorEmail *frameCEEmail = new frmContactEditorEmail ( this );
     frameCEEmail->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessAddressList);
     frameCEEmail->SetupPointers(&ContactEditorData.BusinessEmailList,
                                 &ContactEditorData.BusinessEmailListAltID,
                                 &ContactEditorData.BusinessEmailListPID,
@@ -260,15 +254,14 @@ void frmContactEditor::DeleteBusinessEmail( wxCommandEvent& event )
 
 void frmContactEditor::AddBusinessIM( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorIM *frameCEIM = new frmContactEditorIM ( this );
     frameCEIM->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessIMList);
     frameCEIM->SetupPointers(&ContactEditorData.BusinessIMList,
                              &ContactEditorData.BusinessIMListAltID,
                              &ContactEditorData.BusinessIMListPID,
                              &ContactEditorData.BusinessIMListType,
+                            &ContactEditorData.BusinessIMListTypeInfo,
                              &ContactEditorData.BusinessIMListTokens,
                              &ContactEditorData.BusinessIMListMediatype,
                              &ContactEditorData.BusinessIMListPref,
@@ -295,6 +288,7 @@ void frmContactEditor::ModifyBusinessIM( wxCommandEvent& event )
                              &ContactEditorData.BusinessIMListAltID,
                              &ContactEditorData.BusinessIMListPID,
                              &ContactEditorData.BusinessIMListType,
+                            &ContactEditorData.BusinessIMListTypeInfo,
                              &ContactEditorData.BusinessIMListTokens,
                              &ContactEditorData.BusinessIMListMediatype,
                              &ContactEditorData.BusinessIMListPref,
@@ -321,22 +315,22 @@ void frmContactEditor::DeleteBusinessIM( wxCommandEvent& event )
     
     DeleteMapData(intSelectedData, &ContactEditorData.BusinessIMList,
                   &ContactEditorData.BusinessIMListAltID, &ContactEditorData.BusinessIMListPID,
-                  &ContactEditorData.BusinessIMListType, &ContactEditorData.BusinessIMListTokens,
-                  &ContactEditorData.BusinessIMListMediatype, &ContactEditorData.BusinessIMListPref);
+                  &ContactEditorData.BusinessIMListType, &ContactEditorData.BusinessIMListTypeInfo,
+                 &ContactEditorData.BusinessIMListTokens, &ContactEditorData.BusinessIMListMediatype, 
+                 &ContactEditorData.BusinessIMListPref);
     
 }
 
 void frmContactEditor::AddBusinessTelephone( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorTelephone *frameCETel = new frmContactEditorTelephone ( this );
     frameCETel->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessTelephoneList);
     frameCETel->SetupPointers(&ContactEditorData.BusinessTelephoneList,
                               &ContactEditorData.BusinessTelephoneListAltID,
                               &ContactEditorData.BusinessTelephoneListPID,
                               &ContactEditorData.BusinessTelephoneListType,
+                              &ContactEditorData.BusinessTelephoneListTypeInfo,
                               &ContactEditorData.BusinessTelephoneListTokens,
                               &ContactEditorData.BusinessTelephoneListPref,
                               lboBusinessTelephone,
@@ -362,6 +356,7 @@ void frmContactEditor::ModifyBusinessTelephone( wxCommandEvent& event )
                               &ContactEditorData.BusinessTelephoneListAltID,
                               &ContactEditorData.BusinessTelephoneListPID,
                               &ContactEditorData.BusinessTelephoneListType,
+                              &ContactEditorData.BusinessTelephoneListTypeInfo,
                               &ContactEditorData.BusinessTelephoneListTokens,
                               &ContactEditorData.BusinessTelephoneListPref,
                               lboBusinessTelephone,
@@ -387,18 +382,16 @@ void frmContactEditor::DeleteBusinessTelephone( wxCommandEvent& event )
     
     DeleteMapData(intSelectedData, &ContactEditorData.BusinessTelephoneList,
                   &ContactEditorData.BusinessTelephoneListAltID, &ContactEditorData.BusinessTelephoneListPID,
-                  &ContactEditorData.BusinessTelephoneListType, &ContactEditorData.BusinessTelephoneListTokens,
-                  &ContactEditorData.BusinessTelephoneListPref);
+                  &ContactEditorData.BusinessTelephoneListType, &ContactEditorData.BusinessTelephoneListTypeInfo,
+                 &ContactEditorData.BusinessTelephoneListTokens, &ContactEditorData.BusinessTelephoneListPref);
     
 }
 
 void frmContactEditor::AddBusinessLanguage( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorLanguages *frameCELang = new frmContactEditorLanguages ( this );
     frameCELang->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessLanguageList);
     frameCELang->SetupPointers(&ContactEditorData.BusinessLanguageList,
                                &ContactEditorData.BusinessLanguageListAltID,
                                &ContactEditorData.BusinessLanguageListPID,
@@ -460,11 +453,9 @@ void frmContactEditor::DeleteBusinessLanguage( wxCommandEvent& event )
 
 void frmContactEditor::AddBusinessTimezone( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorTimezones *frameCETZ = new frmContactEditorTimezones ( this );
     frameCETZ->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessTZList);
     frameCETZ->SetupPointers(&ContactEditorData.BusinessTZList,
                              &ContactEditorData.BusinessTZListAltID,
                              &ContactEditorData.BusinessTZListPID,
@@ -528,15 +519,14 @@ void frmContactEditor::DeleteBusinessTimezone( wxCommandEvent& event )
 
 void frmContactEditor::AddBusinessGeoposition( wxCommandEvent& event )
 {
-    int intResult = 0;
-    
+       
     frmContactEditorGeoposition *frameCEGeo = new frmContactEditorGeoposition ( this );
     frameCEGeo->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessGeographyList);
     frameCEGeo->SetupPointers(&ContactEditorData.BusinessGeographyList,
                               &ContactEditorData.BusinessGeographyListAltID,
                               &ContactEditorData.BusinessGeographyListPID,
                               &ContactEditorData.BusinessGeographyListType,
+                              &ContactEditorData.BusinessGeographyListDataType,
                               &ContactEditorData.BusinessGeographyListTokens,
                               &ContactEditorData.BusinessGeographyListMediatype,
                               &ContactEditorData.BusinessGeographyListPref,
@@ -563,6 +553,7 @@ void frmContactEditor::ModifyBusinessGeoposition( wxCommandEvent& event )
                               &ContactEditorData.BusinessGeographyListAltID,
                               &ContactEditorData.BusinessGeographyListPID,
                               &ContactEditorData.BusinessGeographyListType,
+                              &ContactEditorData.BusinessGeographyListDataType,
                               &ContactEditorData.BusinessGeographyListTokens,
                               &ContactEditorData.BusinessGeographyListMediatype,
                               &ContactEditorData.BusinessGeographyListPref,
@@ -589,18 +580,17 @@ void frmContactEditor::DeleteBusinessGeoposition( wxCommandEvent& event )
     
     DeleteMapData(intSelectedData, &ContactEditorData.BusinessGeographyList,
                   &ContactEditorData.BusinessGeographyListAltID, &ContactEditorData.BusinessGeographyListPID,
-                  &ContactEditorData.BusinessGeographyListType, &ContactEditorData.BusinessGeographyListTokens,
-                  &ContactEditorData.BusinessGeographyListMediatype, &ContactEditorData.BusinessGeographyListPref);
+                  &ContactEditorData.BusinessGeographyListType, &ContactEditorData.BusinessGeographyListDataType,
+                 &ContactEditorData.BusinessGeographyListTokens, &ContactEditorData.BusinessGeographyListMediatype, 
+                 &ContactEditorData.BusinessGeographyListPref);
     
 }
 
 void frmContactEditor::AddBusinessWebsite( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorWebsites *frameCEWeb = new frmContactEditorWebsites ( this );
     frameCEWeb->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessWebsiteList);
     frameCEWeb->SetupPointers(&ContactEditorData.BusinessWebsiteList,
                               &ContactEditorData.BusinessWebsiteListAltID,
                               &ContactEditorData.BusinessWebsiteListPID,
@@ -664,11 +654,9 @@ void frmContactEditor::DeleteBusinessWebsite( wxCommandEvent& event )
 
 void frmContactEditor::AddBusinessTitle( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorTitles *frameCETitle = new frmContactEditorTitles ( this );
     frameCETitle->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessTitleList);
     frameCETitle->SetupPointers(&ContactEditorData.BusinessTitleList,
                                 &ContactEditorData.BusinessTitleListLanguage,
                                 &ContactEditorData.BusinessTitleListAltID,
@@ -732,11 +720,9 @@ void frmContactEditor::DeleteBusinessTitle( wxCommandEvent& event )
 
 void frmContactEditor::AddBusinessRole( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorRoles *frameCERole = new frmContactEditorRoles ( this );
     frameCERole->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessRoleList);
     frameCERole->SetupPointers(&ContactEditorData.BusinessRoleList,
                                &ContactEditorData.BusinessRoleListLanguage,
                                &ContactEditorData.BusinessRoleListAltID,
@@ -800,12 +786,10 @@ void frmContactEditor::DeleteBusinessRole( wxCommandEvent& event )
 
 void frmContactEditor::AddBusinessOrganisation( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this );
     frameCEOrg->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&GeneralOrganisationsList);
-    frameCEOrg->SetupPointers(&GeneralOrganisationsList,
+    frameCEOrg->SetupPointers(&ContactEditorData.BusinessOrganisationsList,
                               &ContactEditorData.BusinessOrganisationsListLanguage,
                               &ContactEditorData.BusinessOrganisationsListSortAs,
                               &ContactEditorData.BusinessOrganisationsListAltID,
@@ -871,11 +855,9 @@ void frmContactEditor::DeleteBusinessOrganisation( wxCommandEvent& event )
 
 void frmContactEditor::AddBusinessNote( wxCommandEvent& event )
 {
-    int intResult = 0;
     
     frmContactEditorNotes *frameCENote = new frmContactEditorNotes ( this );
     frameCENote->SetEditorMode(FALSE, CE_WORK);
-    intResult = GetLastInt(&ContactEditorData.BusinessNoteList);
     frameCENote->SetupPointers(&ContactEditorData.BusinessNoteList,
                                &ContactEditorData.BusinessNoteListLanguage,
                                &ContactEditorData.BusinessNoteListAltID,