diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -712,7 +713,7 @@ #ifdef ENABLE_WALLET void BitcoinGUI::openClicked() { - OpenURIDialog dlg(config, this); + OpenURIDialog dlg(config->GetChainParams(), this); if (dlg.exec()) { Q_EMIT receivedURI(dlg.getURI()); } diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -4,7 +4,6 @@ #include -#include #include #include #include diff --git a/src/qt/openuridialog.h b/src/qt/openuridialog.h --- a/src/qt/openuridialog.h +++ b/src/qt/openuridialog.h @@ -7,7 +7,7 @@ #include -class Config; +class CChainParams; namespace Ui { class OpenURIDialog; @@ -17,7 +17,7 @@ Q_OBJECT public: - explicit OpenURIDialog(const Config *configIn, QWidget *parent); + explicit OpenURIDialog(const CChainParams ¶ms, QWidget *parent); ~OpenURIDialog(); QString getURI(); @@ -30,7 +30,7 @@ private: Ui::OpenURIDialog *ui; - const Config *config; + const QString uriScheme; }; #endif // BITCOIN_QT_OPENURIDIALOG_H diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -5,15 +5,17 @@ #include #include +#include #include #include #include -OpenURIDialog::OpenURIDialog(const Config *configIn, QWidget *parent) - : QDialog(parent), ui(new Ui::OpenURIDialog), config(configIn) { +OpenURIDialog::OpenURIDialog(const CChainParams ¶ms, QWidget *parent) + : QDialog(parent), ui(new Ui::OpenURIDialog), + uriScheme(QString::fromStdString(params.CashAddrPrefix())) { ui->setupUi(this); - ui->uriEdit->setPlaceholderText(GUIUtil::bitcoinURIScheme(*config) + ":"); + ui->uriEdit->setPlaceholderText(uriScheme + ":"); } OpenURIDialog::~OpenURIDialog() { @@ -26,7 +28,6 @@ void OpenURIDialog::accept() { SendCoinsRecipient rcp; - QString uriScheme = GUIUtil::bitcoinURIScheme(*config); if (GUIUtil::parseBitcoinURI(uriScheme, getURI(), &rcp)) { /* Only accept value URIs */ QDialog::accept(); @@ -38,8 +39,10 @@ void OpenURIDialog::on_selectFileButton_clicked() { QString filename = GUIUtil::getOpenFileName( this, tr("Select payment request file to open"), "", "", nullptr); - if (filename.isEmpty()) return; + if (filename.isEmpty()) { + return; + } QUrl fileUri = QUrl::fromLocalFile(filename); - ui->uriEdit->setText(GUIUtil::bitcoinURIScheme(*config) + + ui->uriEdit->setText(uriScheme + ":?r=" + QUrl::toPercentEncoding(fileUri.toString())); }