Removed unused variable, code formatting cleanup and set a variable to return as...

diff --git a/source/contacteditor/frmContactEditorGroups.cpp b/source/contacteditor/frmContactEditorGroups.cpp
index 46a8253..d72c8bc 100755 (executable)
--- a/source/contacteditor/frmContactEditorGroups.cpp
+++ b/source/contacteditor/frmContactEditorGroups.cpp
@@ -150,18 +150,18 @@ void frmContactEditorGroup::FetchContacts( wxInitDialogEvent& event )
                \r
     } else {\r
                \r
-       ContactIndex = vCardNamesDsc.size() - 1;\r
+        ContactIndex = (int)(vCardNamesDsc.size() - 1);\r
                \r
-        for (std::map<wxString,ContactData>::iterator iter = vCardNamesDsc.begin(); \r
-       iter != vCardNamesDsc.end(); ++iter){\r
+        for (std::map<wxString,ContactData>::iterator iter = vCardNamesDsc.begin();\r
+             iter != vCardNamesDsc.end(); ++iter){\r
 \r
-          chkContacts->InsertItems(1, &iter->first, 0);\r
+            chkContacts->InsertItems(1, &iter->first, 0);\r
 \r
-          ContactNamesData.insert(std::make_pair(ContactIndex, iter->second));         \r
-       \r
-          ContactIndex--;\r
+            ContactNamesData.insert(std::make_pair(ContactIndex, iter->second));\r
+        \r
+            ContactIndex--;\r
 \r
-       }\r
+        }\r
        \r
     }\r
 \r
@@ -192,8 +192,6 @@ void frmContactEditorGroup::ProcessData( wxCommandEvent& event )
                        \r
                        }\r
                        \r
-                       std::map<int, ContactData>::iterator CDataIter = ContactNamesData.find(i);\r
-                       \r
                        wxListItem ItemData;\r
                        ItemData.SetId(0);\r
                        ItemData.SetText(chkContacts->GetString(i));\r