diff --git a/contrib/gitian-descriptors/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml index b31a49760..9eb4cf596 100644 --- a/contrib/gitian-descriptors/boost-win32.yml +++ b/contrib/gitian-descriptors/boost-win32.yml @@ -4,7 +4,7 @@ suites: - "lucid" architectures: - "i386" -packages: +packages: - "mingw32" - "faketime" - "zip" diff --git a/src/init.cpp b/src/init.cpp index 3c1ee24e2..87c6e2707 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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; } diff --git a/src/main.cpp b/src/main.cpp index b708879f1..89761dc2b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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 diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index f165c11cb..2b7671f20 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -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); diff --git a/src/qt/csvmodelwriter.cpp b/src/qt/csvmodelwriter.cpp index 8a50bbab3..ad8e0d618 100644 --- a/src/qt/csvmodelwriter.cpp +++ b/src/qt/csvmodelwriter.cpp @@ -85,4 +85,3 @@ bool CSVModelWriter::write() return file.error() == QFile::NoError; } - diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index bb53021cf..1e4335c64 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -461,7 +461,7 @@ BitcoinAmountField - QSpinBox + QLineEdit
bitcoinamountfield.h
 diff --git a/src/qt/forms/qrcodedialog.ui b/src/qt/forms/qrcodedialog.ui index 52e9db376..1cec9066f 100644 --- a/src/qt/forms/qrcodedialog.ui +++ b/src/qt/forms/qrcodedialog.ui @@ -186,7 +186,7 @@ BitcoinAmountField - QSpinBox + QLineEdit
bitcoinamountfield.h
 diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp index 50fb1bd77..f6a898ff7 100644 --- a/src/qt/paymentrequestplus.cpp +++ b/src/qt/paymentrequestplus.cpp @@ -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 // 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; diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 6c10d8a04..72f75b42e 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -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() // 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[]) 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() } // -// 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(event); @@ -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 return request.parse(data); } -bool -PaymentServer::processPaymentRequest(PaymentRequestPlus& request, - QList& recipients) +bool PaymentServer::processPaymentRequest(PaymentRequestPlus& request, QList& recipients) { if (!optionsModel) return false; @@ -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, 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) 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 } } -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) } } -void -PaymentServer::reportSslErrors(QNetworkReply* reply, const QList &errs) +void PaymentServer::reportSslErrors(QNetworkReply* reply, const QList &errs) { + Q_UNUSED(reply); + QString errString; foreach (const QSslError& err, errs) { qDebug() << "PaymentServer::reportSslErrors : " << err; diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index 131ede518..f9d827204 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -36,6 +36,8 @@ class CWallet; class OptionsModel; + +QT_BEGIN_NAMESPACE class QApplication; class QByteArray; class QLocalServer; @@ -43,6 +45,7 @@ class QNetworkAccessManager; class QNetworkReply; class QSslError; class QUrl; +QT_END_NAMESPACE class PaymentServer : public QObject { @@ -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: // 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; } diff --git a/src/util.h b/src/util.h index 62eb7fad9..d0bd16c1c 100644 --- a/src/util.h +++ b/src/util.h @@ -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