Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-20 21:29:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed usage of deprecated method "const QPixmap *QLabel::pixmap() const;"

Browse source
This commit is contained in:
thunder2 2025-07-19 03:20:44 +02:00
parent fcd7a213e6
commit b2bec12a43
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View file

@ -700,8 +700,8 @@ void IdEditDialog::removeAvatar()
void IdEditDialog::updateInterface() void IdEditDialog::updateInterface()
{ {
const QPixmap *pixmap = ui->avatarLabel->pixmap(); QPixmap pixmap = ui->avatarLabel->pixmap(Qt::ReturnByValue);
if (pixmap && !pixmap->isNull()) { if (!pixmap.isNull()) {
ui->removeButton->setEnabled(true); ui->removeButton->setEnabled(true);
} else if (mEditGroup.mImage.mSize > 0) { } else if (mEditGroup.mImage.mSize > 0) {
ui->removeButton->setEnabled(true); ui->removeButton->setEnabled(true);

12
retroshare-gui/src/gui/common/AvatarDialog.cpp
View file

@ -107,8 +107,8 @@ void AvatarDialog::removeAvatar()
void AvatarDialog::updateInterface() void AvatarDialog::updateInterface()
{ {
const QPixmap *pixmap = ui->avatarLabel->pixmap(); QPixmap pixmap = ui->avatarLabel->pixmap(Qt::ReturnByValue);
if (pixmap && !pixmap->isNull()) { if (!pixmap.isNull()) {
ui->removeButton->setEnabled(true); ui->removeButton->setEnabled(true);
} else { } else {
ui->removeButton->setEnabled(false); ui->removeButton->setEnabled(false);
@ -123,13 +123,7 @@ void AvatarDialog::setAvatar(const QPixmap &avatar)
void AvatarDialog::getAvatar(QPixmap &avatar) void AvatarDialog::getAvatar(QPixmap &avatar)
{ {
const QPixmap *pixmap = ui->avatarLabel->pixmap(); avatar = ui->avatarLabel->pixmap(Qt::ReturnByValue);
if (!pixmap) {
avatar = QPixmap();
return;
}
avatar = *pixmap;
} }
void AvatarDialog::getAvatar(QByteArray &avatar) void AvatarDialog::getAvatar(QByteArray &avatar)