jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address a handful of warnings from #6095 (#4199)

Browse source
This commit is contained in:
Zach H 2020-12-01 11:30:22 -05:00 • committed by GitHub
parent 8845a23d5d
commit 34e951298f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 49 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cockatrice/src/playertarget.cpp
View file

@ -24,7 +24,7 @@ PlayerCounter::PlayerCounter(Player *_player,
QRectF PlayerCounter::boundingRect() const
{
return QRectF(0, 0, 50, 30);
return {0, 0, 50, 30};
}
void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
@ -56,13 +56,14 @@ void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*
}
PlayerTarget::PlayerTarget(Player *_owner, QGraphicsItem *parentItem, QWidget *_game)
: ArrowTarget(_owner, parentItem), playerCounter(0), game(_game)
: ArrowTarget(_owner, parentItem), playerCounter(nullptr), game(_game)
{
setCacheMode(DeviceCoordinateCache);
const std::string &bmp = _owner->getUserInfo()->avatar_bmp();
if (!fullPixmap.loadFromData((const uchar *)bmp.data(), bmp.size()))
if (!fullPixmap.loadFromData((const uchar *)bmp.data(), static_cast<uint>(bmp.size()))) {
fullPixmap = QPixmap();
}
}
PlayerTarget::~PlayerTarget()
@ -74,7 +75,7 @@ PlayerTarget::~PlayerTarget()
QRectF PlayerTarget::boundingRect() const
{
return QRectF(0, 0, 160, 64);
return {0, 0, 160, 64};
}
void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
@ -153,7 +154,7 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o
AbstractCounter *PlayerTarget::addCounter(int _counterId, const QString &_name, int _value)
{
if (playerCounter) {
disconnect(playerCounter, 0, this, 0);
disconnect(playerCounter, nullptr, this, nullptr);
playerCounter->delCounter();
}
@ -167,5 +168,5 @@ AbstractCounter *PlayerTarget::addCounter(int _counterId, const QString &_name,
void PlayerTarget::counterDeleted()
{
playerCounter = 0;
playerCounter = nullptr;
}