Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-09 06:42:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

attempt to sort out the mess in item deletion in FeedHolder widgets

Browse source
This commit is contained in:
csoler 2020-01-14 21:43:29 +01:00
parent a0b6f50b60
commit c552890459
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
35 changed files with 149 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

32
retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
View file

@ -43,7 +43,7 @@
/** Constructor */
ChatMsgItem::ChatMsgItem(FeedHolder *parent, uint32_t feedId, const RsPeerId &peerId, const std::string &message) :
FeedItem(NULL), mParent(parent), mFeedId(feedId), mPeerId(peerId)
FeedItem(parent,feedId,NULL), mPeerId(peerId)
{
/* Invoke the Qt Designer generated object setup routine */
setupUi(this);
@ -153,26 +153,6 @@ void ChatMsgItem::insertChat(const std::string &message)
chatTextlabel->setText(formatMsg);
}
void ChatMsgItem::removeItem()
{
#ifdef DEBUG_ITEM
std::cerr << "ChatMsgItem::removeItem()";
std::cerr << std::endl;
#endif
if (mParent) {
mParent->lockLayout(this, true);
}
hide();
if (mParent) {
mParent->lockLayout(this, false);
mParent->deleteFeedItem(this, mFeedId);
}
}
void ChatMsgItem::gotoHome()
{
#ifdef DEBUG_ITEM
@ -191,7 +171,7 @@ void ChatMsgItem::sendMsg()
std::cerr << std::endl;
#endif
if (mParent)
if (mFeedHolder)
{
MessageComposer *nMsgDialog = MessageComposer::newMsg();
@ -214,15 +194,15 @@ void ChatMsgItem::openChat()
std::cerr << "ChatMsgItem::openChat()";
std::cerr << std::endl;
#endif
if (mParent)
if (mFeedHolder)
{
mParent->openChat(mPeerId);
mFeedHolder->openChat(mPeerId);
}
}
void ChatMsgItem::togglequickmessage()
{
mParent->lockLayout(this, true);
mFeedHolder->lockLayout(this, true);
if (messageFrame->isHidden())
{
@ -239,7 +219,7 @@ void ChatMsgItem::togglequickmessage()
emit sizeChanged(this);
mParent->lockLayout(this, false);
mFeedHolder->lockLayout(this, false);
}
void ChatMsgItem::sendMessage()