From eea8b2916519afec5e1b110dd0c4036688da1169 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 13 Mar 2016 10:59:34 +0000 Subject: [PATCH] Removed commented out code from frmContactEditorAddress --- .../contacteditor/frmContactEditorAddress.cpp | 39 +------------------ 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/source/contacteditor/frmContactEditorAddress.cpp b/source/contacteditor/frmContactEditorAddress.cpp index 883e82e..6c68117 100644 --- a/source/contacteditor/frmContactEditorAddress.cpp +++ b/source/contacteditor/frmContactEditorAddress.cpp @@ -119,16 +119,11 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event ) AddressListTypePtr->insert(std::make_pair(AddressListIndex, wxT("work"))); } - - //AddressListTypePtr = &AddressListType; - + // Add the mediatype to the list (maps). AddressListMediatypePtr->insert(std::make_pair(AddressListIndex, wxT("text/plain"))); - //AddressListMediatypePtr = &AddressListMediatype; - //AddressListPrefPtr = &AddressListPref; - if (chkUsePref->IsChecked()){ AddressListPrefPtr->insert(std::make_pair(AddressListIndex, sliPriority->GetValue())); @@ -168,24 +163,6 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event ) wxString strValue; long longSelected = -1; - /* - strAddress.Append(wxT(";;")); - - strAddress.Append(txtAddress->GetValue()); - strAddress.Append(wxT(";")); - - strAddress.Append(txtTownCity->GetValue()); - strAddress.Append(wxT(";")); - - strAddress.Append(txtCounty->GetValue()); - strAddress.Append(wxT(";")); - - strAddress.Append(txtPostCode->GetValue()); - strAddress.Append(wxT(";")); - - strAddress.Append(txtCountry->GetValue()); - */ - AddressListPtr->erase(AddressListIndex); AddressListPtr->insert(std::make_pair(AddressListIndex, txtAddress->GetValue())); @@ -201,8 +178,6 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event ) AddressListCountryPtr->erase(AddressListIndex); AddressListCountryPtr->insert(std::make_pair(AddressListIndex, txtCountry->GetValue())); - //AddressListLabelPtr = &AddressListLabel; - // Add the label to the list (maps). AddressListLabelPtr->erase(AddressListIndex); @@ -214,8 +189,6 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event ) // Add the language to the list (maps). - //AddressListLangPtr = &AddressListLang; - AddressListLangPtr->erase(AddressListIndex); AddressListLangPtr->insert(std::make_pair(AddressListIndex, cmbLanguage->GetValue())); @@ -237,19 +210,12 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event ) AddressListTimezonePtr->erase(AddressListIndex); AddressListTimezonePtr->insert(std::make_pair(AddressListIndex, txtTimezone->GetValue())); - - // No need to update type since it will not have changed. - - //AddressListTypePtr = &AddressListType; // Add the mediatype to the list (maps). AddressListMediatypePtr->erase(AddressListIndex); AddressListMediatypePtr->insert(std::make_pair(AddressListIndex, wxT("text/plain"))); - //AddressListMediatypePtr = &AddressListMediatype; - //AddressListPrefPtr = &AddressListPref; - AddressListPrefPtr->erase(AddressListIndex); if (chkUsePref->IsChecked()){ @@ -450,9 +416,6 @@ void frmContactEditorAddress::SetEditorMode( bool EditMode, SectionType SectType } - //CaptureString(&strValue, TRUE); - //->Replace(wxT("\;"), wxT("\;;"), TRUE); - // Setup the Slider. intiter = AddressListPrefPtr->find(AddressListIndex); -- 2.39.5