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

Merge branch 'pr1661'

Browse Source
This commit is contained in:
tux3 2015-05-16 14:08:35 +02:00
commit 7d93379834
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,7 +401,7 @@ void ChatForm::onAvRinging(uint32_t FriendId, int CallId, bool video)
addSystemInfoMessage(tr("Calling to %1").arg(f->getDisplayedName()), ChatMessage::INFO, QDateTime::currentDateTime()); addSystemInfoMessage(tr("Calling to %1").arg(f->getDisplayedName()), ChatMessage::INFO, QDateTime::currentDateTime());
} }
void ChatForm::onAvStarting(uint32_t FriendId, int CallId, bool video) void ChatForm::onAvStarting(uint32_t FriendId, int, bool video)
{ {
if (FriendId != f->getFriendID()) if (FriendId != f->getFriendID())
return; return;

2
src/widget/tool/screengrabberoverlayitem.cpp
View File

@ -52,7 +52,7 @@ void ScreenGrabberOverlayItem::mousePressEvent(QGraphicsSceneMouseEvent* event)
} }
void ScreenGrabberOverlayItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) void ScreenGrabberOverlayItem::paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*)
{ {
painter->setBrush(brush()); painter->setBrush(brush());
painter->setPen(pen()); painter->setPen(pen());