GUI: Remove unused, and invalid, cached QR pixmap pointer.

Plus delete AddNewContactDialog dialog after use it. Github-Pull: #2555 Rebased-From: c5e81a1
PIVX-Project · Sep 20, 2021 · 2981a17 · 2981a17
1 parent 798c3e9
commit 2981a17
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 27 deletions.
diff --git a/src/qt/pivx/receivedialog.cpp b/src/qt/pivx/receivedialog.cpp
@@ -5,8 +5,9 @@
 #include "qt/pivx/receivedialog.h"
 #include "qt/pivx/forms/ui_receivedialog.h"
 #include "qt/pivx/qtutils.h"
-#include "walletmodel.h"
-#include <QFile>
+#include "qt/walletmodel.h"
+
+#include <QPixmap>
 
 ReceiveDialog::ReceiveDialog(QWidget *parent) :
     FocusedDialog(parent),
@@ -45,7 +46,7 @@ ReceiveDialog::ReceiveDialog(QWidget *parent) :
     connect(ui->btnSave, &QPushButton::clicked, this, &ReceiveDialog::onCopy);
 }
 
-void ReceiveDialog::updateQr(QString address)
+void ReceiveDialog::updateQr(const QString& address)
 {
     if (!info) info = new SendCoinsRecipient();
     info->address = address;
@@ -55,8 +56,7 @@ void ReceiveDialog::updateQr(QString address)
     QString error;
     QPixmap pixmap = encodeToQr(uri, error);
     if (!pixmap.isNull()) {
-        qrImage = &pixmap;
-        ui->labelQrImg->setPixmap(qrImage->scaled(ui->labelQrImg->width(), ui->labelQrImg->height()));
+        ui->labelQrImg->setPixmap(pixmap.scaled(ui->labelQrImg->width(), ui->labelQrImg->height()));
     } else {
         ui->labelQrImg->setText(!error.isEmpty() ? error : "Error encoding address");
     }

diff --git a/src/qt/pivx/receivedialog.h b/src/qt/pivx/receivedialog.h
@@ -6,7 +6,6 @@
 #define RECEIVEDIALOG_H
 
 #include "qt/pivx/focuseddialog.h"
-#include <QPixmap>
 
 class SendCoinsRecipient;
 
@@ -22,13 +21,12 @@ class ReceiveDialog : public FocusedDialog
     explicit ReceiveDialog(QWidget *parent = nullptr);
     ~ReceiveDialog();
 
-    void updateQr(QString address);
+    void updateQr(const QString& address);
 
 private Q_SLOTS:
     void onCopy();
 private:
     Ui::ReceiveDialog *ui{nullptr};
-    QPixmap *qrImage{nullptr};
     SendCoinsRecipient *info{nullptr};
 };
 

diff --git a/src/qt/pivx/receivewidget.cpp b/src/qt/pivx/receivewidget.cpp
@@ -8,7 +8,6 @@
 #include "qt/pivx/addnewcontactdialog.h"
 #include "qt/pivx/qtutils.h"
 #include "qt/pivx/myaddressrow.h"
-#include "qt/pivx/furlistrow.h"
 #include "qt/pivx/addressholder.h"
 #include "walletmodel.h"
 #include "guiutil.h"
@@ -145,11 +144,10 @@ void ReceiveWidget::refreshView(const QModelIndex& tl, const QModelIndex& br)
     return refreshView(index.data(Qt::DisplayRole).toString());
 }
 
