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

fixed compilation

Browse Source
This commit is contained in:
csoler 2019-12-13 23:58:17 +01:00
parent 3a3fc25205
commit 536c0852d4
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retroshare-gui/src/gui/NewsFeed.cpp
View File

@ -192,10 +192,10 @@ void NewsFeed::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
if(event->mType == RsEventType::GXS_FORUMS && (flags & RS_FEED_TYPE_FORUM)) if(event->mType == RsEventType::GXS_FORUMS && (flags & RS_FEED_TYPE_FORUM))
handleForumEvent(event); handleForumEvent(event);
if(event->mType == RsEventType::GXS_POSTED && (flags & RS_FEED_TYPE_MSG)) if(event->mType == RsEventType::GXS_POSTED && (flags & RS_FEED_TYPE_POSTED))
handleMailEvent(event); handleMailEvent(event);
if(event->mType == RsEventType::MAIL_STATUS_CHANGE && (flags & RS_FEED_TYPE_MAIL)) if(event->mType == RsEventType::MAIL_STATUS_CHANGE && (flags & RS_FEED_TYPE_MSG))
handlePostedEvent(event); handlePostedEvent(event);
} }
@ -532,22 +532,22 @@ void NewsFeed::updateDisplay()
break; break;
#endif #endif
#ifdef TO_REMOVE
case RS_FEED_ITEM_CHAT_NEW: case RS_FEED_ITEM_CHAT_NEW:
if (flags & RS_FEED_TYPE_CHAT) if (flags & RS_FEED_TYPE_CHAT)
addFeedItemChatNew(fi, false); addFeedItemChatNew(fi, false);
break; break;
#ifdef TO_REMOVE
case RS_FEED_ITEM_MESSAGE: case RS_FEED_ITEM_MESSAGE:
if (flags & RS_FEED_TYPE_MSG) if (flags & RS_FEED_TYPE_MSG)
addFeedItemMessage(fi); addFeedItemMessage(fi);
break; break;
#endif
case RS_FEED_ITEM_FILES_NEW: case RS_FEED_ITEM_FILES_NEW:
if (flags & RS_FEED_TYPE_FILES) if (flags & RS_FEED_TYPE_FILES)
addFeedItemFilesNew(fi); addFeedItemFilesNew(fi);
break; break;
#endif
default: default:
std::cerr << "(EE) Unknown type " << std::hex << fi.mType << std::dec << " in news feed." << std::endl; std::cerr << "(EE) Unknown type " << std::hex << fi.mType << std::dec << " in news feed." << std::endl;
@ -1566,7 +1566,6 @@ void NewsFeed::addFeedItemBlogMsg(const RsFeedItem &fi)
#endif #endif
} }
#endif
void NewsFeed::addFeedItemChatNew(const RsFeedItem &fi, bool addWithoutCheck) void NewsFeed::addFeedItemChatNew(const RsFeedItem &fi, bool addWithoutCheck)
{ {
@ -1587,7 +1586,6 @@ void NewsFeed::addFeedItemChatNew(const RsFeedItem &fi, bool addWithoutCheck)
addFeedItem(cm); addFeedItem(cm);
} }
#ifdef TO_REMOVE
void NewsFeed::addFeedItemMessage(const RsFeedItem &fi) void NewsFeed::addFeedItemMessage(const RsFeedItem &fi)
{ {
/* make new widget */ /* make new widget */
@ -1689,7 +1687,6 @@ void NewsFeed::deleteFeedItem(QWidget *item, uint32_t /*type*/)
} }
} }
#ifdef TO_REMOVE
void NewsFeed::openChat(const RsPeerId &peerId) void NewsFeed::openChat(const RsPeerId &peerId)
{ {
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
@ -1705,7 +1702,6 @@ void NewsFeed::openComments(uint32_t /*type*/, const RsGxsGroupId &/*groupId*/,
std::cerr << "NewsFeed::openComments() Not Handled Yet"; std::cerr << "NewsFeed::openComments() Not Handled Yet";
std::cerr << std::endl; std::cerr << std::endl;
} }
#endif
static void sendNewsFeedChangedCallback(FeedItem *feedItem, void *data) static void sendNewsFeedChangedCallback(FeedItem *feedItem, void *data)
{ {

7
retroshare-gui/src/gui/NewsFeed.h
View File

@ -56,7 +56,7 @@ class RsFeedItem;
class FeedNotify; class FeedNotify;
class FeedItem; class FeedItem;
class NewsFeed : public RsAutoUpdatePage, public FeedHolder, public TokenResponse class NewsFeed : public RsAutoUpdatePage, public FeedHolder
{ {
Q_OBJECT Q_OBJECT
@ -75,8 +75,8 @@ public:
/* FeedHolder Functions (for FeedItem functionality) */ /* FeedHolder Functions (for FeedItem functionality) */
virtual QScrollArea *getScrollArea(); virtual QScrollArea *getScrollArea();
virtual void deleteFeedItem(QWidget *item, uint32_t type); virtual void deleteFeedItem(QWidget *item, uint32_t type);
// virtual void openChat(const RsPeerId& peerId); virtual void openChat(const RsPeerId& peerId);
// virtual void openComments(uint32_t type, const RsGxsGroupId &groupId, const QVector<RsGxsMessageId> &versions, const RsGxsMessageId &msgId, const QString &title); virtual void openComments(uint32_t type, const RsGxsGroupId &groupId, const QVector<RsGxsMessageId> &versions, const RsGxsMessageId &msgId, const QString &title);
static void testFeeds(uint notifyFlags); static void testFeeds(uint notifyFlags);
static void testFeed(FeedNotify *feedNotify); static void testFeed(FeedNotify *feedNotify);
@ -107,6 +107,7 @@ private:
void handleConnectionEvent(std::shared_ptr<const RsEvent> event); void handleConnectionEvent(std::shared_ptr<const RsEvent> event);
void handleCircleEvent(std::shared_ptr<const RsEvent> event); void handleCircleEvent(std::shared_ptr<const RsEvent> event);
void handleForumEvent(std::shared_ptr<const RsEvent> event); void handleForumEvent(std::shared_ptr<const RsEvent> event);
void handleMailEvent(std::shared_ptr<const RsEvent> event);
void handlePostedEvent(std::shared_ptr<const RsEvent> event); void handlePostedEvent(std::shared_ptr<const RsEvent> event);
void handleChannelEvent(std::shared_ptr<const RsEvent> event); void handleChannelEvent(std::shared_ptr<const RsEvent> event);

4
retroshare-gui/src/gui/feeds/FeedHolder.h
View File

@ -35,8 +35,8 @@ public:
virtual QScrollArea *getScrollArea() = 0; virtual QScrollArea *getScrollArea() = 0;
virtual void deleteFeedItem(QWidget *item, uint32_t type) = 0; virtual void deleteFeedItem(QWidget *item, uint32_t type) = 0;
// virtual void openChat(const RsPeerId& peerId) = 0; virtual void openChat(const RsPeerId& peerId) = 0;
// virtual void openComments(uint32_t type, const RsGxsGroupId &groupId, const QVector<RsGxsMessageId> &msg_versions, const RsGxsMessageId &msgId, const QString &title)=0; virtual void openComments(uint32_t type, const RsGxsGroupId &groupId, const QVector<RsGxsMessageId> &msg_versions, const RsGxsMessageId &msgId, const QString &title)=0;
// Workaround for QTBUG-3372 // Workaround for QTBUG-3372
void lockLayout(QWidget *feedItem, bool lock); void lockLayout(QWidget *feedItem, bool lock);