Merged unpushed alterations of contacteditor/frmContactEditor-Business.cpp

Code is now tabbed and functions are described.

diff --git a/source/contacteditor/frmContactEditor-Business.cpp b/source/contacteditor/frmContactEditor-Business.cpp
index a5e39c7..7294d94 100644 (file)
--- a/source/contacteditor/frmContactEditor-Business.cpp
+++ b/source/contacteditor/frmContactEditor-Business.cpp
@@ -37,12 +37,9 @@ void frmContactEditor::AddBusinessNickname( wxCommandEvent& event )
 {
 
        // Bring up the window for adding a nickname.
-
-       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,
@@ -124,12 +121,9 @@ void frmContactEditor::AddBusinessAddress( wxCommandEvent& event )
 {
 
        // Bring up the window for adding an address.
-
-       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,
@@ -227,12 +221,9 @@ void frmContactEditor::AddBusinessEmail( wxCommandEvent& event )
 {
 
        // Bring up the window for adding an email address.
-
-       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,
@@ -308,12 +299,9 @@ void frmContactEditor::AddBusinessIM( wxCommandEvent& event )
 {
 
        // Bring up the window for adding an IM address.
-
-       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,
@@ -394,12 +382,9 @@ void frmContactEditor::AddBusinessTelephone( wxCommandEvent& event )
 {
 
        // Bring up the window for adding a telephone number.
-
-       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,
@@ -477,12 +462,9 @@ void frmContactEditor::AddBusinessLanguage( wxCommandEvent& event )
 {
 
        // Bring up the window for adding a language.
-
-       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,
@@ -558,12 +540,9 @@ void frmContactEditor::AddBusinessTimezone( wxCommandEvent& event )
 {
 
        // Bring up the window for adding a timezone.
-
-       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,
@@ -641,12 +620,9 @@ void frmContactEditor::AddBusinessGeoposition( wxCommandEvent& event )
 {
 
        // Bring up the window for adding a geoposition location.
-
-       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,
@@ -727,12 +703,9 @@ void frmContactEditor::AddBusinessWebsite( wxCommandEvent& event )
 {
 
        // Bring up the window for adding a website.
-
-       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,
@@ -810,12 +783,9 @@ void frmContactEditor::AddBusinessTitle( wxCommandEvent& event )
 {
 
        // Bring up the window for adding a title.
-
-       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,
@@ -893,12 +863,9 @@ void frmContactEditor::AddBusinessRole( wxCommandEvent& event )
 {
 
        // Bring up the window to add a role.
-
-       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,
@@ -977,11 +944,8 @@ void frmContactEditor::AddBusinessOrganisation( wxCommandEvent& event )
 
        // Bring up the window to add an organisation.
 
-       int intResult = 0;
-    
        frmContactEditorOrganisations *frameCEOrg = new frmContactEditorOrganisations ( this );
        frameCEOrg->SetEditorMode(FALSE, CE_WORK);
-       intResult = GetLastInt(&ContactEditorData.BusinessOrganisationsList);
        frameCEOrg->SetupPointers(&ContactEditorData.BusinessOrganisationsList,
                &ContactEditorData.BusinessOrganisationsListLanguage,
                &ContactEditorData.BusinessOrganisationsListSortAs,
@@ -1062,12 +1026,9 @@ void frmContactEditor::AddBusinessNote( wxCommandEvent& event )
 {
 
        // Bring up the window to add a note.
-
-       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,