Skip to content

Commit 540af1e

Browse files
committed
accept() is a qdialog function, rename
rename our accept function which is not meant to override qdialog::accept().. but was inadvertently being called by accept() after pay confirmed.
1 parent 091a9a0 commit 540af1e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/qt/acceptandpayofferlistpage.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ AcceptandPayOfferListPage::AcceptandPayOfferListPage(QWidget *parent) :
3434
this->offerPaid = false;
3535

3636
ui->labelExplanation->setText(tr("Accept and purchase this offer, SysCoins will be used to complete the transaction."));
37-
connect(ui->acceptButton, SIGNAL(clicked()), this, SLOT(accept()));
37+
connect(ui->acceptButton, SIGNAL(clicked()), this, SLOT(acceptOffer()));
3838
connect(ui->lookupButton, SIGNAL(clicked()), this, SLOT(lookup()));
3939
connect(ui->offeridEdit, SIGNAL(textChanged(const QString &)), this, SLOT(resetState()));
4040
}
@@ -68,7 +68,7 @@ void AcceptandPayOfferListPage::updateCaption()
6868

6969
}
7070
// send offeraccept with offer guid/qty as params and then send offerpay with wtxid (first param of response) as param, using RPC commands.
71-
void AcceptandPayOfferListPage::accept()
71+
void AcceptandPayOfferListPage::acceptOffer()
7272
{
7373

7474
Array params;

src/qt/acceptandpayofferlistpage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class AcceptandPayOfferListPage : public QDialog
3737
void setValue(const COffer &offer);
3838
void updateCaption();
3939
public slots:
40-
void accept();
40+
void acceptOffer();
4141
void lookup();
4242
void resetState();
4343
private:

src/qt/offeracceptdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ OfferAcceptDialog::OfferAcceptDialog(COffer& offer, long quantity, QString notes
2525
this->offerPaid = false;
2626
this->offerAcceptGUID = QString("");
2727
this->offerAcceptTXID = QString("");
28-
connect(ui->acceptButton, SIGNAL(clicked()), this, SLOT(accept()));
28+
connect(ui->acceptButton, SIGNAL(clicked()), this, SLOT(acceptOffer()));
2929
}
3030

3131
OfferAcceptDialog::~OfferAcceptDialog()
3232
{
3333
delete ui;
3434
}
3535
// send offeraccept with offer guid/qty as params and then send offerpay with wtxid (first param of response) as param, using RPC commands.
36-
void OfferAcceptDialog::accept()
36+
void OfferAcceptDialog::acceptOffer()
3737
{
3838

3939
Array params;

src/qt/offeracceptdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class OfferAcceptDialog : public QDialog
3030
bool offerPaid;
3131

3232
private slots:
33-
void accept();
33+
void acceptOffer();
3434
};
3535

3636
#endif // OFFERACCEPTDIALOG_H

0 commit comments

Comments
 (0)