Browse Source

fix some cosmetic glitches in the codebase

- rename URL into URI in paymentserver where correct
- add some missing Qt-coding-stuff in paymentserver
- change QSpinBox to QLineEdit as base for BitcoinAmountField in .ui files
  (as this is the result when converting the BAF back into base)
- remove some c_str() and replace with QString::fromStdString()
- remove several new-lines
- remove unneeded spaces
- indentation fixes
pull/1/head
Philip Kaufmann 9 years ago
parent
commit
d78900cc1b
  1. 2
      contrib/gitian-descriptors/boost-win32.yml
  2. 2
      src/init.cpp
  3. 4
      src/main.cpp
  4. 1
      src/qt/askpassphrasedialog.cpp
  5. 1
      src/qt/csvmodelwriter.cpp
  6. 2
      src/qt/forms/optionsdialog.ui
  7. 2
      src/qt/forms/qrcodedialog.ui
  8. 4
      src/qt/paymentrequestplus.cpp
  9. 41
      src/qt/paymentserver.cpp
  10. 9
      src/qt/paymentserver.h
  11. 2
      src/util.h

2
contrib/gitian-descriptors/boost-win32.yml

@ -4,7 +4,7 @@ suites: @@ -4,7 +4,7 @@ suites:
- "lucid"
architectures:
- "i386"
packages:
packages:
- "mingw32"
- "faketime"
- "zip"

2
src/init.cpp

@ -778,7 +778,7 @@ bool AppInit2(boost::thread_group& threadGroup) @@ -778,7 +778,7 @@ bool AppInit2(boost::thread_group& threadGroup)
uiInterface.InitMessage(_("Verifying blocks..."));
if (!VerifyDB(GetArg("-checklevel", 3),
GetArg( "-checkblocks", 288))) {
GetArg("-checkblocks", 288))) {
strLoadError = _("Corrupted block database detected");
break;
}

4
src/main.cpp

@ -2047,8 +2047,8 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew) @@ -2047,8 +2047,8 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew)
reverse(vConnect.begin(), vConnect.end());
if (vDisconnect.size() > 0) {
printf("REORGANIZE: Disconnect %"PRIszu" blocks; %s..\n", vDisconnect.size(), pfork->GetBlockHash().ToString().c_str());
printf("REORGANIZE: Connect %"PRIszu" blocks; ..%s\n", vConnect.size(), pindexNew->GetBlockHash().ToString().c_str());
printf("REORGANIZE: Disconnect %"PRIszu" blocks; %s...\n", vDisconnect.size(), pfork->GetBlockHash().ToString().c_str());
printf("REORGANIZE: Connect %"PRIszu" blocks; ...%s\n", vConnect.size(), pindexNew->GetBlockHash().ToString().c_str());
}
// Disconnect shorter branch

1
src/qt/askpassphrasedialog.cpp

@ -16,6 +16,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) : @@ -16,6 +16,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) :
fCapsLock(false)
{
ui->setupUi(this);
ui->passEdit1->setMaxLength(MAX_PASSPHRASE_SIZE);
ui->passEdit2->setMaxLength(MAX_PASSPHRASE_SIZE);
ui->passEdit3->setMaxLength(MAX_PASSPHRASE_SIZE);

1
src/qt/csvmodelwriter.cpp

@ -85,4 +85,3 @@ bool CSVModelWriter::write() @@ -85,4 +85,3 @@ bool CSVModelWriter::write()
return file.error() == QFile::NoError;
}

2
src/qt/forms/optionsdialog.ui

@ -461,7 +461,7 @@ @@ -461,7 +461,7 @@
<customwidgets>
<customwidget>
<class>BitcoinAmountField</class>
<extends>QSpinBox</extends>
<extends>QLineEdit</extends>
<header>bitcoinamountfield.h</header>
</customwidget>
<customwidget>

2
src/qt/forms/qrcodedialog.ui

@ -186,7 +186,7 @@ @@ -186,7 +186,7 @@
<customwidgets>
<customwidget>
<class>BitcoinAmountField</class>
<extends>QSpinBox</extends>
<extends>QLineEdit</extends>
<header>bitcoinamountfield.h</header>
</customwidget>
</customwidgets>

4
src/qt/paymentrequestplus.cpp

