From d1ec6db24934b9cb0f2f51609b83406d577eb69f Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed, 2 Apr 2025 20:48:36 +0100 Subject: [PATCH] qt, refactor: Inline `GUIUtil::GetImage` function --- src/qt/guiutil.cpp | 9 --------- src/qt/guiutil.h | 1 - src/qt/qrimagewidget.cpp | 6 +++++- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 91f566ce1f..c1bf5a5603 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -962,15 +962,6 @@ bool HasPixmap(const QLabel* label) return !label->pixmap(Qt::ReturnByValue).isNull(); } -QImage GetImage(const QLabel* label) -{ - if (!HasPixmap(label)) { - return QImage(); - } - - return label->pixmap(Qt::ReturnByValue).toImage(); -} - QString MakeHtmlLink(const QString& source, const QString& link) { return QString(source).replace( diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index cc94054d23..3561c31374 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -347,7 +347,6 @@ namespace GUIUtil * QPixmap* QLabel::pixmap() is deprecated since Qt 5.15. */ bool HasPixmap(const QLabel* label); - QImage GetImage(const QLabel* label); /** * Splits the string into substrings wherever separator occurs, and returns diff --git a/src/qt/qrimagewidget.cpp b/src/qt/qrimagewidget.cpp index e912dafa60..79b5cde9ab 100644 --- a/src/qt/qrimagewidget.cpp +++ b/src/qt/qrimagewidget.cpp @@ -92,7 +92,11 @@ bool QRImageWidget::setQR(const QString& data, const QString& text) QImage QRImageWidget::exportImage() { - return GUIUtil::GetImage(this); + if (!GUIUtil::HasPixmap(this)) { + return QImage(); + } + + return this->pixmap(Qt::ReturnByValue).toImage(); } void QRImageWidget::mousePressEvent(QMouseEvent *event)