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

compatible to g++11 / QT5

Browse Source 
method suggested by cyril
This commit is contained in:
zeners 2016-03-29 21:22:14 +02:00
parent 5783c59463
commit aca88308ea
9 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/pqi/pqiqosstreamer.cc
View File

@ -25,6 +25,8 @@
#include "pqiqosstreamer.h" #include "pqiqosstreamer.h"
const float pqiQoSstreamer::PQI_QOS_STREAMER_ALPHA = 2.0f ;
pqiQoSstreamer::pqiQoSstreamer(PQInterface *parent, RsSerialiser *rss, const RsPeerId& peerid, BinInterface *bio_in, int bio_flagsin) pqiQoSstreamer::pqiQoSstreamer(PQInterface *parent, RsSerialiser *rss, const RsPeerId& peerid, BinInterface *bio_in, int bio_flagsin)
: pqithreadstreamer(parent,rss,peerid,bio_in,bio_flagsin), pqiQoS(PQI_QOS_STREAMER_MAX_LEVELS, PQI_QOS_STREAMER_ALPHA) : pqithreadstreamer(parent,rss,peerid,bio_in,bio_flagsin), pqiQoS(PQI_QOS_STREAMER_MAX_LEVELS, PQI_QOS_STREAMER_ALPHA)
{ {

2
libretroshare/src/pqi/pqiqosstreamer.h
View File

@ -34,7 +34,7 @@ class pqiQoSstreamer: public pqithreadstreamer, public pqiQoS
pqiQoSstreamer(PQInterface *parent, RsSerialiser *rss, const RsPeerId& peerid, BinInterface *bio_in, int bio_flagsin); pqiQoSstreamer(PQInterface *parent, RsSerialiser *rss, const RsPeerId& peerid, BinInterface *bio_in, int bio_flagsin);
static const uint32_t PQI_QOS_STREAMER_MAX_LEVELS = 10 ; static const uint32_t PQI_QOS_STREAMER_MAX_LEVELS = 10 ;
static const float PQI_QOS_STREAMER_ALPHA = 2.0 ; static const float PQI_QOS_STREAMER_ALPHA ;
virtual void locked_storeInOutputQueue(void *ptr,int priority) ; virtual void locked_storeInOutputQueue(void *ptr,int priority) ;
virtual int locked_out_queue_size() const { return _total_item_count ; } virtual int locked_out_queue_size() const { return _total_item_count ; }

4
libretroshare/src/retroshare/rsreputations.h
View File

@ -31,8 +31,8 @@
class RsReputations class RsReputations
{ {
public: public:
static const float REPUTATION_THRESHOLD_ANTI_SPAM = 1.4f ; static const float REPUTATION_THRESHOLD_ANTI_SPAM;
static const float REPUTATION_THRESHOLD_DEFAULT = 1.0f ; static const float REPUTATION_THRESHOLD_DEFAULT;
// This is the interface file for the reputation system // This is the interface file for the reputation system
// //

4
libretroshare/src/rsserver/p3face-server.cc
View File

@ -69,6 +69,10 @@ static double getCurrentTS()
return cts; return cts;
} }
const double RsServer::minTimeDelta = 0.1; // 25;
const double RsServer::maxTimeDelta = 0.5;
const double RsServer::kickLimit = 0.15;
RsServer::RsServer() RsServer::RsServer()
: coreMutex("RsServer") : coreMutex("RsServer")

6
libretroshare/src/rsserver/p3face.h
View File

@ -194,9 +194,9 @@ class RsServer: public RsControl, public RsTickingThread
double mAvgTickRate ; double mAvgTickRate ;
double mTimeDelta ; double mTimeDelta ;
static const double minTimeDelta = 0.1; // 25; static const double minTimeDelta; // 25;
static const double maxTimeDelta = 0.5; static const double maxTimeDelta;
static const double kickLimit = 0.15; static const double kickLimit;
}; };
/* Helper function to convert windows paths /* Helper function to convert windows paths

4
libretroshare/src/services/p3gxsreputation.cc
View File

@ -303,6 +303,10 @@ void p3GxsReputation::updateActiveFriends()
} }
const float RsReputations::REPUTATION_THRESHOLD_ANTI_SPAM = 1.4f ;
const float RsReputations::REPUTATION_THRESHOLD_DEFAULT = 1.0f ;
static RsReputations::Opinion safe_convert_uint32t_to_opinion(uint32_t op) static RsReputations::Opinion safe_convert_uint32t_to_opinion(uint32_t op)
{ {
return RsReputations::Opinion(std::min((uint32_t)op,UPPER_LIMIT)) ; return RsReputations::Opinion(std::min((uint32_t)op,UPPER_LIMIT)) ;

6
retroshare-gui/src/gui/elastic/node.cpp
View File

@ -87,6 +87,12 @@ Node::Node(const std::string& node_string,GraphWidget::NodeType type,GraphWidget
_auth = GraphWidget::ELASTIC_NODE_AUTH_FULL ; _auth = GraphWidget::ELASTIC_NODE_AUTH_FULL ;
} }
const float Node::MASS_FACTOR = 10 ;
const float Node::FRICTION_FACTOR = 10.8f ;
const float Node::REPULSION_FACTOR = 4;
const float Node::NODE_DISTANCE = 130.0f ;
void Node::addEdge(Edge *edge) void Node::addEdge(Edge *edge)
{ {
edgeList << edge; edgeList << edge;

8
retroshare-gui/src/gui/elastic/node.h
View File

@ -118,10 +118,10 @@ private:
RsPeerId _ssl_id ; RsPeerId _ssl_id ;
RsPgpId _gpg_id ; RsPgpId _gpg_id ;
static const float MASS_FACTOR = 10 ; static const float MASS_FACTOR;
static const float FRICTION_FACTOR = 10.8 ; static const float FRICTION_FACTOR;
static const float REPULSION_FACTOR = 4 ; static const float REPULSION_FACTOR;
static const float NODE_DISTANCE = 130.0 ; static const float NODE_DISTANCE;
}; };
#endif #endif

2
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -1565,7 +1565,7 @@ void GxsForumThreadWidget::setMsgReadStatus(QList<QTreeWidgetItem*> &rows, bool
// LIKE THIS BELOW... // LIKE THIS BELOW...
//std::string grpId = (*Row)->data(COLUMN_THREAD_DATA, ROLE_THREAD_GROUPID).toString().toStdString(); //std::string grpId = (*Row)->data(COLUMN_THREAD_DATA, ROLE_THREAD_GROUPID).toString().toStdString();
RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), msgId); RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), RsGxsMessageId(msgId));
uint32_t token; uint32_t token;
rsGxsForums->setMessageReadStatus(token, msgPair, read); rsGxsForums->setMessageReadStatus(token, msgPair, read);