StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor: Remove call type from callAccepted signal

Browse Source
This commit is contained in:
Diadlo 2017-10-27 20:27:15 +03:00
parent 7b893346f0
commit 1f8a5619c8
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widget/chatformheader.cpp
View File

@ -170,9 +170,7 @@ void ChatFormHeader::showCallConfirm(bool video)
QWidget* btn = video ? videoButton : callButton; QWidget* btn = video ? videoButton : callButton;
callConfirm = std::unique_ptr<CallConfirmWidget>(new CallConfirmWidget(btn)); callConfirm = std::unique_ptr<CallConfirmWidget>(new CallConfirmWidget(btn));
callConfirm->show(); callConfirm->show();
connect(callConfirm.get(), &CallConfirmWidget::accepted, this, [this, video]{ connect(callConfirm.get(), &CallConfirmWidget::accepted, this, &ChatFormHeader::callAccepted);
emit callAccepted(video);
});
connect(callConfirm.get(), &CallConfirmWidget::rejected, this, &ChatFormHeader::callRejected); connect(callConfirm.get(), &CallConfirmWidget::rejected, this, &ChatFormHeader::callRejected);
} }

2
src/widget/chatformheader.h
View File

@ -71,7 +71,7 @@ signals:
void nameChanged(const QString& name); void nameChanged(const QString& name);
void callAccepted(bool video); void callAccepted();
void callRejected(); void callRejected();
private slots: private slots:

4
src/widget/form/chatform.cpp
View File

@ -345,7 +345,9 @@ void ChatForm::onAvInvite(uint32_t friendId, bool video)
onAvStart(friendId, video); onAvStart(friendId, video);
} else { } else {
headWidget->showCallConfirm(video); headWidget->showCallConfirm(video);
connect(headWidget, &ChatFormHeader::callAccepted, this, &ChatForm::onAnswerCallTriggered); connect(headWidget, &ChatFormHeader::callAccepted, this, [this, video] {
onAnswerCallTriggered(video);
});
connect(headWidget, &ChatFormHeader::callRejected, this, &ChatForm::onRejectCallTriggered); connect(headWidget, &ChatFormHeader::callRejected, this, &ChatForm::onRejectCallTriggered);
auto msg = ChatMessage::createChatInfoMessage(tr("%1 calling").arg(displayedName), auto msg = ChatMessage::createChatInfoMessage(tr("%1 calling").arg(displayedName),
ChatMessage::INFO, QDateTime::currentDateTime()); ChatMessage::INFO, QDateTime::currentDateTime());