From c0be74d4059a4736630f403ebfd56b3dc3cada28 Mon Sep 17 00:00:00 2001 From: defnax <9952056+defnax@users.noreply.github.com> Date: Tue, 9 Dec 2025 22:02:24 +0100 Subject: [PATCH] Fixed compile issues with master --- retroshare-gui/src/gui/NewsFeed.cpp | 2 +- retroshare-gui/src/gui/feeds/FeedItem.h | 3 +++ retroshare-gui/src/gui/feeds/WireNotifyGroupItem.h | 2 +- retroshare-gui/src/gui/feeds/WireNotifyPostItem.h | 4 ++-- retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp | 3 +-- retroshare-gui/src/gui/gxs/GxsStatisticsProvider.cpp | 2 -- retroshare-gui/src/gui/settings/NotifyPage.cpp | 4 ++-- retroshare-gui/src/gui/settings/rsharesettings.cpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index 57e31cd42..bb6f1e574 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -221,7 +221,7 @@ void NewsFeed::handleEvent_main_thread(std::shared_ptr event) if(event->mType == RsEventType::MAIL_STATUS && (!!(flags & RsFeedTypeFlags::RS_FEED_TYPE_MSG))) handleMailEvent(event); - if(event->mType == RsEventType::WIRE && (flags & RS_FEED_TYPE_WIRE)) + if(event->mType == RsEventType::WIRE && (!!(flags & RsFeedTypeFlags::RS_FEED_TYPE_WIRE))) handleWireEvent(event); } diff --git a/retroshare-gui/src/gui/feeds/FeedItem.h b/retroshare-gui/src/gui/feeds/FeedItem.h index f11424520..0d3876da6 100644 --- a/retroshare-gui/src/gui/feeds/FeedItem.h +++ b/retroshare-gui/src/gui/feeds/FeedItem.h @@ -38,6 +38,9 @@ enum class RsFeedTypeFlags: uint32_t { RS_FEED_TYPE_POSTED = 0x1000, RS_FEED_TYPE_SECURITY_IP = 0x2000, RS_FEED_TYPE_CIRCLE = 0x4000, +#ifdef RS_USE_WIRE + RS_FEED_TYPE_WIRE = 0x8000, +#endif RS_FEED_ITEM_PEER_CONNECT = RS_FEED_TYPE_PEER | 0x0001, RS_FEED_ITEM_PEER_DISCONNECT = RS_FEED_TYPE_PEER | 0x0002, diff --git a/retroshare-gui/src/gui/feeds/WireNotifyGroupItem.h b/retroshare-gui/src/gui/feeds/WireNotifyGroupItem.h index e2ee46970..0bbee742c 100644 --- a/retroshare-gui/src/gui/feeds/WireNotifyGroupItem.h +++ b/retroshare-gui/src/gui/feeds/WireNotifyGroupItem.h @@ -22,7 +22,7 @@ #define WIRENOTIFYGROUPITEM_H #include -#include "gui/gxs/GxsGroupFeedItem.h" +#include "gui/feeds/GxsGroupFeedItem.h" namespace Ui { class WireNotifyGroupItem; diff --git a/retroshare-gui/src/gui/feeds/WireNotifyPostItem.h b/retroshare-gui/src/gui/feeds/WireNotifyPostItem.h index 5098c28d9..8633985ae 100644 --- a/retroshare-gui/src/gui/feeds/WireNotifyPostItem.h +++ b/retroshare-gui/src/gui/feeds/WireNotifyPostItem.h @@ -23,8 +23,8 @@ #include #include #include -#include "gui/gxs/GxsFeedItem.h" -#include "gui/gxs/GxsGroupFeedItem.h" +#include "gui/feeds/GxsFeedItem.h" +#include "gui/feeds/GxsGroupFeedItem.h" namespace Ui { class WireNotifyPostItem; diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp index 2ee0795c1..4f8f9d509 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp @@ -31,7 +31,6 @@ #include "gui/gxs/GxsGroupShareKey.h" #include "gui/common/GroupTreeWidget.h" #include "gui/common/RSTreeWidget.h" -#include "gui/notifyqt.h" #include "gui/common/UIStateHelper.h" #include "gui/common/UserNotify.h" #include "util/qtthreadsutils.h" @@ -173,7 +172,7 @@ void GxsGroupFrameDialog::initUi() processSettings(true); if (groupFrameSettingsType() != GroupFrameSettings::Nothing) { - connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); + //connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); settingsChanged(); } diff --git a/retroshare-gui/src/gui/gxs/GxsStatisticsProvider.cpp b/retroshare-gui/src/gui/gxs/GxsStatisticsProvider.cpp index 6e71720ca..54766a251 100644 --- a/retroshare-gui/src/gui/gxs/GxsStatisticsProvider.cpp +++ b/retroshare-gui/src/gui/gxs/GxsStatisticsProvider.cpp @@ -24,8 +24,6 @@ #include "GxsStatisticsProvider.h" - -#include "gui/notifyqt.h" #include "gui/common/UserNotify.h" #include "util/qtthreadsutils.h" #include "retroshare/rsgxsifacetypes.h" diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index ab84e8280..35d93958d 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -316,11 +316,11 @@ void NotifyPage::load() whileBlocking(ui.notify_Forums )->setChecked(!!(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_FORUM)); whileBlocking(ui.notify_Posted )->setChecked(!!(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_POSTED)); #if 0 - whileBlocking(ui.notify_Blogs)->setChecked(newsflags & RS_FEED_TYPE_BLOG); + whileBlocking(ui.notify_Blogs)->setChecked(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_BLOG); #endif #ifdef RS_USE_WIRE - whileBlocking(ui.notify_Wire)->setChecked(newsflags & RS_FEED_TYPE_WIRE); + whileBlocking(ui.notify_Wire)->setChecked(!!(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_WIRE)); #endif whileBlocking(ui.notify_Chat )->setChecked(!!(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_CHAT)); diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index a2f002acd..b34d59d02 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -142,7 +142,7 @@ void RshareSettings::initSettings() RsFeedTypeFlags defNewsFeed = (RsFeedTypeFlags::RS_FEED_TYPE_MSG | RsFeedTypeFlags::RS_FEED_TYPE_FILES | RsFeedTypeFlags::RS_FEED_TYPE_SECURITY | RsFeedTypeFlags::RS_FEED_TYPE_SECURITY_IP | RsFeedTypeFlags::RS_FEED_TYPE_CIRCLE | RsFeedTypeFlags::RS_FEED_TYPE_CHANNEL |RsFeedTypeFlags::RS_FEED_TYPE_FORUM | RsFeedTypeFlags::RS_FEED_TYPE_POSTED); #ifdef RS_USE_WIRE - RsFeedTypeFlags defNewsFeed = (RsFeedTypeFlags::RS_FEED_TYPE_WIRE); + defNewsFeed = (defNewsFeed | RsFeedTypeFlags::RS_FEED_TYPE_WIRE); #endif setDefault(SETTING_NEWSFEED_FLAGS, (int)defNewsFeed);