jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 08:14:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

qt 5.15 compatibility (#4027)

Browse source
This commit is contained in:
ebbit1q 2020-06-19 16:50:09 +02:00 • committed by GitHub
parent 0f0e0193c1
commit 7fa1936d0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 101 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/dlg_edit_avatar.cpp
View file

@ -10,7 +10,7 @@
#include <QPushButton>
#include <QVBoxLayout>
DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent)
DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image()
{
imageLabel = new QLabel(tr("No image chosen."));
imageLabel->setFixedSize(400, 200);
@ -55,7 +55,6 @@ void DlgEditAvatar::actBrowse()
return;
}
QImage image;
QImageReader imgReader;
imgReader.setDecideFormatFromContent(true);
imgReader.setFileName(fileName);
@ -69,13 +68,9 @@ void DlgEditAvatar::actBrowse()
QByteArray DlgEditAvatar::getImage()
{
const QPixmap *pix = imageLabel->pixmap();
if (!pix || pix->isNull())
return QByteArray();
QImage image = pix->toImage();
if (image.isNull())
if (image.isNull()) {
return QByteArray();
}
QByteArray ba;
QBuffer buffer(&ba);