diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-02-25 17:36:42 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-02-25 17:36:42 (GMT) |
| commit | 417e10a4a7114c113403907e711a95282aee6115 (patch) | |
| tree | f044b4d092b878c40818a06497732718b87b8596 /Source | |
| parent | ab761edaef03ede2e017ea2e7b76f4342fe444a1 (diff) | |
| download | CMake-417e10a4a7114c113403907e711a95282aee6115.zip CMake-417e10a4a7114c113403907e711a95282aee6115.tar.gz CMake-417e10a4a7114c113403907e711a95282aee6115.tar.bz2 | |
Remove warning about shadowing variable
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WXDialog/cmWXMainFrame.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Source/WXDialog/cmWXMainFrame.cxx b/Source/WXDialog/cmWXMainFrame.cxx index 3a7f482..bd71c17 100644 --- a/Source/WXDialog/cmWXMainFrame.cxx +++ b/Source/WXDialog/cmWXMainFrame.cxx @@ -922,9 +922,9 @@ void cmMainFrame::UpdateCacheValuesDisplay() if ( this->m_Update ) { // all the current values are not new any more - cmMainFrame::CacheMapType* items = this->m_CacheEntries; - for(cmMainFrame::CacheMapType::iterator i = items->begin(); - i != items->end(); ++i) + cmMainFrame::CacheMapType* uitems = this->m_CacheEntries; + for(cmMainFrame::CacheMapType::iterator i = uitems->begin(); + i != uitems->end(); ++i) { cmCacheProperty* item = i->second; item->SetNewFlag( false ); @@ -933,9 +933,9 @@ void cmMainFrame::UpdateCacheValuesDisplay() // redraw the list this->m_CacheValuesPanel->SetBackgroundColour(*wxWHITE); - cmMainFrame::CacheMapType* items = this->m_CacheEntries; - for(cmMainFrame::CacheMapType::iterator i = items->begin(); - i != items->end(); ++i) + cmMainFrame::CacheMapType* nitems = this->m_CacheEntries; + for(cmMainFrame::CacheMapType::iterator i = nitems->begin(); + i != nitems->end(); ++i) { cmCacheProperty* item = i->second; item->Remove(this->m_CacheValuesSizer, this->m_CacheValuesPanel); @@ -1025,9 +1025,9 @@ void cmMainFrame::UpdateCacheValuesDisplay() if(this->m_CacheEntries->size() > 0 && !cmSystemTools::GetErrorOccuredFlag()) { bool enable = true; - cmMainFrame::CacheMapType* items = this->m_CacheEntries; - for(cmMainFrame::CacheMapType::iterator i = items->begin(); - i != items->end(); i++) + cmMainFrame::CacheMapType* eitems = this->m_CacheEntries; + for(cmMainFrame::CacheMapType::iterator i = eitems->begin(); + i != eitems->end(); i++) { cmCacheProperty* item = i->second; if(item && item->GetNewFlag() && !item->IsRemoved()) @@ -1062,8 +1062,8 @@ void cmMainFrame::UpdateCacheValuesDisplay() int height = 0; // redraw the list cmMainFrame::CacheMapType::iterator nexti; - for(cmMainFrame::CacheMapType::iterator i = items->begin(); - i != items->end(); i = nexti) + for(cmMainFrame::CacheMapType::iterator i = nitems->begin(); + i != nitems->end(); i = nexti) { cmCacheProperty* item = i->second; nexti = i; @@ -1071,12 +1071,12 @@ void cmMainFrame::UpdateCacheValuesDisplay() if ( item->IsRemoved() ) { delete item; - items->erase(i); + nitems->erase(i); } } - for(cmMainFrame::CacheMapType::iterator i = items->begin(); - i != items->end(); i++) + for(cmMainFrame::CacheMapType::iterator i = nitems->begin(); + i != nitems->end(); i++) { cmCacheProperty* item = i->second; if((showadvancedvalues || !item->IsAdvanced()) && !item->GetNewFlag() ) @@ -1090,8 +1090,8 @@ void cmMainFrame::UpdateCacheValuesDisplay() } } } - for(cmMainFrame::CacheMapType::reverse_iterator i = items->rbegin(); - i != items->rend(); i++) + for(cmMainFrame::CacheMapType::reverse_iterator i = nitems->rbegin(); + i != nitems->rend(); i++) { cmCacheProperty* item = i->second; if((showadvancedvalues || !item->IsAdvanced()) && item->GetNewFlag()) |