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

removed all left rsnotify elements and moved uint32 flags to proper enum classes

Browse source
This commit is contained in:
csoler 2025-10-07 21:13:24 +02:00
parent 116c7f1aec
commit ff68c770d8
37 changed files with 360 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/chat/ChatDialog.cpp
View file

@ -86,7 +86,7 @@ void ChatDialog::init(const ChatId &id, const QString &title)
return NULL;
}
/*static*/ ChatDialog* ChatDialog::getChat(ChatId id, uint chatflags)
/*static*/ ChatDialog* ChatDialog::getChat(ChatId id, RsChatFlags chatflags)
{
if(id.isBroadcast() || id.isNotSet())
return NULL; // broadcast is not handled by a chat dialog
@ -97,9 +97,9 @@ void ChatDialog::init(const ChatId &id, const QString &title)
if (cd == NULL) {
if(id.isDistantChatId())
chatflags = RS_CHAT_OPEN | RS_CHAT_FOCUS; // force open for distant chat
chatflags = RsChatFlags::RS_CHAT_OPEN | RsChatFlags::RS_CHAT_FOCUS; // force open for distant chat
if (chatflags & RS_CHAT_OPEN) {
if (!!(chatflags & RsChatFlags::RS_CHAT_OPEN)) {
if (id.isLobbyId()) {
ChatLobbyDialog* cld = new ChatLobbyDialog(id.toLobbyId());
cld->init(ChatId(), "");
@ -176,7 +176,7 @@ void ChatDialog::init(const ChatId &id, const QString &title)
// play sound when recv a message
SoundManager::play(SOUND_NEW_CHAT_MESSAGE);
ChatDialog *cd = getChat(msg.chat_id, Settings->getChatFlags());
ChatDialog *cd = getChat(msg.chat_id, (RsChatFlags)Settings->getChatFlags());
if(cd)
cd->addChatMsg(msg);
else
@ -185,7 +185,7 @@ void ChatDialog::init(const ChatId &id, const QString &title)
/*static*/ void ChatDialog::chatFriend(const ChatId &peerId, const bool forceFocus)
{
getChat(peerId, forceFocus ? RS_CHAT_OPEN | RS_CHAT_FOCUS : RS_CHAT_OPEN);
getChat(peerId, forceFocus ? (RsChatFlags::RS_CHAT_OPEN | RsChatFlags::RS_CHAT_FOCUS) : RsChatFlags::RS_CHAT_OPEN);
// below is the old code witch does lots of error checking.
// because there are many different chat types, there are also different ways to check if the id is valid