Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-13 00:25:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

26
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -183,11 +183,11 @@ void IdDialog::filterChanged(const QString& /*text*/)
void IdDialog::updateSelection()
{
QTreeWidgetItem *item = ui.treeWidget_IdList->currentItem();
std::string id;
RsGxsGroupId id;
if (item)
{
id = item->text(RSID_COL_KEYID).toStdString();
id = RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString());
}
requestIdDetails(id);
@ -212,7 +212,7 @@ void IdDialog::requestIdList()
mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, IDDIALOG_IDLIST);
}
bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const std::string &ownPgpId, int accept)
bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept)
{
bool isOwnId = (data.mPgpKnown && (data.mPgpId == ownPgpId)) || (data.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN);
@ -265,7 +265,7 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item,
item = new QTreeWidgetItem();
}
item->setText(RSID_COL_NICKNAME, QString::fromUtf8(data.mMeta.mGroupName.c_str()));
item->setText(RSID_COL_KEYID, QString::fromStdString(data.mMeta.mGroupId));
item->setText(RSID_COL_KEYID, QString::fromStdString(data.mMeta.mGroupId.toStdString()));
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
{
@ -316,7 +316,7 @@ void IdDialog::insertIdList(uint32_t token)
mStateHelper->setActive(IDDIALOG_IDLIST, true);
std::string ownPgpId = rsPeers->getGPGOwnId();
RsPgpId ownPgpId = rsPeers->getGPGOwnId();
/* Update existing and remove not existing items */
QTreeWidgetItemIterator itemIterator(ui.treeWidget_IdList);
@ -326,7 +326,7 @@ void IdDialog::insertIdList(uint32_t token)
for (vit = datavector.begin(); vit != datavector.end(); ++vit)
{
if (vit->mMeta.mGroupId == item->text(RSID_COL_KEYID).toStdString())
if (vit->mMeta.mGroupId == RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString()))
{
break;
}
@ -361,11 +361,11 @@ void IdDialog::insertIdList(uint32_t token)
updateSelection();
}
void IdDialog::requestIdDetails(std::string &id)
void IdDialog::requestIdDetails(RsGxsGroupId &id)
{
mIdQueue->cancelActiveRequestTokens(IDDIALOG_IDDETAILS);
if (id.empty())
if (id.isNull())
{
mStateHelper->setActive(IDDIALOG_IDDETAILS, false);
mStateHelper->setActive(IDDIALOG_REPLIST, false);
@ -384,7 +384,7 @@ void IdDialog::requestIdDetails(std::string &id)
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
uint32_t token;
std::list<std::string> groupIds;
std::list<RsGxsGroupId> groupIds;
groupIds.push_back(id);
mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_IDDETAILS);
@ -430,12 +430,12 @@ void IdDialog::insertIdDetails(uint32_t token)
data = datavector[0];
/* get GPG Details from rsPeers */
std::string ownPgpId = rsPeers->getGPGOwnId();
RsPgpId ownPgpId = rsPeers->getGPGOwnId();
ui.lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()));
ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId));
ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId.toStdString()));
ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash));
ui.lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId));
ui.lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId.toStdString()));
if (data.mPgpKnown)
{
@ -680,7 +680,7 @@ void IdDialog::insertRepList(uint32_t token)
/* insert 4 columns */
/* friend name */
item->setId(op.mMeta.mGroupId, RSIDREP_COL_NAME);
item->setId(op.mMeta.mAuthorId, RSIDREP_COL_NAME);
/* score */
item->setText(RSIDREP_COL_OPINION, QString::number(op.getOpinion()));