From 9d95832f6edb739c607e3a6c666990a877085789 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Sun, 29 Jun 2014 19:23:16 +0000
Subject: [PATCH] Added parts of patch from Bogdan: - Fixed assign with "=="
 instead of "=" in rsinit.cc - Fixed double declare of variable item in
 GroupTreeWidget::calculateScore

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.5@7417 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/rsserver/rsinit.cc              | 2 +-
 retroshare-gui/src/gui/common/GroupTreeWidget.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index 65c27dda6..951b12bf1 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -638,7 +638,7 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
 	if (!existingUser)
 	{
 		std::cerr << "No Existing User" << std::endl;
-		RsInitConfig::preferedId == "";
+		RsInitConfig::preferedId = "";
 
 	}
 
diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
index 4ee468c27..50c844d18 100644
--- a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
+++ b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
@@ -503,15 +503,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);
 	}
 }