@ -80,7 +80,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c @@ -80,7 +80,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
return false;
}
else {
qDebug() << "PaymentRequestPlus::getMerchant : Payment request: unknown pki_type " << paymentRequest.pki_type().c_str();
qDebug() << "PaymentRequestPlus::getMerchant : Payment request: unknown pki_type " << QString::fromStdString(paymentRequest.pki_type());
return false;
}
@ -152,7 +152,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c @@ -152,7 +152,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
// Valid cert; check signature:
payments::PaymentRequest rcopy(paymentRequest); // Copy
rcopy.set_signature(std::string(""));
std::string data_to_verify; // Everything but the signature
std::string data_to_verify; // Everything but the signature
rcopy.SerializeToString(&data_to_verify);
EVP_MD_CTX ctx;

41
src/qt/paymentserver.cpp

@ -44,8 +44,6 @@ @@ -44,8 +44,6 @@
#include "wallet.h"
#include "walletmodel.h"
using namespace boost;
const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds
const QString BITCOIN_IPC_PREFIX("bitcoin:");
const char* BITCOIN_REQUEST_MIMETYPE = "application/bitcoin-paymentrequest";
@ -73,14 +71,14 @@ static QString ipcServerName() @@ -73,14 +71,14 @@ static QString ipcServerName()
// Append a simple hash of the datadir
// Note that GetDataDir(true) returns a different path
// for -testnet versus main net
QString ddir(GetDataDir(true).string().c_str());
QString ddir(QString::fromStdString(GetDataDir(true).string()));
name.append(QString::number(qHash(ddir)));
return name;
}
//
// We store payment URLs and requests received before
// We store payment URIs and requests received before
// the main GUI window is up and ready to ask the user
// to send payment.
@ -250,8 +248,7 @@ bool PaymentServer::ipcSendCommandLine(int argc, char* argv[]) @@ -250,8 +248,7 @@ bool PaymentServer::ipcSendCommandLine(int argc, char* argv[])
return fResult;
}
PaymentServer::PaymentServer(QObject* parent,
bool startLocalServer) : QObject(parent), saveURIs(true)
PaymentServer::PaymentServer(QObject* parent, bool startLocalServer) : QObject(parent), saveURIs(true)
{
// Verify that the version of the library that we linked against is
// compatible with the version of the headers we compiled against.
@ -286,12 +283,12 @@ PaymentServer::~PaymentServer() @@ -286,12 +283,12 @@ PaymentServer::~PaymentServer()
}
//
// OSX-specific way of handling bitcoin uris and
// OSX-specific way of handling bitcoin: URIs and
// PaymentRequest mime types
//
bool PaymentServer::eventFilter(QObject *, QEvent *event)
{
// clicking on bitcoin: URLs creates FileOpen events on the Mac:
// clicking on bitcoin: URIs creates FileOpen events on the Mac:
if (event->type() == QEvent::FileOpen)
{
QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);
@ -356,13 +353,13 @@ void PaymentServer::handleURIOrFile(const QString& s) @@ -356,13 +353,13 @@ void PaymentServer::handleURIOrFile(const QString& s)
if (s.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // bitcoin:
{
#if QT_VERSION >= 0x050000
QUrlQuery url((QUrl(s)));
QUrlQuery uri((QUrl(s)));
#else
QUrl url(s);
QUrl uri(s);
#endif
if (url.hasQueryItem("request"))
if (uri.hasQueryItem("request"))
{
QByteArray temp; temp.append(url.queryItemValue("request"));
QByteArray temp; temp.append(uri.queryItemValue("request"));
QString decoded = QUrl::fromPercentEncoding(temp);
QUrl fetchUrl(decoded, QUrl::StrictMode);
@ -436,9 +433,7 @@ bool PaymentServer::readPaymentRequest(const QString& filename, PaymentRequestPl @@ -436,9 +433,7 @@ bool PaymentServer::readPaymentRequest(const QString& filename, PaymentRequestPl
return request.parse(data);
}
bool
PaymentServer::processPaymentRequest(PaymentRequestPlus& request,
QList<SendCoinsRecipient>& recipients)
bool PaymentServer::processPaymentRequest(PaymentRequestPlus& request, QList<SendCoinsRecipient>& recipients)
{
if (!optionsModel)
return false;
@ -493,7 +488,7 @@ PaymentServer::processPaymentRequest(PaymentRequestPlus& request, @@ -493,7 +488,7 @@ PaymentServer::processPaymentRequest(PaymentRequestPlus& request,
// Insecure payments to custom bitcoin addresses are not supported
// (there is no good way to tell the user where they are paying in a way
// they'd have a chance of understanding).
emit reportError(tr("Payment request error"),
emit reportError(tr("Payment request error"),
tr("Insecure requests to custom payment scripts unsupported"),
CClientUIInterface::MODAL);
return false;
@ -504,8 +499,7 @@ PaymentServer::processPaymentRequest(PaymentRequestPlus& request, @@ -504,8 +499,7 @@ PaymentServer::processPaymentRequest(PaymentRequestPlus& request,
return true;
}
void
PaymentServer::fetchRequest(const QUrl& url)
void PaymentServer::fetchRequest(const QUrl& url)
{
QNetworkRequest netRequest;
netRequest.setAttribute(QNetworkRequest::User, "PaymentRequest");
@ -515,8 +509,7 @@ PaymentServer::fetchRequest(const QUrl& url) @@ -515,8 +509,7 @@ PaymentServer::fetchRequest(const QUrl& url)
netManager->get(netRequest);
}
void
PaymentServer::fetchPaymentACK(CWallet* wallet, SendCoinsRecipient recipient, QByteArray transaction)
void PaymentServer::fetchPaymentACK(CWallet* wallet, SendCoinsRecipient recipient, QByteArray transaction)
{
const payments::PaymentDetails& details = recipient.paymentRequest.getDetails();
if (!details.has_payment_url())
@ -571,8 +564,7 @@ PaymentServer::fetchPaymentACK(CWallet* wallet, SendCoinsRecipient recipient, QB @@ -571,8 +564,7 @@ PaymentServer::fetchPaymentACK(CWallet* wallet, SendCoinsRecipient recipient, QB
}
}
void
PaymentServer::netRequestFinished(QNetworkReply* reply)
void PaymentServer::netRequestFinished(QNetworkReply* reply)
{
reply->deleteLater();
if (reply->error() != QNetworkReply::NoError)
@ -617,9 +609,10 @@ PaymentServer::netRequestFinished(QNetworkReply* reply) @@ -617,9 +609,10 @@ PaymentServer::netRequestFinished(QNetworkReply* reply)
}
}
void
PaymentServer::reportSslErrors(QNetworkReply* reply, const QList<QSslError> &errs)
void PaymentServer::reportSslErrors(QNetworkReply* reply, const QList<QSslError> &errs)
{
Q_UNUSED(reply);
QString errString;
foreach (const QSslError& err, errs) {
qDebug() << "PaymentServer::reportSslErrors : " << err;

9
src/qt/paymentserver.h

@ -36,6 +36,8 @@ @@ -36,6 +36,8 @@
class CWallet;
class OptionsModel;
QT_BEGIN_NAMESPACE
class QApplication;
class QByteArray;
class QLocalServer;
@ -43,6 +45,7 @@ class QNetworkAccessManager; @@ -43,6 +45,7 @@ class QNetworkAccessManager;
class QNetworkReply;
class QSslError;
class QUrl;
QT_END_NAMESPACE
class PaymentServer : public QObject
{
@ -56,8 +59,8 @@ public: @@ -56,8 +59,8 @@ public:
// will be called so we startup in the right mode.
static bool ipcSendCommandLine(int argc, char *argv[]);
PaymentServer(QObject* parent, // parent should be QApplication object
bool startLocalServer=true);
// parent should be QApplication object
PaymentServer(QObject* parent, bool startLocalServer = true);
~PaymentServer();
// Load root certificate authorities. Pass NULL (default)
@ -65,7 +68,7 @@ public: @@ -65,7 +68,7 @@ public:
// or, if that's not set, to use the system default root certificates.
// If you pass in a store, you should not X509_STORE_free it: it will be
// freed either at exit or when another set of CAs are loaded.
static void LoadRootCAs(X509_STORE* store=NULL);
static void LoadRootCAs(X509_STORE* store = NULL);
// Return certificate store
static X509_STORE* getCertStore() { return certStore; }

2
src/util.h

@ -522,7 +522,7 @@ inline void SetThreadPriority(int nPriority) @@ -522,7 +522,7 @@ inline void SetThreadPriority(int nPriority)
// PRIO_MAX is not defined on Solaris
#ifndef PRIO_MAX
#define PRIO_MAX 20
#define PRIO_MAX 20
#endif
#define THREAD_PRIORITY_LOWEST PRIO_MAX
#define THREAD_PRIORITY_BELOW_NORMAL 2

Loading…
Cancel
Save