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

Merge pull request #804 from PhenomRetroShare/Fix_Warnings

Browse source 
Fix warnings
This commit is contained in:
csoler 2017-05-08 22:21:28 +02:00 • committed by GitHub
commit 9a0df3f757
12 changed files with 36 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2472,8 +2472,8 @@ void IdDialog::copyRetroshareLink()
RsIdentityDetails details ;
if(! rsIdentity->getIdDetails(gxs_id,details))
return ;
if(! rsIdentity->getIdDetails(gxs_id,details))
return ;
if (!mIdQueue)
return;

20
retroshare-gui/src/gui/RetroShareLink.cpp
View file

@ -600,16 +600,16 @@ void RetroShareLink::check()
if(!checkPGPId(_GPGid)) _valid = false ;
break ;
case TYPE_IDENTITY:
if(_name.isNull())
_valid = false ;
case TYPE_IDENTITY:
if(_name.isNull())
_valid = false ;
if(_radix_group_data.isNull())
_valid = false ;
if(_radix_group_data.isNull())
_valid = false ;
if(_hash.isNull())
_valid = false ;
break ;
if(_hash.isNull())
_valid = false ;
break ;
case TYPE_PERSON:
if(_size != 0)
@ -858,8 +858,8 @@ QString RetroShareLink::niceName() const
if (type() == TYPE_PERSON)
return PeerDefs::rsid(name().toUtf8().constData(), RsPgpId(hash().toStdString()));
if(type() == TYPE_IDENTITY)
return QObject::tr("Identity link (name=%1, ID=%2)").arg(_name).arg(_hash) ;
if(type() == TYPE_IDENTITY)
return QObject::tr("Identity link (name=%1, ID=%2)").arg(_name).arg(_hash) ;
if(type() == TYPE_PUBLIC_MSG) {
RsPeerDetails detail;

6
retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
View file

@ -278,10 +278,10 @@ void CreateGxsForumMsg::loadFormInformation()
uint32_t fl = IDCHOOSER_ID_REQUIRED ;
if( (mForumMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) || (mForumMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN))
fl |= IDCHOOSER_NON_ANONYMOUS ;
fl |= IDCHOOSER_NON_ANONYMOUS;
if(!mPosterId.isNull())
fl |= IDCHOOSER_NO_CREATE;
if(!mPosterId.isNull())
fl |= IDCHOOSER_NO_CREATE;
ui.idChooser->setFlags(fl) ;