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

replaced QString output of uniqueIdentifier() in feedItem classes by a std::string because QString caused random crashes

Browse Source
This commit is contained in:
csoler 2019-12-15 16:46:22 +01:00
parent da6e7f9e9b
commit 11c520d280
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
21 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libretroshare/src/services/p3rtt.cc
View File

@ -442,6 +442,7 @@ bool RttPeerInfo::initialisePeerInfo(const RsPeerId& id)
mCurrentPingTS = 0;
mCurrentPingCounter = 0;
mCurrentPongRecvd = true;
mCurrentMeanOffset = 0;
mSentPings = 0;
mLostPongs = 0;

2
libretroshare/src/services/p3rtt.h
View File

@ -34,6 +34,8 @@ class p3ServiceControl;
class RttPeerInfo
{
public:
RttPeerInfo()
: mCurrentPingTS(0.0),mCurrentPingCounter(0.0),mCurrentPongRecvd(false),mCurrentMeanOffset(0.0),mLostPongs(0),mSentPings(0){}
bool initialisePeerInfo(const RsPeerId& id);

2
retroshare-gui/src/gui/Posted/PostedItem.h
View File

@ -49,7 +49,7 @@ public:
const RsPostedPost &getPost() const;
RsPostedPost &post();
QString uniqueIdentifier() const override { return "PostedItem " + QString::fromStdString(mMessageId.toStdString()); }
std::string uniqueIdentifier() const override { return "PostedItem " + mMessageId.toStdString(); }
protected:
/* FeedItem */
virtual void doExpand(bool open);

4
retroshare-gui/src/gui/common/RSFeedWidget.cpp
View File

@ -476,10 +476,10 @@ void RSFeedWidget::withAll(RSFeedWidgetCallbackFunction callback, void *data)
}
}
FeedItem *RSFeedWidget::findFeedItem(const QString& identifier)
FeedItem *RSFeedWidget::findFeedItem(const std::string& identifier)
{
QTreeWidgetItemIterator it(ui->treeWidget);
QTreeWidgetItem *treeItem;
QTreeWidgetItem *treeItem=NULL;
// this search could probably be automatised by giving the tree items the identifier as data for some specific role, then calling QTreeWidget::findItems()
#warning TODO

2
retroshare-gui/src/gui/common/RSFeedWidget.h
View File

@ -71,7 +71,7 @@ public:
bool scrollTo(FeedItem *feedItem, bool focus);
void withAll(RSFeedWidgetCallbackFunction callback, void *data);
FeedItem *findFeedItem(const QString &identifier);
FeedItem *findFeedItem(const std::string &identifier);
void selectedFeedItems(QList<FeedItem*> &feedItems);

2
retroshare-gui/src/gui/feeds/ChatMsgItem.h
View File

@ -37,7 +37,7 @@ public:
void updateItemStatic();
virtual QString uniqueIdentifier() const override { return "ChatMsgItem " + QString::fromStdString(mPeerId.toStdString()) ;}
virtual std::string uniqueIdentifier() const override { return "ChatMsgItem " + mPeerId.toStdString(); }
protected:
/* FeedItem */
virtual void doExpand(bool /*open*/) {}

2
retroshare-gui/src/gui/feeds/FeedItem.h
View File

@ -41,7 +41,7 @@ public:
* \return returns a string that is unique to this specific item. The string will be used to search for an existing item that
* would contain the same information. It should therefore sumarise the data represented by the item.
*/
virtual QString uniqueIdentifier() const =0;
virtual std::string uniqueIdentifier() const =0;
protected:
virtual void doExpand(bool open) = 0;
virtual void expandFill(bool /*first*/) {}

2
retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h
View File

@ -42,7 +42,7 @@ public:
bool setGroup(const RsGxsChannelGroup &group);
QString uniqueIdentifier() const override { return "GxsChannelGroupItem " + QString::fromStdString(mGroup.mMeta.mGroupId.toStdString()) ; }
std::string uniqueIdentifier() const override { return "GxsChannelGroupItem " + mGroup.mMeta.mGroupId.toStdString() ; }
protected:
/* FeedItem */
virtual void doExpand(bool open);

2
retroshare-gui/src/gui/feeds/GxsChannelPostItem.h
View File

@ -53,7 +53,7 @@ public:
//GxsChannelPostItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsChannelPost &post, bool isHome, bool autoUpdate);
virtual ~GxsChannelPostItem();
virtual QString uniqueIdentifier() const override { "GxsChannelPostItem " + QString::fromStdString(mPost.mMeta.mMsgId.toStdString()) ; }
virtual std::string uniqueIdentifier() const override { "GxsChannelPostItem " + mPost.mMeta.mMsgId.toStdString() ; }
bool setGroup(const RsGxsChannelGroup &group, bool doFill = true);
bool setPost(const RsGxsChannelPost &post, bool doFill = true);

4
retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
View File

@ -167,9 +167,9 @@ void GxsCircleItem::setup()
}
QString GxsCircleItem::uniqueIdentifier() const
std::string GxsCircleItem::uniqueIdentifier() const
{
return "GxsCircle " + QString::fromStdString(mCircleId.toStdString()) + " " + QString::fromStdString(mGxsId.toStdString()) + " " + QString::number(mType);
return "GxsCircle " + mCircleId.toStdString() + " " + mGxsId.toStdString() + " " + QString::number(mType).toStdString();
}
void GxsCircleItem::removeItem()

