dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: Replace "URL" with "URI" where we aren't actually working with URLs

Browse Source
This commit is contained in:
Luke Dashjr
2012-03-25 17:25:10 -04:00
parent 9362da78b0
commit fa2544e79f
15 changed files with 87 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/qt/guiutil.cpp
View File

@@ -52,15 +52,15 @@ void GUIUtil::setupAmountWidget(QLineEdit *widget, QWidget *parent)
widget->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
}
bool GUIUtil::parseBitcoinURL(const QUrl &url, SendCoinsRecipient *out)
bool GUIUtil::parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out)
{
if(url.scheme() != QString("bitcoin"))
if(uri.scheme() != QString("bitcoin"))
return false;
SendCoinsRecipient rv;
rv.address = url.path();
rv.address = uri.path();
rv.amount = 0;
QList<QPair<QString, QString> > items = url.queryItems();
QList<QPair<QString, QString> > items = uri.queryItems();
for (QList<QPair<QString, QString> >::iterator i = items.begin(); i != items.end(); i++)
{
bool fShouldReturnFalse = false;
@@ -97,18 +97,18 @@ bool GUIUtil::parseBitcoinURL(const QUrl &url, SendCoinsRecipient *out)
return true;
}
bool GUIUtil::parseBitcoinURL(QString url, SendCoinsRecipient *out)
bool GUIUtil::parseBitcoinURI(QString uri, SendCoinsRecipient *out)
{
// Convert bitcoin:// to bitcoin:
//
// Cannot handle this later, because bitcoin:// will cause Qt to see the part after // as host,
// which will lowercase it (and thus invalidate the address).
if(url.startsWith("bitcoin://"))
if(uri.startsWith("bitcoin://"))
{
url.replace(0, 10, "bitcoin:");
uri.replace(0, 10, "bitcoin:");
}
QUrl urlInstance(url);
return parseBitcoinURL(urlInstance, out);
QUrl uriInstance(uri);
return parseBitcoinURI(uriInstance, out);
}
QString GUIUtil::HtmlEscape(const QString& str, bool fMultiLine)