diff --git a/Fireworks/Core/src/CmsShowCommon.cc b/Fireworks/Core/src/CmsShowCommon.cc index 2f7e079bc40d8..c2bf2e7a09b76 100644 --- a/Fireworks/Core/src/CmsShowCommon.cc +++ b/Fireworks/Core/src/CmsShowCommon.cc @@ -137,10 +137,9 @@ void CmsShowCommon::permuteColors() { void CmsShowCommon::randomizeColors() { // printf("Doing random_shuffle on existing colors ...\n"); - int vi = 0; for (FWEventItemsManager::const_iterator i = m_context->eventItemsManager()->begin(); i != m_context->eventItemsManager()->end(); - ++i, ++vi) { + ++i) { FWDisplayProperties prop = (*i)->defaultDisplayProperties(); int col = rand() % 17; // randomize in first row of palette diff --git a/Fireworks/Core/src/FWModelChangeManager.cc b/Fireworks/Core/src/FWModelChangeManager.cc index 0b19a447468d8..e9d2928cb202b 100644 --- a/Fireworks/Core/src/FWModelChangeManager.cc +++ b/Fireworks/Core/src/FWModelChangeManager.cc @@ -85,9 +85,8 @@ void FWModelChangeManager::endChanges() { //makes sure that 'changeSignalsAreDone is called if changeSignalsAreComing_ is sent bool guard(false); if (0 == --m_depth) { - unsigned int index = 0; for (std::set::iterator itChanges = m_itemChanges.begin(); itChanges != m_itemChanges.end(); - ++itChanges, ++index) { + ++itChanges) { if (!guard) { // std::shared_ptr done(this, &sendChangeSignalsAreDone); guard = true; @@ -109,7 +108,7 @@ void FWModelChangeManager::endChanges() { } m_itemChanges.clear(); - for (size_t ci = 0, ce = m_changes.size(), si = 0; ci != ce; ++ci, ++si) { + for (size_t ci = 0, ce = m_changes.size(); ci != ce; ++ci) { FWModelIds& changes = m_changes[ci]; if (not changes.empty()) { if (!guard) { diff --git a/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc b/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc index 6f85bf1b82c77..da8dcc2e1cfce 100644 --- a/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc +++ b/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc @@ -75,10 +75,9 @@ void FWPFCandidateWithHitsProxyBuilder::build(const FWEventItem* iItem, if (candidates == nullptr) return; - Int_t idx = 0; initPFRecHitsCollections(); for (reco::PFCandidateCollection::const_iterator it = candidates->begin(), itEnd = candidates->end(); it != itEnd; - ++it, ++idx) { + ++it) { TEveCompound* comp = createCompound(); setupAddElement(comp, product); // printf("products size %d/%d \n", (int)iItem->size(), product->NumChildren());