From e3d05d5474a04ff3d0f29c32eaaf87f90ad7c2b2 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 30 Nov 2025 17:07:04 +0100 Subject: [PATCH] moved GxsFeedItem and GxsGroupFeedItem to feeds/ as a more appropriate place --- retroshare-gui/src/gui/Posted/PostedItem.h | 2 +- retroshare-gui/src/gui/feeds/BoardsCommentsItem.h | 2 +- retroshare-gui/src/gui/feeds/BoardsPostItem.h | 2 +- retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h | 2 +- retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h | 2 +- retroshare-gui/src/gui/feeds/GxsChannelPostItem.h | 2 +- .../src/gui/{gxs => feeds}/GxsFeedItem.cpp | 2 +- retroshare-gui/src/gui/{gxs => feeds}/GxsFeedItem.h | 2 +- retroshare-gui/src/gui/feeds/GxsForumGroupItem.h | 2 +- retroshare-gui/src/gui/feeds/GxsForumMsgItem.h | 2 +- .../src/gui/{gxs => feeds}/GxsGroupFeedItem.cpp | 5 +++-- .../src/gui/{gxs => feeds}/GxsGroupFeedItem.h | 2 +- retroshare-gui/src/gui/feeds/PostedGroupItem.h | 2 +- retroshare-gui/src/retroshare-gui.pro | 12 ++++++------ 14 files changed, 21 insertions(+), 20 deletions(-) rename retroshare-gui/src/gui/{gxs => feeds}/GxsFeedItem.cpp (98%) rename retroshare-gui/src/gui/{gxs => feeds}/GxsFeedItem.h (97%) rename retroshare-gui/src/gui/{gxs => feeds}/GxsGroupFeedItem.cpp (97%) rename retroshare-gui/src/gui/{gxs => feeds}/GxsGroupFeedItem.h (97%) diff --git a/retroshare-gui/src/gui/Posted/PostedItem.h b/retroshare-gui/src/gui/Posted/PostedItem.h index a2f432dc0..2f1bc51b1 100644 --- a/retroshare-gui/src/gui/Posted/PostedItem.h +++ b/retroshare-gui/src/gui/Posted/PostedItem.h @@ -24,7 +24,7 @@ #include #include -#include "gui/gxs/GxsFeedItem.h" +#include "gui/feeds/GxsFeedItem.h" namespace Ui { class PostedItem; diff --git a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.h b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.h index d5bff44b7..bffbf5bf6 100644 --- a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.h +++ b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.h @@ -24,7 +24,7 @@ #include #include -#include "gui/gxs/GxsFeedItem.h" +#include "gui/feeds/GxsFeedItem.h" namespace Ui { class BoardsCommentsItem; diff --git a/retroshare-gui/src/gui/feeds/BoardsPostItem.h b/retroshare-gui/src/gui/feeds/BoardsPostItem.h index 168946c40..3b8845f63 100644 --- a/retroshare-gui/src/gui/feeds/BoardsPostItem.h +++ b/retroshare-gui/src/gui/feeds/BoardsPostItem.h @@ -24,7 +24,7 @@ #include #include -#include "gui/gxs/GxsFeedItem.h" +#include "gui/feeds/GxsFeedItem.h" namespace Ui { class BoardsPostItem; diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h index 6cd25154e..87192c7d0 100644 --- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h +++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h @@ -24,7 +24,7 @@ #include #include -#include "gui/gxs/GxsFeedItem.h" +#include "gui/feeds/GxsFeedItem.h" namespace Ui { class ChannelsCommentsItem; diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h index 604145941..ab9aaf088 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h +++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h @@ -22,7 +22,7 @@ #define _GXSCHANNELGROUPITEM_H #include -#include "gui/gxs/GxsGroupFeedItem.h" +#include "gui/feeds/GxsGroupFeedItem.h" namespace Ui { class GxsChannelGroupItem; diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h index cdcd56088..4c4503ec0 100644 --- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h +++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h @@ -24,7 +24,7 @@ #include #include -#include "gui/gxs/GxsFeedItem.h" +#include "gui/feeds/GxsFeedItem.h" namespace Ui { class GxsChannelPostItem; diff --git a/retroshare-gui/src/gui/gxs/GxsFeedItem.cpp b/retroshare-gui/src/gui/feeds/GxsFeedItem.cpp similarity index 98% rename from retroshare-gui/src/gui/gxs/GxsFeedItem.cpp rename to retroshare-gui/src/gui/feeds/GxsFeedItem.cpp index b9f2e68ee..524ecc578 100644 --- a/retroshare-gui/src/gui/gxs/GxsFeedItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsFeedItem.cpp @@ -18,7 +18,7 @@ * * *******************************************************************************/ -#include "gui/gxs/GxsFeedItem.h" +#include "gui/feeds/GxsFeedItem.h" #include "gui/feeds/FeedHolder.h" #include "gui/gxs/RsGxsUpdateBroadcastBase.h" diff --git a/retroshare-gui/src/gui/gxs/GxsFeedItem.h b/retroshare-gui/src/gui/feeds/GxsFeedItem.h similarity index 97% rename from retroshare-gui/src/gui/gxs/GxsFeedItem.h rename to retroshare-gui/src/gui/feeds/GxsFeedItem.h index bc75d1837..b33db7f18 100644 --- a/retroshare-gui/src/gui/gxs/GxsFeedItem.h +++ b/retroshare-gui/src/gui/feeds/GxsFeedItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/gxs/GxsFeedItem.h * + * retroshare-gui/src/gui/feeds/GxsFeedItem.h * * * * Copyright 2012-2013 by Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h index 4a70a215d..31026f18c 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h +++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h @@ -23,7 +23,7 @@ #include #include -#include "gui/gxs/GxsGroupFeedItem.h" +#include "gui/feeds/GxsGroupFeedItem.h" namespace Ui { class GxsForumGroupItem; diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h index e6dc533d5..2c8e55292 100644 --- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h +++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h @@ -22,7 +22,7 @@ #define _GXSFORUMMSGITEM_H #include -#include "gui/gxs/GxsFeedItem.h" +#include "gui/feeds/GxsFeedItem.h" namespace Ui { class GxsForumMsgItem; diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp b/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.cpp similarity index 97% rename from retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp rename to retroshare-gui/src/gui/feeds/GxsGroupFeedItem.cpp index aee6c5085..523f41076 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp +++ b/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/gxs/GxsGroupFeedItem.cpp * + * retroshare-gui/src/gui/feeds/GxsGroupFeedItem.cpp * * * * Copyright 2012-2013 by Robert Fernie * * * @@ -20,7 +20,8 @@ #include -#include "gui/gxs/GxsGroupFeedItem.h" +#include "GxsGroupFeedItem.h" + #include "gui/feeds/FeedHolder.h" #include "gui/gxs/RsGxsUpdateBroadcastBase.h" diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.h b/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.h similarity index 97% rename from retroshare-gui/src/gui/gxs/GxsGroupFeedItem.h rename to retroshare-gui/src/gui/feeds/GxsGroupFeedItem.h index 83a8366ee..c70879bbd 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFeedItem.h +++ b/retroshare-gui/src/gui/feeds/GxsGroupFeedItem.h @@ -1,5 +1,5 @@ /******************************************************************************* - * retroshare-gui/src/gui/gxs/GxsGroupFeedItem.h * + * retroshare-gui/src/gui/feeds/GxsGroupFeedItem.h * * * * Copyright 2012-2013 by Robert Fernie * * * diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.h b/retroshare-gui/src/gui/feeds/PostedGroupItem.h index 835c7ce19..fdda04922 100644 --- a/retroshare-gui/src/gui/feeds/PostedGroupItem.h +++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.h @@ -22,7 +22,7 @@ #define _POSTEDGROUPITEM_H #include -#include "gui/gxs/GxsGroupFeedItem.h" +#include "gui/feeds/GxsGroupFeedItem.h" namespace Ui { class PostedGroupItem; diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 8e108243f..33f56e68e 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -599,8 +599,10 @@ HEADERS += rshare.h \ gui/feeds/BoardsPostItem.h \ gui/feeds/FeedItem.h \ gui/feeds/FeedHolder.h \ + gui/feeds/GxsGroupFeedItem.h \ gui/feeds/GxsCircleItem.h \ gui/feeds/ChannelsCommentsItem.h \ + gui/feeds/GxsFeedItem.h \ gui/feeds/PeerItem.h \ gui/feeds/MsgItem.h \ gui/feeds/ChatMsgItem.h \ @@ -963,9 +965,11 @@ SOURCES += main.cpp \ gui/feeds/BoardsCommentsItem.cpp \ gui/feeds/BoardsPostItem.cpp \ gui/feeds/FeedItem.cpp \ + gui/feeds/GxsGroupFeedItem.cpp \ gui/feeds/FeedHolder.cpp \ gui/feeds/GxsCircleItem.cpp \ gui/feeds/ChannelsCommentsItem.cpp \ + gui/feeds/GxsFeedItem.cpp \ gui/feeds/PeerItem.cpp \ gui/feeds/MsgItem.cpp \ gui/feeds/ChatMsgItem.cpp \ @@ -1447,11 +1451,9 @@ gxsgui { gui/gxs/GxsGroupFrameDialog.h \ gui/gxs/GxsMessageFrameWidget.h \ gui/gxs/GxsMessageFramePostWidget.h \ - gui/gxs/GxsGroupFeedItem.h \ - gui/gxs/GxsFeedItem.h \ gui/gxs/GxsGroupShareKey.h \ gui/gxs/GxsUserNotify.h \ - gui/gxs/GxsFeedWidget.h \ +# gui/gxs/GxsFeedWidget.h \ util/TokenQueue.h \ util/RsGxsUpdateBroadcast.h \ @@ -1481,10 +1483,8 @@ gxsgui { gui/gxs/GxsGroupFrameDialog.cpp \ gui/gxs/GxsMessageFrameWidget.cpp \ gui/gxs/GxsMessageFramePostWidget.cpp \ - gui/gxs/GxsGroupFeedItem.cpp \ - gui/gxs/GxsFeedItem.cpp \ gui/gxs/GxsUserNotify.cpp \ - gui/gxs/GxsFeedWidget.cpp \ +# gui/gxs/GxsFeedWidget.cpp \ util/TokenQueue.cpp \ util/RsGxsUpdateBroadcast.cpp \