merge of branch v0.6-idclean 7180

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions

View file

@ -24,6 +24,8 @@
#include <QGraphicsScene>
#include <retroshare/rstypes.h>
#include "RsAutoUpdatePage.h"
#include "ui_NetworkView.h"
@ -60,7 +62,7 @@ class NetworkView : public RsAutoUpdatePage
/** Qt Designer generated object */
Ui::NetworkView ui;
uint _max_friend_level ;
std::map<std::string,GraphWidget::NodeId> _node_ids ;
std::map<RsPgpId,GraphWidget::NodeId> _node_ids ;
bool _should_update ;
};