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

Forgot to commit the changes in FeedReader plugin

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7685 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-11-16 01:42:57 +00:00
parent 756b9acf41
commit aa080e02f0
4 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plugins/FeedReader/gui/FeedReaderFeedNotify.cpp
View file

@ -82,16 +82,16 @@ void FeedReaderFeedNotify::msgChanged(const QString &feedId, const QString &msgI
mMutex->lock();
FeedItem feedItem;
feedItem.mFeedId = feedId;
feedItem.mMsgId = msgId;
FeedItemData feedItemData;
feedItemData.mFeedId = feedId;
feedItemData.mMsgId = msgId;
mPendingNewsFeed.push_back(feedItem);
mPendingNewsFeed.push_back(feedItemData);
mMutex->unlock();
}
QWidget *FeedReaderFeedNotify::feedItem(FeedHolder *parent)
FeedItem *FeedReaderFeedNotify::feedItem(FeedHolder *parent)
{
bool msgPending = false;
FeedInfo feedInfo;
@ -99,11 +99,11 @@ QWidget *FeedReaderFeedNotify::feedItem(FeedHolder *parent)
mMutex->lock();
while (!mPendingNewsFeed.empty()) {
FeedItem feedItem = mPendingNewsFeed.front();
FeedItemData feedItemData = mPendingNewsFeed.front();
mPendingNewsFeed.pop_front();
if (mFeedReader->getFeedInfo(feedItem.mFeedId.toStdString(), feedInfo) &&
mFeedReader->getMsgInfo(feedItem.mFeedId.toStdString(), feedItem.mMsgId.toStdString(), msgInfo)) {
if (mFeedReader->getFeedInfo(feedItemData.mFeedId.toStdString(), feedInfo) &&
mFeedReader->getMsgInfo(feedItemData.mFeedId.toStdString(), feedItemData.mMsgId.toStdString(), msgInfo)) {
if (msgInfo.flag.isnew) {
msgPending = true;
break;
@ -119,7 +119,7 @@ QWidget *FeedReaderFeedNotify::feedItem(FeedHolder *parent)
return new FeedReaderFeedItem(mFeedReader, mNotify, parent, feedInfo, msgInfo);
}
QWidget *FeedReaderFeedNotify::testFeedItem(FeedHolder *parent)
FeedItem *FeedReaderFeedNotify::testFeedItem(FeedHolder *parent)
{
FeedInfo feedInfo;
feedInfo.name = tr("Test").toUtf8().constData();