Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-17 01:24:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compile issues with master

Browse source
This commit is contained in:
defnax 2025-12-09 22:02:24 +01:00
parent ef73c5c9a5
commit c0be74d405
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/NewsFeed.cpp
View file

@ -221,7 +221,7 @@ void NewsFeed::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
if(event->mType == RsEventType::MAIL_STATUS && (!!(flags & RsFeedTypeFlags::RS_FEED_TYPE_MSG))) if(event->mType == RsEventType::MAIL_STATUS && (!!(flags & RsFeedTypeFlags::RS_FEED_TYPE_MSG)))
handleMailEvent(event); 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); handleWireEvent(event);
} }

3
retroshare-gui/src/gui/feeds/FeedItem.h
View file

@ -38,6 +38,9 @@ enum class RsFeedTypeFlags: uint32_t {
RS_FEED_TYPE_POSTED = 0x1000, RS_FEED_TYPE_POSTED = 0x1000,
RS_FEED_TYPE_SECURITY_IP = 0x2000, RS_FEED_TYPE_SECURITY_IP = 0x2000,
RS_FEED_TYPE_CIRCLE = 0x4000, 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_CONNECT = RS_FEED_TYPE_PEER | 0x0001,
RS_FEED_ITEM_PEER_DISCONNECT = RS_FEED_TYPE_PEER | 0x0002, RS_FEED_ITEM_PEER_DISCONNECT = RS_FEED_TYPE_PEER | 0x0002,

2
retroshare-gui/src/gui/feeds/WireNotifyGroupItem.h
View file

@ -22,7 +22,7 @@
#define WIRENOTIFYGROUPITEM_H #define WIRENOTIFYGROUPITEM_H
#include <retroshare/rswire.h> #include <retroshare/rswire.h>
#include "gui/gxs/GxsGroupFeedItem.h" #include "gui/feeds/GxsGroupFeedItem.h"
namespace Ui { namespace Ui {
class WireNotifyGroupItem; class WireNotifyGroupItem;

4
retroshare-gui/src/gui/feeds/WireNotifyPostItem.h
View file

@ -23,8 +23,8 @@
#include <QMetaType> #include <QMetaType>
#include <QWidget> #include <QWidget>
#include <retroshare/rswire.h> #include <retroshare/rswire.h>
#include "gui/gxs/GxsFeedItem.h" #include "gui/feeds/GxsFeedItem.h"
#include "gui/gxs/GxsGroupFeedItem.h" #include "gui/feeds/GxsGroupFeedItem.h"
namespace Ui { namespace Ui {
class WireNotifyPostItem; class WireNotifyPostItem;

3
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
View file

@ -31,7 +31,6 @@
#include "gui/gxs/GxsGroupShareKey.h" #include "gui/gxs/GxsGroupShareKey.h"
#include "gui/common/GroupTreeWidget.h" #include "gui/common/GroupTreeWidget.h"
#include "gui/common/RSTreeWidget.h" #include "gui/common/RSTreeWidget.h"
#include "gui/notifyqt.h"
#include "gui/common/UIStateHelper.h" #include "gui/common/UIStateHelper.h"
#include "gui/common/UserNotify.h" #include "gui/common/UserNotify.h"
#include "util/qtthreadsutils.h" #include "util/qtthreadsutils.h"
@ -173,7 +172,7 @@ void GxsGroupFrameDialog::initUi()
processSettings(true); processSettings(true);
if (groupFrameSettingsType() != GroupFrameSettings::Nothing) { if (groupFrameSettingsType() != GroupFrameSettings::Nothing) {
connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged())); //connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
settingsChanged(); settingsChanged();
} }

2
retroshare-gui/src/gui/gxs/GxsStatisticsProvider.cpp
View file

@ -24,8 +24,6 @@
#include "GxsStatisticsProvider.h" #include "GxsStatisticsProvider.h"
#include "gui/notifyqt.h"
#include "gui/common/UserNotify.h" #include "gui/common/UserNotify.h"
#include "util/qtthreadsutils.h" #include "util/qtthreadsutils.h"
#include "retroshare/rsgxsifacetypes.h" #include "retroshare/rsgxsifacetypes.h"

4
retroshare-gui/src/gui/settings/NotifyPage.cpp
View file

@ -316,11 +316,11 @@ void NotifyPage::load()
whileBlocking(ui.notify_Forums )->setChecked(!!(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_FORUM)); whileBlocking(ui.notify_Forums )->setChecked(!!(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_FORUM));
whileBlocking(ui.notify_Posted )->setChecked(!!(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_POSTED)); whileBlocking(ui.notify_Posted )->setChecked(!!(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_POSTED));
#if 0 #if 0
whileBlocking(ui.notify_Blogs)->setChecked(newsflags & RS_FEED_TYPE_BLOG); whileBlocking(ui.notify_Blogs)->setChecked(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_BLOG);
#endif #endif
#ifdef RS_USE_WIRE #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 #endif
whileBlocking(ui.notify_Chat )->setChecked(!!(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_CHAT)); whileBlocking(ui.notify_Chat )->setChecked(!!(newsflags & RsFeedTypeFlags::RS_FEED_TYPE_CHAT));

2
retroshare-gui/src/gui/settings/rsharesettings.cpp
View file

@ -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); 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 #ifdef RS_USE_WIRE
RsFeedTypeFlags defNewsFeed = (RsFeedTypeFlags::RS_FEED_TYPE_WIRE); defNewsFeed = (defNewsFeed | RsFeedTypeFlags::RS_FEED_TYPE_WIRE);
#endif #endif
setDefault(SETTING_NEWSFEED_FLAGS, (int)defNewsFeed); setDefault(SETTING_NEWSFEED_FLAGS, (int)defNewsFeed);