diff --git a/libretroshare/src/gxs/rsgxsnetservice.cc b/libretroshare/src/gxs/rsgxsnetservice.cc index e19052257..4c9291e7d 100644 --- a/libretroshare/src/gxs/rsgxsnetservice.cc +++ b/libretroshare/src/gxs/rsgxsnetservice.cc @@ -1954,7 +1954,7 @@ void RsGxsNetService::updateServerSyncTS() for(std::map::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 // 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; #endif RsGxsGroupId grpId; - time_t now = time(NULL) ; + //time_t now = time(NULL) ; while(tr->mItems.size() > 0) { @@ -2798,7 +2798,7 @@ void RsGxsNetService::locked_genReqMsgTransaction(NxsTransaction* tr) #ifdef NXS_NET_DEBUG_1 GXSNETDEBUG_PG(item->PeerId(),grpId) << " msg ID = " << msgId ; #endif - if(reqListSize >= MAX_REQLIST_SIZE) + if(reqListSize >= (int)MAX_REQLIST_SIZE) { #ifdef NXS_NET_DEBUG_1 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. } - 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 diff --git a/libretroshare/src/serialiser/rsgxsupdateitems.h b/libretroshare/src/serialiser/rsgxsupdateitems.h index 1a6adf77e..b7d6f324c 100644 --- a/libretroshare/src/serialiser/rsgxsupdateitems.h +++ b/libretroshare/src/serialiser/rsgxsupdateitems.h @@ -96,7 +96,7 @@ public: virtual ~RsGxsGrpConfigItem() {} 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 uint32_t serial_size() const ; diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui index 309bc4bc0..59df3e5a2 100644 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui @@ -320,7 +320,7 @@ - + Courier New @@ -1560,6 +1560,11 @@ resources.
gui/connect/ConnectFriendWizard.h
1 + + RSPlainTextEdit + QPlainTextEdit +
gui/common/RSPlainTextEdit.h
+
diff --git a/retroshare-gui/src/util/misc.cpp b/retroshare-gui/src/util/misc.cpp index 08fa72f5d..11b414b85 100644 --- a/retroshare-gui/src/util/misc.cpp +++ b/retroshare-gui/src/util/misc.cpp @@ -209,8 +209,8 @@ QString misc::userFriendlyDuration(qlonglong seconds) QString misc::timeRelativeToNow(uint32_t mtime) { - if(mtime == 0) - return QString(); + if( mtime == 0) + return QString() ; time_t now = time(NULL) ; if(mtime > now)