2
retroshare-gui/src/gui/feeds/GxsCircleItem.h
View File

@ -52,7 +52,7 @@ public:
GxsCircleItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsCircleId &circleId, const RsGxsId &gxsId, const uint32_t type);
virtual ~GxsCircleItem();
QString uniqueIdentifier() const override;
std::string uniqueIdentifier() const override;
void loadRequest(const TokenQueue *queue, const TokenRequest &req);

2
retroshare-gui/src/gui/feeds/GxsForumGroupItem.h
View File

@ -42,7 +42,7 @@ public:
bool setGroup(const RsGxsForumGroup &group);
virtual QString uniqueIdentifier() const override { return "GxsForumGroupItem " + QString::fromStdString(mGroup.mMeta.mGroupId.toStdString()) ; }
virtual std::string uniqueIdentifier() const override { return "GxsForumGroupItem " + mGroup.mMeta.mGroupId.toStdString() ; }
protected:
/* FeedItem */
virtual void doExpand(bool open);

2
retroshare-gui/src/gui/feeds/GxsForumMsgItem.h
View File

@ -43,7 +43,7 @@ public:
bool setGroup(const RsGxsForumGroup &group, bool doFill = true);
bool setMessage(const RsGxsForumMsg &msg, bool doFill = true);
QString uniqueIdentifier() const override { return "GxsForumMsgItem " + QString::fromStdString(mMessage.mMeta.mMsgId.toStdString()) ; }
std::string uniqueIdentifier() const override { return "GxsForumMsgItem " + mMessage.mMeta.mMsgId.toStdString() ; }
protected:
/* FeedItem */
virtual void doExpand(bool open);

2
retroshare-gui/src/gui/feeds/MsgItem.h
View File

@ -38,7 +38,7 @@ public:
void updateItemStatic();
virtual QString uniqueIdentifier() const override { return "MsgItem " + QString::fromStdString(mMsgId) ; }
virtual std::string uniqueIdentifier() const override { return "MsgItem " + mMsgId ; }
protected:
/* FeedItem */
virtual void doExpand(bool open);

4
retroshare-gui/src/gui/feeds/PeerItem.cpp
View File

@ -67,9 +67,9 @@ PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, const RsPeerId &peerId,
updateItem();
}
QString PeerItem::uniqueIdentifier() const
std::string PeerItem::uniqueIdentifier() const
{
return "PeerItem " + QString::fromStdString(mPeerId.toStdString()) + " " + QString::number(mType) ;
return "PeerItem " + mPeerId.toStdString() + " " + QString::number(mType).toStdString() ;
}
void PeerItem::updateItemStatic()

2
retroshare-gui/src/gui/feeds/PeerItem.h
View File

@ -43,7 +43,7 @@ public:
void updateItemStatic();
virtual QString uniqueIdentifier() const;
std::string uniqueIdentifier() const override;
protected:
/* FeedItem */

2
retroshare-gui/src/gui/feeds/PostedGroupItem.h
View File

@ -42,7 +42,7 @@ public:
bool setGroup(const RsPostedGroup &group);
virtual QString uniqueIdentifier() const override { return "PostedGroupItem " + QString::fromStdString(mGroup.mMeta.mGroupId.toStdString()) ; }
virtual std::string uniqueIdentifier() const override { return "PostedGroupItem " + mGroup.mMeta.mGroupId.toStdString() ; }
protected:
/* FeedItem */

5
retroshare-gui/src/gui/feeds/SecurityIpItem.cpp
View File

@ -78,10 +78,9 @@ void SecurityIpItem::setup()
updateItem();
}
QString SecurityIpItem::uniqueIdentifier() const
std::string SecurityIpItem::uniqueIdentifier() const
{
return "SecurityItem " + QString::number(mType) + " " + QString::fromStdString(mSslId.toStdString())
+ " " + QString::fromStdString(mIpAddr) + " " + QString::fromStdString(mIpAddrReported) ;
return "SecurityItem " + QString::number(mType).toStdString() + " " + mSslId.toStdString() + " " + mIpAddr + " " + mIpAddrReported ;
}
void SecurityIpItem::updateItemStatic()

2
retroshare-gui/src/gui/feeds/SecurityIpItem.h
View File

@ -43,7 +43,7 @@ public:
void updateItemStatic();
QString uniqueIdentifier() const override;
std::string uniqueIdentifier() const override;
protected:
/* FeedItem */

4
retroshare-gui/src/gui/feeds/SecurityItem.cpp
View File

@ -81,9 +81,9 @@ SecurityItem::SecurityItem(FeedHolder *parent, uint32_t feedId, const RsPgpId &g
updateItem();
}
QString SecurityItem::uniqueIdentifier() const
std::string SecurityItem::uniqueIdentifier() const
{
return "SecurityItem " + QString::number(mType) + " " + QString::fromStdString(mSslId.toStdString());
return "SecurityItem " + QString::number(mType).toStdString() + " " + mSslId.toStdString();
}
void SecurityItem::updateItemStatic()

2
retroshare-gui/src/gui/feeds/SecurityItem.h
View File

@ -42,7 +42,7 @@ public:
void updateItemStatic();
QString uniqueIdentifier() const override;
std::string uniqueIdentifier() const override;
protected:
/* FeedItem */