1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Change some signal connections to new style

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2015-01-25 21:51:21 +01:00
parent 2c6b457caf
commit 0eba4fefca
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -273,28 +273,28 @@ void ChatForm::onAvInvite(int FriendId, int CallId, bool video)
callConfirm = new CallConfirmWidget(videoButton); callConfirm = new CallConfirmWidget(videoButton);
if (isVisible()) if (isVisible())
callConfirm->show(); callConfirm->show();
connect(callConfirm, SIGNAL(accepted()), this, SLOT(onAnswerCallTriggered())); connect(callConfirm, &CallConfirmWidget::accepted, this, &ChatForm::onAnswerCallTriggered);
connect(callConfirm, SIGNAL(rejected()), this, SLOT(onRejectCallTriggered())); connect(callConfirm, &CallConfirmWidget::rejected, this, &ChatForm::onRejectCallTriggered);
callButton->setObjectName("grey"); callButton->setObjectName("grey");
callButton->style()->polish(callButton); callButton->style()->polish(callButton);
videoButton->setObjectName("yellow"); videoButton->setObjectName("yellow");
videoButton->style()->polish(videoButton); videoButton->style()->polish(videoButton);
connect(videoButton, SIGNAL(clicked()), this, SLOT(onAnswerCallTriggered())); connect(videoButton, &QPushButton::clicked, this, &ChatForm::onAnswerCallTriggered);
} }
else else
{ {
callConfirm = new CallConfirmWidget(callButton); callConfirm = new CallConfirmWidget(callButton);
if (isVisible()) if (isVisible())
callConfirm->show(); callConfirm->show();
connect(callConfirm, SIGNAL(accepted()), this, SLOT(onAnswerCallTriggered())); connect(callConfirm, &CallConfirmWidget::accepted, this, &ChatForm::onAnswerCallTriggered);
connect(callConfirm, SIGNAL(rejected()), this, SLOT(onRejectCallTriggered())); connect(callConfirm, &CallConfirmWidget::rejected, this, &ChatForm::onRejectCallTriggered);
callButton->setObjectName("yellow"); callButton->setObjectName("yellow");
callButton->style()->polish(callButton); callButton->style()->polish(callButton);
videoButton->setObjectName("grey"); videoButton->setObjectName("grey");
videoButton->style()->polish(videoButton); videoButton->style()->polish(videoButton);
connect(callButton, SIGNAL(clicked()), this, SLOT(onAnswerCallTriggered())); connect(callButton, &QPushButton::clicked, this, &ChatForm::onAnswerCallTriggered);
} }
addSystemInfoMessage(tr("%1 is calling").arg(f->getDisplayedName()), "white", QDateTime::currentDateTime()); addSystemInfoMessage(tr("%1 is calling").arg(f->getDisplayedName()), "white", QDateTime::currentDateTime());