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

Merge pull request #607 from PhenomRetroShare/Fix_Compilation

Browse Source 
Fix compilation and some new warnings.
This commit is contained in:
csoler 2016-12-21 23:19:20 +01:00 committed by GitHub
commit 83302e0642
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretroshare/src/gxs/rsgxsnetservice.cc
View File

@ -1954,7 +1954,7 @@ void RsGxsNetService::updateServerSyncTS()
for(std::map<RsGxsGroupId, RsGxsGrpMetaData*>::const_iterator mit = gxsMap.begin();mit != gxsMap.end(); ++mit) for(std::map<RsGxsGroupId, RsGxsGrpMetaData*>::const_iterator mit = gxsMap.begin();mit != gxsMap.end(); ++mit)
{ {
const RsGxsGroupId& grpId = mit->first; //const RsGxsGroupId& grpId = mit->first;
// Check if the group is subscribed and restricted to a circle. If the circle has changed, update the // Check if the group is subscribed and restricted to a circle. If the circle has changed, update the
// global TS to reflect that change to clients who may be able to see/subscribe to that particular group. // global TS to reflect that change to clients who may be able to see/subscribe to that particular group.
@ -2450,7 +2450,7 @@ void RsGxsNetService::locked_processCompletedIncomingTrans(NxsTransaction* tr)
GXSNETDEBUG_P_(tr->mTransaction->PeerId()) << " type = msgs." << std::endl; GXSNETDEBUG_P_(tr->mTransaction->PeerId()) << " type = msgs." << std::endl;
#endif #endif
RsGxsGroupId grpId; RsGxsGroupId grpId;
time_t now = time(NULL) ; //time_t now = time(NULL) ;
while(tr->mItems.size() > 0) while(tr->mItems.size() > 0)
{ {
@ -2798,7 +2798,7 @@ void RsGxsNetService::locked_genReqMsgTransaction(NxsTransaction* tr)
#ifdef NXS_NET_DEBUG_1 #ifdef NXS_NET_DEBUG_1
GXSNETDEBUG_PG(item->PeerId(),grpId) << " msg ID = " << msgId ; GXSNETDEBUG_PG(item->PeerId(),grpId) << " msg ID = " << msgId ;
#endif #endif
if(reqListSize >= MAX_REQLIST_SIZE) if(reqListSize >= (int)MAX_REQLIST_SIZE)
{ {
#ifdef NXS_NET_DEBUG_1 #ifdef NXS_NET_DEBUG_1
GXSNETDEBUG_PG(item->PeerId(),grpId) << ". reqlist too big. Pruning out this item for now." << std::endl; GXSNETDEBUG_PG(item->PeerId(),grpId) << ". reqlist too big. Pruning out this item for now." << std::endl;
@ -2807,7 +2807,7 @@ void RsGxsNetService::locked_genReqMsgTransaction(NxsTransaction* tr)
continue ; // we should actually break, but we need to print some debug info. continue ; // we should actually break, but we need to print some debug info.
} }
if(reqListSize < MAX_REQLIST_SIZE && msgIdSet.find(msgId) == msgIdSet.end()) if(reqListSize < (int)MAX_REQLIST_SIZE && msgIdSet.find(msgId) == msgIdSet.end())
{ {
// if reputation is in reputations cache then proceed // if reputation is in reputations cache then proceed

2
libretroshare/src/serialiser/rsgxsupdateitems.h
View File

@ -96,7 +96,7 @@ public:
virtual ~RsGxsGrpConfigItem() {} virtual ~RsGxsGrpConfigItem() {}
virtual void clear() {} virtual void clear() {}
virtual std::ostream &print(std::ostream &out, uint16_t indent) { return out;} virtual std::ostream &print(std::ostream &out, uint16_t /*indent*/) { return out;}
virtual bool serialise(void *data,uint32_t& size) const ; virtual bool serialise(void *data,uint32_t& size) const ;
virtual uint32_t serial_size() const ; virtual uint32_t serial_size() const ;

7
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View File

@ -320,7 +320,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QPlainTextEdit" name="friendCertEdit"> <widget class="RSPlainTextEdit" name="friendCertEdit">
<property name="font"> <property name="font">
<font> <font>
<family>Courier New</family> <family>Courier New</family>
@ -1560,6 +1560,11 @@ resources.</string>
<header>gui/connect/ConnectFriendWizard.h</header> <header>gui/connect/ConnectFriendWizard.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>RSPlainTextEdit</class>
<extends>QPlainTextEdit</extends>
<header>gui/common/RSPlainTextEdit.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>

4
retroshare-gui/src/util/misc.cpp
View File

@ -209,8 +209,8 @@ QString misc::userFriendlyDuration(qlonglong seconds)
QString misc::timeRelativeToNow(uint32_t mtime) QString misc::timeRelativeToNow(uint32_t mtime)
{ {
if(mtime == 0) if( mtime == 0)
return QString(); return QString() ;
time_t now = time(NULL) ; time_t now = time(NULL) ;
if(mtime > now) if(mtime > now)