From e08c58ed9f068d990c4a8833f9c049b5957cade6 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 2 Aug 2015 19:57:50 +0100 Subject: [PATCH] Removed unused variable, code formatting cleanup and set a variable to return as an integer. --- .../contacteditor/frmContactEditorGroups.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/source/contacteditor/frmContactEditorGroups.cpp b/source/contacteditor/frmContactEditorGroups.cpp index 46a8253..d72c8bc 100755 --- a/source/contacteditor/frmContactEditorGroups.cpp +++ b/source/contacteditor/frmContactEditorGroups.cpp @@ -150,18 +150,18 @@ void frmContactEditorGroup::FetchContacts( wxInitDialogEvent& event ) } else { - ContactIndex = vCardNamesDsc.size() - 1; + ContactIndex = (int)(vCardNamesDsc.size() - 1); - for (std::map::iterator iter = vCardNamesDsc.begin(); - iter != vCardNamesDsc.end(); ++iter){ + for (std::map::iterator iter = vCardNamesDsc.begin(); + iter != vCardNamesDsc.end(); ++iter){ - chkContacts->InsertItems(1, &iter->first, 0); + chkContacts->InsertItems(1, &iter->first, 0); - ContactNamesData.insert(std::make_pair(ContactIndex, iter->second)); - - ContactIndex--; + ContactNamesData.insert(std::make_pair(ContactIndex, iter->second)); + + ContactIndex--; - } + } } @@ -192,8 +192,6 @@ void frmContactEditorGroup::ProcessData( wxCommandEvent& event ) } - std::map::iterator CDataIter = ContactNamesData.find(i); - wxListItem ItemData; ItemData.SetId(0); ItemData.SetText(chkContacts->GetString(i)); -- 2.39.2