diff --git a/kcachegrind/cgview/main.cpp b/kcachegrind/cgview/main.cpp index 3cf9382b..9cf0cb8d 100644 --- a/kcachegrind/cgview/main.cpp +++ b/kcachegrind/cgview/main.cpp @@ -130,11 +130,10 @@ int main(int argc, char** argv) for ( it = d->functionMap().begin(); it != d->functionMap().end(); ++it ) flist.append(&(*it)); - TraceFunction *f; - foreach(f, d->functionCycles()) + foreach(TraceFunction *f, d->functionCycles()) flist.append(f); - foreach(f, flist) { + foreach(TraceFunction *f, flist) { if (sortByCount) hc.addCost(f, f->calledCount()); else if (sortByExcl) @@ -149,7 +148,7 @@ int main(int argc, char** argv) out.setFieldAlignment(QTextStream::AlignRight); for(int i=0; i0) out << endl; diff --git a/kcachegrind/libcore/tracedata.cpp b/kcachegrind/libcore/tracedata.cpp index 481b465b..4324e622 100644 --- a/kcachegrind/libcore/tracedata.cpp +++ b/kcachegrind/libcore/tracedata.cpp @@ -3659,13 +3659,12 @@ ProfileCostArray* TraceData::search(ProfileContext::Type t, QString name, TraceFunctionCycle* TraceData::functionCycle(TraceFunction* f) { - TraceFunctionCycle* cycle; - foreach(cycle, _functionCycles) + foreach(TraceFunctionCycle* cycle, _functionCycles) if (cycle->base() == f) return cycle; _functionCycleCount++; - cycle = new TraceFunctionCycle(f, _functionCycleCount); + TraceFunctionCycle* cycle = new TraceFunctionCycle(f, _functionCycleCount); _functionCycles.append(cycle); return cycle; diff --git a/kcachegrind/libviews/partview.cpp b/kcachegrind/libviews/partview.cpp index fe1eb5f6..613e9ff5 100644 --- a/kcachegrind/libviews/partview.cpp +++ b/kcachegrind/libviews/partview.cpp @@ -232,10 +232,9 @@ void PartView::refresh() clear(); QList items; - QTreeWidgetItem* item; foreach(TracePart* part, _data->parts()) { if (hidden.contains(part)) continue; - item = new PartListItem(0, f, _eventType, _groupType, part); + QTreeWidgetItem* item = new PartListItem(0, f, _eventType, _groupType, part); items.append(item); } setSortingEnabled(false); @@ -244,7 +243,7 @@ void PartView::refresh() header()->setSortIndicatorShown(false); header()->resizeSections(QHeaderView::ResizeToContents); - foreach(item, items) { + foreach(QTreeWidgetItem* item, items) { TracePart* part = ((PartListItem*)item)->part(); if (hidden.contains(part)) continue; if (part->isActive()) {