Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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 ;
}
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)
{
edgeList << edge;

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

@ -118,10 +118,10 @@ private:
RsPeerId _ssl_id ;
RsPgpId _gpg_id ;
static const float MASS_FACTOR = 10 ;
static const float FRICTION_FACTOR = 10.8 ;
static const float REPULSION_FACTOR = 4 ;
static const float NODE_DISTANCE = 130.0 ;
static const float MASS_FACTOR;
static const float FRICTION_FACTOR;
static const float REPULSION_FACTOR;
static const float NODE_DISTANCE;
};
#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...
//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;
rsGxsForums->setMessageReadStatus(token, msgPair, read);