Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-10-14 06:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed ifdef problem

Browse source
This commit is contained in:
csoler 2025-09-11 21:23:12 +02:00
parent d64e4b6e78
commit ee3afd9f40
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/FriendsDialog.cpp
View file

@ -81,7 +81,6 @@ FriendsDialog::FriendsDialog(QWidget *parent) : MainPage(parent)
//connect(NotifyQt::getInstance(), SIGNAL(chatMessageReceived(ChatMessage)), this, SLOT(chatMessageReceived(ChatMessage))); //connect(NotifyQt::getInstance(), SIGNAL(chatMessageReceived(ChatMessage)), this, SLOT(chatMessageReceived(ChatMessage)));
//connect(NotifyQt::getInstance(), SIGNAL(chatStatusChanged(ChatId,QString)), this, SLOT(chatStatusReceived(ChatId,QString))); //connect(NotifyQt::getInstance(), SIGNAL(chatStatusChanged(ChatId,QString)), this, SLOT(chatStatusReceived(ChatId,QString)));
mEventHandlerId_friends = 0;
mEventHandlerId_chat = 0; mEventHandlerId_chat = 0;
rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e) rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e)
@ -102,6 +101,10 @@ FriendsDialog::FriendsDialog(QWidget *parent) : MainPage(parent)
, this ); , this );
}, mEventHandlerId_chat, RsEventType::CHAT_SERVICE ); }, mEventHandlerId_chat, RsEventType::CHAT_SERVICE );
#else // def RS_DIRECT_CHAT
ui.tabWidget->removeTab(ui.tabWidget->indexOf(ui.groupChatTab));
#endif // def RS_DIRECT_CHAT
rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e) rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e)
{ {
RsQThreadUtils::postToObject([=]() RsQThreadUtils::postToObject([=]()
@ -120,10 +123,7 @@ FriendsDialog::FriendsDialog(QWidget *parent) : MainPage(parent)
, this ); , this );
}, mEventHandlerId_friends, RsEventType::FRIEND_LIST ); }, mEventHandlerId_friends, RsEventType::FRIEND_LIST );
#else // def RS_DIRECT_CHAT mEventHandlerId_friends = 0;
ui.tabWidget->removeTab(ui.tabWidget->indexOf(ui.groupChatTab));
#endif // def RS_DIRECT_CHAT
connect( ui.mypersonalstatusLabel, SIGNAL(clicked()), SLOT(statusmessage())); connect( ui.mypersonalstatusLabel, SIGNAL(clicked()), SLOT(statusmessage()));
connect( ui.actionSet_your_Avatar, SIGNAL(triggered()), this, SLOT(getAvatar())); connect( ui.actionSet_your_Avatar, SIGNAL(triggered()), this, SLOT(getAvatar()));

2
retroshare-gui/src/gui/FriendsDialog.h
View file

@ -93,8 +93,8 @@ private:
/** Qt Designer generated object */ /** Qt Designer generated object */
Ui::FriendsDialog ui; Ui::FriendsDialog ui;
#ifdef RS_DIRECT_CHAT
RsEventsHandlerId_t mEventHandlerId_friends ; RsEventsHandlerId_t mEventHandlerId_friends ;
#ifdef RS_DIRECT_CHAT
RsEventsHandlerId_t mEventHandlerId_chat ; RsEventsHandlerId_t mEventHandlerId_chat ;
#endif #endif
}; };