Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-24 17:53:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

optim: changed postfixed ++ into prefix++ for non trivial operators, replaced test on std::list::size() by std::list::empty() (Patch from Phenom, modified)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7627 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-10-21 22:33:02 +00:00
parent 491a655889
commit b593a918a0
99 changed files with 571 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -166,7 +166,7 @@ void CirclesDialog::reloadAll()
fofItem->setText(0, tr("Friends Of Friends"));
ui.treeWidget_friends->addTopLevelItem(fofItem);
for(it = friend_pgpIds.begin(); it != friend_pgpIds.end(); it++)
for(it = friend_pgpIds.begin(); it != friend_pgpIds.end(); ++it)
{
RsPeerDetails details;
if (rsPeers->getGPGDetails(*it, details))
@ -180,7 +180,7 @@ void CirclesDialog::reloadAll()
}
}
for(it = all_pgpIds.begin(); it != all_pgpIds.end(); it++)
for(it = all_pgpIds.begin(); it != all_pgpIds.end(); ++it)
{
if (friend_set.end() != friend_set.find(*it))
{
@ -228,7 +228,7 @@ void set_item_background(QTreeWidgetItem *item, uint32_t type)
void update_children_background(QTreeWidgetItem *item, uint32_t type)
{
int count = item->childCount();
for(int i = 0; i < count; i++)
for(int i = 0; i < count; ++i)
{
QTreeWidgetItem *child = item->child(i);
@ -247,7 +247,7 @@ void set_tree_background(QTreeWidget *tree, uint32_t type)
/* grab all toplevel */
int count = tree->topLevelItemCount();
for(int i = 0; i < count; i++)
for(int i = 0; i < count; ++i)
{
QTreeWidgetItem *item = tree->topLevelItem(i);
/* resursively clear child backgrounds */
@ -271,7 +271,7 @@ void check_mark_item(QTreeWidgetItem *item, const std::set<RsPgpId> &names, uint
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++)
for(int i = 0; i < count; ++i)
{
QTreeWidgetItem *child = item->child(i);
@ -290,7 +290,7 @@ void mark_matching_tree(QTreeWidget *tree, const std::set<RsPgpId> &names, uint3
/* grab all toplevel */
int count = tree->topLevelItemCount();
for(int i = 0; i < count; i++)
for(int i = 0; i < count; ++i)
{
QTreeWidgetItem *item = tree->topLevelItem(i);
/* resursively clear child backgrounds */
@ -308,7 +308,7 @@ void mark_circle_item(QTreeWidgetItem *item, const std::set<RsPgpId> &names)
if (rsGxsCircles->getCircleDetails(id, details))
{
std::set<RsPgpId>::iterator it;
for(it = names.begin(); it != names.end(); it++)
for(it = names.begin(); it != names.end(); ++it)
{
if (details.mAllowedPeers.end() != details.mAllowedPeers.find(*it))
{
@ -329,7 +329,7 @@ void mark_circle_item(QTreeWidgetItem *item, const std::set<RsPgpId> &names)
void mark_circle_children(QTreeWidgetItem *item, const std::set<RsPgpId> &names)
{
int count = item->childCount();
for(int i = 0; i < count; i++)
for(int i = 0; i < count; ++i)
{
QTreeWidgetItem *child = item->child(i);
@ -348,7 +348,7 @@ void mark_circle_tree(QTreeWidget *tree, const std::set<RsPgpId> &names)
/* grab all toplevel */
int count = tree->topLevelItemCount();
for(int i = 0; i < count; i++)
for(int i = 0; i < count; ++i)
{
QTreeWidgetItem *item = tree->topLevelItem(i);
mark_circle_children(item, names);
@ -384,7 +384,7 @@ void CirclesDialog::circle_selected()
/* now mark all the members */
std::set<RsPgpId> members;
std::map<RsPgpId, std::list<RsGxsId> >::iterator it;
for(it = details.mAllowedPeers.begin(); it != details.mAllowedPeers.end(); it++)
for(it = details.mAllowedPeers.begin(); it != details.mAllowedPeers.end(); ++it)
{
members.insert(it->first);
std::cerr << "Circle member: " << it->first;
@ -629,7 +629,7 @@ void CirclesDialog::loadGroupMeta(const uint32_t &token)
externalOtherCirclesItem->setText(0, tr("External Circles (Other)"));
ui.treeWidget_membership->addTopLevelItem(externalOtherCirclesItem);
for(vit = groupInfo.begin(); vit != groupInfo.end(); vit++)
for(vit = groupInfo.begin(); vit != groupInfo.end(); ++vit)
{
/* Add Widget, and request Pages */
std::cerr << "CirclesDialog::loadGroupMeta() GroupId: " << vit->mGroupId;

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

@ -206,14 +206,14 @@ void CreateCircleDialog::addMember(const QString& keyId, const QString& idtype,
QTreeWidget *tree = ui.treeWidget_membership;
int count = tree->topLevelItemCount();
for(int i = 0; i < count; i++){
for(int i = 0; i < count; ++i){
QTreeWidgetItem *item = tree->topLevelItem(i);
if (keyId == item->text(RSCIRCLEID_COL_KEYID)) {
std::cerr << "CreateCircleDialog::addMember() Already is a Member: " << keyId.toStdString();
std::cerr << std::endl;
return;
}//if (keyId == item->text(RSCIRCLEID_COL_KEYID))
}//for(int i = 0; i < count; i++)
}//for(int i = 0; i < count; ++i)
QTreeWidgetItem *member = new QTreeWidgetItem();
member->setText(RSCIRCLEID_COL_NICKNAME, nickname);
@ -308,7 +308,7 @@ void CreateCircleDialog::createCircle()
/* copy Ids from GUI */
QTreeWidget *tree = ui.treeWidget_membership;
int count = tree->topLevelItemCount();
for(int i = 0; i < count; i++) {
for(int i = 0; i < count; ++i) {
QTreeWidgetItem *item = tree->topLevelItem(i);
QString keyId = item->text(RSCIRCLEID_COL_KEYID);
@ -323,7 +323,7 @@ void CreateCircleDialog::createCircle()
std::cerr << std::endl;
}//else (mIsExternalCircle)
}//for(int i = 0; i < count; i++)
}//for(int i = 0; i < count; ++i)
if (mIsExistingCircle) {
std::cerr << "CreateCircleDialog::createCircle() Existing Circle TODO";
@ -510,7 +510,7 @@ void CreateCircleDialog::getPgpIdentities()
std::list<RsPgpId>::iterator it;
rsPeers->getGPGAcceptedList(ids);
for(it = ids.begin(); it != ids.end(); it++) {
for(it = ids.begin(); it != ids.end(); ++it) {
RsPeerDetails details;
rsPeers->getGPGDetails(*it, details);
@ -535,7 +535,7 @@ void CreateCircleDialog::getPgpIdentities()
addMember(keyId, idtype, nickname);
}//if (it != mCircleGroup.mLocalFriends.end())
}//if (mIsExistingCircle)
}//for(it = ids.begin(); it != ids.end(); it++)
}//for(it = ids.begin(); it != ids.end(); ++it)
filterIds();
}
@ -575,7 +575,7 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
return;
}//if (!rsIdentity->getGroupData(token, datavector))
for(vit = datavector.begin(); vit != datavector.end(); vit++) {
for(vit = datavector.begin(); vit != datavector.end(); ++vit) {
data = (*vit);
/* do filtering */
@ -628,7 +628,7 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
addMember(keyId, idtype, nickname);
}//if (it != mCircleGroup.mInvitedMembers.end())
}//if (mIsExistingCircle)
}//for(vit = datavector.begin(); vit != datavector.end(); vit++)
}//for(vit = datavector.begin(); vit != datavector.end(); ++vit)
}
void CreateCircleDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)