From 256f6448615b993de706c33a7e114a2822c96ecc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 6 Feb 2016 18:29:27 +0100 Subject: [PATCH] Use a separate variable for each loop in the widgets sample This avoids VC14 variable shadowing warning and is also just better practice. --- samples/widgets/itemcontainer.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/samples/widgets/itemcontainer.cpp b/samples/widgets/itemcontainer.cpp index ba0afc0c74..bb081c8419 100644 --- a/samples/widgets/itemcontainer.cpp +++ b/samples/widgets/itemcontainer.cpp @@ -272,8 +272,7 @@ void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&) StartTest(wxT("Append some items with data objects")); wxClientData **objects = new wxClientData *[m_items.GetCount()]; - unsigned i; - for ( i = 0; i < m_items.GetCount(); ++i ) + for ( unsigned i = 0; i < m_items.GetCount(); ++i ) objects[i] = CreateClientData(i); m_container->Append(m_items, objects); EndTest(expected_result); @@ -281,19 +280,19 @@ void ItemContainerWidgetsPage::OnButtonTestItemContainer(wxCommandEvent&) StartTest(wxT("Append some items with data")); void **data = new void *[m_items.GetCount()]; - for ( i = 0; i < m_items.GetCount(); ++i ) + for ( unsigned i = 0; i < m_items.GetCount(); ++i ) data[i] = wxUIntToPtr(i); m_container->Append(m_items, data); EndTest(expected_result); delete[] data; StartTest(wxT("Append some items with data, one by one")); - for ( i = 0; i < m_items.GetCount(); ++i ) + for ( unsigned i = 0; i < m_items.GetCount(); ++i ) m_container->Append(m_items[i], wxUIntToPtr(i)); EndTest(expected_result); StartTest(wxT("Append some items with data objects, one by one")); - for ( i = 0; i < m_items.GetCount(); ++i ) + for ( unsigned i = 0; i < m_items.GetCount(); ++i ) m_container->Append(m_items[i], CreateClientData(i)); EndTest(expected_result);