Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 06:06:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge of branch v0.6-idclean 7180

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

44
retroshare-gui/src/gui/Circles/CirclesDialog.cpp
View file

@ -128,7 +128,7 @@ void CirclesDialog::editExistingCircle()
}
QString coltext = item->text(CIRCLEGROUP_CIRCLE_COL_GROUPID);
std::string id = coltext.toStdString();
RsGxsGroupId id ( coltext.toStdString());
CreateCircleDialog dlg;
dlg.editExistingId(id);
@ -140,11 +140,11 @@ void CirclesDialog::reloadAll()
requestGroupMeta();
/* grab all ids */
std::list<std::string> friend_pgpIds;
std::list<std::string> all_pgpIds;
std::list<std::string>::iterator it;
std::list<RsPgpId> friend_pgpIds;
std::list<RsPgpId> all_pgpIds;
std::list<RsPgpId>::iterator it;
std::set<std::string> friend_set;
std::set<RsPgpId> friend_set;
rsPeers->getGPGAcceptedList(friend_pgpIds);
rsPeers->getGPGAllList(all_pgpIds);
@ -170,7 +170,7 @@ void CirclesDialog::reloadAll()
QTreeWidgetItem *item = new QTreeWidgetItem();
item->setText(CIRCLEGROUP_FRIEND_COL_NAME, QString::fromUtf8(details.name.c_str()));
item->setText(CIRCLEGROUP_FRIEND_COL_ID, QString::fromStdString(*it));
item->setText(CIRCLEGROUP_FRIEND_COL_ID, QString::fromStdString((*it).toStdString()));
friendsItem->addChild(item);
}
}
@ -189,7 +189,7 @@ void CirclesDialog::reloadAll()
QTreeWidgetItem *item = new QTreeWidgetItem();
item->setText(CIRCLEGROUP_FRIEND_COL_NAME, QString::fromUtf8(details.name.c_str()));
item->setText(CIRCLEGROUP_FRIEND_COL_ID, QString::fromStdString(*it));
item->setText(CIRCLEGROUP_FRIEND_COL_ID, QString::fromStdString((*it).toStdString()));
fofItem->addChild(item);
}
}
@ -251,10 +251,10 @@ void set_tree_background(QTreeWidget *tree, uint32_t type)
}
}
void check_mark_item(QTreeWidgetItem *item, const std::set<std::string> &names, uint32_t col, uint32_t type)
void check_mark_item(QTreeWidgetItem *item, const std::set<RsPgpId> &names, uint32_t col, uint32_t type)
{
QString coltext = item->text(col);
std::string colstr = coltext.toStdString();
RsPgpId colstr ( coltext.toStdString());
if (names.end() != names.find(colstr))
{
set_item_background(item, type);
@ -263,7 +263,7 @@ void check_mark_item(QTreeWidgetItem *item, const std::set<std::string> &names,
}
}
void update_mark_children(QTreeWidgetItem *item, const std::set<std::string> &names, uint32_t col, uint32_t type)
void update_mark_children(QTreeWidgetItem *item, const std::set<RsPgpId> &names, uint32_t col, uint32_t type)
{
int count = item->childCount();
for(int i = 0; i < count; i++)
@ -278,7 +278,7 @@ void update_mark_children(QTreeWidgetItem *item, const std::set<std::string> &na
}
}
void mark_matching_tree(QTreeWidget *tree, const std::set<std::string> &names, uint32_t col, uint32_t type)
void mark_matching_tree(QTreeWidget *tree, const std::set<RsPgpId> &names, uint32_t col, uint32_t type)
{
std::cerr << "CirclesDialog mark_matching_tree()";
std::cerr << std::endl;
@ -296,16 +296,16 @@ void mark_matching_tree(QTreeWidget *tree, const std::set<std::string> &names, u
/**** Circles checks - v expensive ***/
void mark_circle_item(QTreeWidgetItem *item, const std::set<std::string> &names)
void mark_circle_item(QTreeWidgetItem *item, const std::set<RsPgpId> &names)
{
std::string id = item->text(CIRCLEGROUP_CIRCLE_COL_GROUPID).toStdString();
RsGxsCircleId id ( item->text(CIRCLEGROUP_CIRCLE_COL_GROUPID).toStdString());
RsGxsCircleDetails details;
if (rsGxsCircles->getCircleDetails(id, details))
{
std::set<std::string>::iterator it;
std::set<RsPgpId>::iterator it;
for(it = names.begin(); it != names.end(); it++)
{
if (details.mAllowedPeers.end() != details.mAllowedPeers.find(*it))
if (details.mAllowedPeers.end() != details.mAllowedPeers.find(*it))
{
set_item_background(item, GREEN_BACKGROUND);
std::cerr << "CirclesDialog mark_circle_item: found match: " << id;
@ -321,7 +321,7 @@ void mark_circle_item(QTreeWidgetItem *item, const std::set<std::string> &names)
}
}
void mark_circle_children(QTreeWidgetItem *item, const std::set<std::string> &names)
void mark_circle_children(QTreeWidgetItem *item, const std::set<RsPgpId> &names)
{
int count = item->childCount();
for(int i = 0; i < count; i++)
@ -336,7 +336,7 @@ void mark_circle_children(QTreeWidgetItem *item, const std::set<std::string> &na
}
}
void mark_circle_tree(QTreeWidget *tree, const std::set<std::string> &names)
void mark_circle_tree(QTreeWidget *tree, const std::set<RsPgpId> &names)
{
std::cerr << "CirclesDialog mark_circle_tree()";
std::cerr << std::endl;
@ -370,14 +370,14 @@ void CirclesDialog::circle_selected()
set_item_background(item, BLUE_BACKGROUND);
QString coltext = item->text(CIRCLEGROUP_CIRCLE_COL_GROUPID);
std::string id = coltext.toStdString();
RsGxsCircleId id ( coltext.toStdString()) ;
/* update friend lists */
RsGxsCircleDetails details;
if (rsGxsCircles->getCircleDetails(id, details))
{
/* now mark all the members */
std::set<std::string> members;
std::set<RsPgpId> members;
std::map<RsPgpId, std::list<RsGxsId> >::iterator it;
for(it = details.mAllowedPeers.begin(); it != details.mAllowedPeers.end(); it++)
{
@ -411,10 +411,10 @@ void CirclesDialog::friend_selected()
set_item_background(item, BLUE_BACKGROUND);
std::string id = item->text(CIRCLEGROUP_FRIEND_COL_ID).toStdString();
RsPgpId id ( item->text(CIRCLEGROUP_FRIEND_COL_ID).toStdString());
/* update permission lists */
std::set<std::string> names;
std::set<RsPgpId> names;
names.insert(id);
mark_circle_tree(ui.treeWidget_membership, names);
}
@ -633,7 +633,7 @@ void CirclesDialog::loadGroupMeta(const uint32_t &token)
QTreeWidgetItem *groupItem = new QTreeWidgetItem();
groupItem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, QString::fromUtf8(vit->mGroupName.c_str()));
groupItem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPID, QString::fromStdString(vit->mGroupId));
groupItem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPID, QString::fromStdString(vit->mGroupId.toStdString()));
if (vit->mCircleType == GXS_CIRCLE_TYPE_LOCAL)
{

31
retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View file

@ -29,6 +29,8 @@
#include <retroshare/rspeers.h>
#include <retroshare/rsidentity.h>
#include <algorithm>
#define CREATECIRCLEDIALOG_CIRCLEINFO 2
#define CREATECIRCLEDIALOG_IDINFO 3
@ -79,8 +81,8 @@ CreateCircleDialog::CreateCircleDialog()
mIsExistingCircle = false;
mIsExternalCircle = true;
ui.idChooser->loadIds(0,"");
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, "");
ui.idChooser->loadIds(0,RsGxsId());
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, RsGxsCircleId());
}
CreateCircleDialog::~CreateCircleDialog()
@ -89,7 +91,7 @@ CreateCircleDialog::~CreateCircleDialog()
delete(mIdQueue);
}
void CreateCircleDialog::editExistingId(std::string circleId)
void CreateCircleDialog::editExistingId(const RsGxsGroupId& circleId)
{
std::cerr << "CreateCircleDialog::editExistingId() : " << circleId;
std::cerr << std::endl;
@ -259,13 +261,13 @@ void CreateCircleDialog::createCircle()
/* insert into circle */
if (mIsExternalCircle)
{
circle.mInvitedMembers.push_back(keyId.toStdString());
circle.mInvitedMembers.push_back(RsGxsId(keyId.toStdString()));
std::cerr << "CreateCircleDialog::createCircle() Inserting Member: " << keyId.toStdString();
std::cerr << std::endl;
}
else
{
circle.mLocalFriends.push_back(keyId.toStdString());
circle.mLocalFriends.push_back(RsPgpId(keyId.toStdString()));
std::cerr << "CreateCircleDialog::createCircle() Inserting Friend: " << keyId.toStdString();
std::cerr << std::endl;
}
@ -384,17 +386,12 @@ void CreateCircleDialog::updateCircleGUI()
case GXS_CIRCLE_TYPE_EXT_SELF:
std::cerr << "CreateCircleDialog::updateCircleGUI() : EXT_SELF CIRCLE (fallthrough)";
std::cerr << std::endl;
case GXS_CIRCLE_TYPE_EXTERNAL:
std::cerr << "CreateCircleDialog::updateCircleGUI() : EXTERNAL CIRCLETYPE";
std::cerr << std::endl;
if (mCircleGroup.mMeta.mCircleId == mCircleGroup.mMeta.mGroupId)
{
ui.radioButton_Self->setChecked(true);
}
else
{
ui.radioButton_Restricted->setChecked(true);
}
@ -480,8 +477,8 @@ void CreateCircleDialog::getPgpIdentities()
QTreeWidget *tree = ui.treeWidget_IdList;
tree->clear();
std::list<std::string> ids;
std::list<std::string>::iterator it;
std::list<RsPgpId> ids;
std::list<RsPgpId>::iterator it;
rsPeers->getGPGAcceptedList(ids);
for(it = ids.begin(); it != ids.end(); it++)
@ -490,7 +487,7 @@ void CreateCircleDialog::getPgpIdentities()
rsPeers->getGPGDetails(*it, details);
QString keyId = QString::fromStdString(details.gpg_id);
QString keyId = QString::fromStdString(details.gpg_id.toStdString());
QString nickname = QString::fromUtf8(details.name.c_str());
QString idtype = tr("PGP Identity");
@ -580,7 +577,7 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
continue;
}
QString keyId = QString::fromStdString(data.mMeta.mGroupId);
QString keyId = QString::fromStdString(data.mMeta.mGroupId.toStdString());
QString nickname = QString::fromUtf8(data.mMeta.mGroupName.c_str());
QString idtype = tr("Anon Id");
@ -609,8 +606,10 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
{
// check if its in the circle.
std::list<RsGxsId>::const_iterator it;
it = std::find(mCircleGroup.mInvitedMembers.begin(),
mCircleGroup.mInvitedMembers.end(), data.mMeta.mGroupId);
// We use an explicit cast
//
it = std::find(mCircleGroup.mInvitedMembers.begin(), mCircleGroup.mInvitedMembers.end(), RsGxsId(data.mMeta.mGroupId));
if (it != mCircleGroup.mInvitedMembers.end())
{

2
retroshare-gui/src/gui/Circles/CreateCircleDialog.h
View file

@ -40,7 +40,7 @@ public:
~CreateCircleDialog();
void editNewId(bool isExternal);
void editExistingId(std::string circleId);
void editExistingId(const RsGxsGroupId& circleId);
virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req);