mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Merged revision 7414 from v0.5.5
Added parts of patch from Bogdan: - Fixed double declare of variable item in GroupTreeWidget::calculateScore git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7418 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
384ba9ede5
commit
c5e41f0eaf
@ -528,15 +528,15 @@ void GroupTreeWidget::calculateScore(QTreeWidgetItem *item, const QString &filte
|
|||||||
|
|
||||||
/* Find out which has given word in it */
|
/* Find out which has given word in it */
|
||||||
QTreeWidgetItemIterator itemIterator(ui->treeWidget);
|
QTreeWidgetItemIterator itemIterator(ui->treeWidget);
|
||||||
QTreeWidgetItem *item;
|
QTreeWidgetItem *tmpItem;
|
||||||
while ((item = *itemIterator) != NULL) {
|
while ((tmpItem = *itemIterator) != NULL) {
|
||||||
itemIterator++;
|
itemIterator++;
|
||||||
|
|
||||||
if (item->data(COLUMN_DATA, ROLE_ID).toString().isEmpty()) {
|
if (tmpItem->data(COLUMN_DATA, ROLE_ID).toString().isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
calculateScore(item, filterText);
|
calculateScore(tmpItem, filterText);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user