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:
thunder2 2014-06-29 19:54:53 +00:00
parent 384ba9ede5
commit c5e41f0eaf

View File

@ -528,15 +528,15 @@ void GroupTreeWidget::calculateScore(QTreeWidgetItem *item, const QString &filte
/* Find out which has given word in it */
QTreeWidgetItemIterator itemIterator(ui->treeWidget);
QTreeWidgetItem *item;
while ((item = *itemIterator) != NULL) {
QTreeWidgetItem *tmpItem;
while ((tmpItem = *itemIterator) != NULL) {
itemIterator++;
if (item->data(COLUMN_DATA, ROLE_ID).toString().isEmpty()) {
if (tmpItem->data(COLUMN_DATA, ROLE_ID).toString().isEmpty()) {
continue;
}
calculateScore(item, filterText);
calculateScore(tmpItem, filterText);
}
}