-void ReceiveWidget::refreshView(QString refreshAddress)
+void ReceiveWidget::refreshView(const QString& refreshAddress)
 {
     try {
-        QString latestAddress = (refreshAddress.isEmpty()) ? this->addressTableModel->getAddressToShow(shieldedMode) : refreshAddress;
-
+        const QString& latestAddress = (refreshAddress.isEmpty()) ? addressTableModel->getAddressToShow(shieldedMode) : refreshAddress;
         if (latestAddress.isEmpty()) {
             // Check for generation errors
             ui->labelQrImg->setText(tr("No available address\ntry unlocking the wallet"));
@@ -189,7 +187,7 @@ void ReceiveWidget::updateLabel()
     }
 }
 
-void ReceiveWidget::updateQr(QString& address)
+void ReceiveWidget::updateQr(const QString& address)
 {
     info->address = address;
     QString uri = GUIUtil::formatBitcoinURI(*info);
@@ -199,8 +197,7 @@ void ReceiveWidget::updateQr(QString& address)
     QColor qrColor("#382d4d");
     QPixmap pixmap = encodeToQr(uri, error, qrColor);
     if (!pixmap.isNull()) {
-        qrImage = &pixmap;
-        ui->labelQrImg->setPixmap(qrImage->scaled(ui->labelQrImg->width(), ui->labelQrImg->height()));
+        ui->labelQrImg->setPixmap(pixmap.scaled(ui->labelQrImg->width(), ui->labelQrImg->height()));
     } else {
         ui->labelQrImg->setText(!error.isEmpty() ? error : "Error encoding address");
     }
@@ -236,6 +233,7 @@ void ReceiveWidget::onLabelClicked()
                 inform(tr("Error storing address label"));
             }
         }
+        dialog->deleteLater();
         isShowingDialog = false;
     }
 }

diff --git a/src/qt/pivx/receivewidget.h b/src/qt/pivx/receivewidget.h
@@ -45,7 +45,7 @@ private Q_SLOTS:
     void onLabelClicked();
     void onCopyClicked();
     void refreshView(const QModelIndex& tl, const QModelIndex& br);
-    void refreshView(QString refreshAddress = QString());
+    void refreshView(const QString& refreshAddress = QString());
     void handleAddressClicked(const QModelIndex &index);
     void onSortChanged(int idx);
     void onSortOrderChanged(int idx);
@@ -62,14 +62,12 @@ private Q_SLOTS:
 
     // Cached last address
     SendCoinsRecipient *info{nullptr};
-    // Cached qr
-    QPixmap *qrImage{nullptr};
 
     // Cached sort type and order
     AddressTableModel::ColumnIndex sortType = AddressTableModel::Label;
     Qt::SortOrder sortOrder = Qt::AscendingOrder;
 
-    void updateQr(QString& address);
+    void updateQr(const QString& address);
     void updateLabel();
     void showAddressGenerationDialog(bool isPaymentRequest);
     void sortAddresses();

diff --git a/src/qt/pivx/requestdialog.cpp b/src/qt/pivx/requestdialog.cpp
@@ -162,21 +162,20 @@ void RequestDialog::showEvent(QShowEvent *event)
     if (ui->lineEditAmount) ui->lineEditAmount->setFocus();
 }
 
-void RequestDialog::updateQr(QString str)
+void RequestDialog::updateQr(const QString& str)
 {
     QString uri = GUIUtil::formatBitcoinURI(*info);
     ui->labelQrImg->setText("");
     QString error;
     QPixmap pixmap = encodeToQr(uri, error);
     if (!pixmap.isNull()) {
-        qrImage = &pixmap;
-        ui->labelQrImg->setPixmap(qrImage->scaled(ui->labelQrImg->width(), ui->labelQrImg->height()));
+        ui->labelQrImg->setPixmap(pixmap.scaled(ui->labelQrImg->width(), ui->labelQrImg->height()));
     } else {
         ui->labelQrImg->setText(!error.isEmpty() ? error : "Error encoding address");
     }
 }
 
-void RequestDialog::inform(QString text)
+void RequestDialog::inform(const QString& text)
 {
     if (!snackBar)
         snackBar = new SnackBar(nullptr, this);

diff --git a/src/qt/pivx/requestdialog.h b/src/qt/pivx/requestdialog.h
@@ -45,10 +45,8 @@ private Q_SLOTS:
     // Cached last address
     SendCoinsRecipient *info{nullptr};
 
-    QPixmap *qrImage{nullptr};
-
-    void updateQr(QString str);
-    void inform(QString text);
+    void updateQr(const QString& str);
+    void inform(const QString& text);
 };
 
 #endif // REQUESTDIALOG_H