Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 00:19:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed compilation after removing operators!= (patch from phenom)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7655 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-11-02 09:40:51 +00:00
parent 1078126a38
commit 5d13dee029
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/retroshare/rsgxsifacetypes.h
View File

@ -55,8 +55,6 @@ public:
} }
void operator =(const RsGxsGrpMetaData& rGxsMeta); void operator =(const RsGxsGrpMetaData& rGxsMeta);
bool operator ==(const RsGroupMetaData& rGxsMeta);
bool operator !=(const RsGroupMetaData& rGxsMeta);
RsGxsGroupId mGroupId; RsGxsGroupId mGroupId;
std::string mGroupName; std::string mGroupName;

4
retroshare-gui/src/gui/People/CircleWidget.cpp
View File

@ -41,7 +41,7 @@ CircleWidget::~CircleWidget()
void CircleWidget::updateData(const RsGroupMetaData& gxs_group_info void CircleWidget::updateData(const RsGroupMetaData& gxs_group_info
, const RsGxsCircleDetails& details) , const RsGxsCircleDetails& details)
{ {
if (_group_info != gxs_group_info) { //if (_group_info != gxs_group_info) {
_group_info=gxs_group_info; _group_info=gxs_group_info;
std::string desc_string = _group_info.mGroupName ; std::string desc_string = _group_info.mGroupName ;
QString cirName = QString::fromUtf8(desc_string.c_str()); QString cirName = QString::fromUtf8(desc_string.c_str());
@ -49,7 +49,7 @@ void CircleWidget::updateData(const RsGroupMetaData& gxs_group_info
ui->label->setText(m_myName); ui->label->setText(m_myName);
ui->label->setToolTip(m_myName); ui->label->setToolTip(m_myName);
update(); update();
}//if (_group_info != gxs_group_info) //}//if (_group_info != gxs_group_info)
if (_circle_details != details) { if (_circle_details != details) {
_circle_details=details; _circle_details=details;