zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3039 from Diapolo/Qt_misc 

several small Qt-related fixes
This commit is contained in:
Wladimir J. van der Laan 2013-09-29 02:50:56 -07:00
parent b2180d82a4 d5f0ef54f8
commit 75d31c84db
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/bitcoin.cpp
View File

@ -155,11 +155,14 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
void DebugMessageHandler(QtMsgType type, const char * msg) void DebugMessageHandler(QtMsgType type, const char * msg)
{ {
Q_UNUSED(type);
LogPrint("qt", "Bitcoin-Qt: %s\n", msg); LogPrint("qt", "Bitcoin-Qt: %s\n", msg);
} }
#else #else
void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &msg) void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &msg)
{ {
Q_UNUSED(type);
Q_UNUSED(context);
LogPrint("qt", "Bitcoin-Qt: %s\n", qPrintable(msg)); LogPrint("qt", "Bitcoin-Qt: %s\n", qPrintable(msg));
} }
#endif #endif

8
src/qt/bitcoingui.cpp
View File

@ -751,13 +751,9 @@ void BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient)
walletFrame->handlePaymentRequest(recipient); walletFrame->handlePaymentRequest(recipient);
} }
void BitcoinGUI::showPaymentACK(QString msg) void BitcoinGUI::showPaymentACK(const QString& msg)
{ {
#if QT_VERSION < 0x050000 message(tr("Payment acknowledged"), GUIUtil::HtmlEscape(msg), CClientUIInterface::MODAL);
message(tr("Payment acknowledged"), Qt::escape(msg), CClientUIInterface::MODAL);
#else
message(tr("Payment acknowledged"), msg.toHtmlEscaped(), CClientUIInterface::MODAL);
#endif
} }
void BitcoinGUI::setEncryptionStatus(int status) void BitcoinGUI::setEncryptionStatus(int status)

2
src/qt/bitcoingui.h
View File

@ -154,7 +154,7 @@ public slots:
void askFee(qint64 nFeeRequired, bool *payFee); void askFee(qint64 nFeeRequired, bool *payFee);
void handlePaymentRequest(const SendCoinsRecipient& recipient); void handlePaymentRequest(const SendCoinsRecipient& recipient);
void showPaymentACK(QString msg); void showPaymentACK(const QString& msg);
/** Show incoming transaction notification for new transactions. */ /** Show incoming transaction notification for new transactions. */
void incomingTransaction(const QString& date, int unit, qint64 amount, const QString& type, const QString& address); void incomingTransaction(const QString& date, int unit, qint64 amount, const QString& type, const QString& address);

3
src/qt/clientmodel.cpp
View File

@ -24,9 +24,8 @@ ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent) :
numBlocksAtStartup(-1), pollTimer(0) numBlocksAtStartup(-1), pollTimer(0)
{ {
pollTimer = new QTimer(this); pollTimer = new QTimer(this);
pollTimer->setInterval(MODEL_UPDATE_DELAY);
pollTimer->start();
connect(pollTimer, SIGNAL(timeout()), this, SLOT(updateTimer())); connect(pollTimer, SIGNAL(timeout()), this, SLOT(updateTimer()));
pollTimer->start(MODEL_UPDATE_DELAY);
subscribeToCoreSignals(); subscribeToCoreSignals();
} }

2
src/qt/walletmodel.cpp
View File

@ -143,7 +143,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
foreach(const SendCoinsRecipient &rcp, recipients) foreach(const SendCoinsRecipient &rcp, recipients)
{ {
if (rcp.paymentRequest.IsInitialized()) if (rcp.paymentRequest.IsInitialized())
{ // PaymentRequest... { // PaymentRequest...
int64 subtotal = 0; int64 subtotal = 0;
const payments::PaymentDetails& details = rcp.paymentRequest.getDetails(); const payments::PaymentDetails& details = rcp.paymentRequest.getDetails();
for (int i = 0; i < details.outputs_size(); i++) for (int i = 0; i < details.outputs_size(); i++)

4
src/qt/walletmodeltransaction.cpp
View File

@ -32,7 +32,7 @@ qint64 WalletModelTransaction::getTransactionFee()
void WalletModelTransaction::setTransactionFee(qint64 newFee) void WalletModelTransaction::setTransactionFee(qint64 newFee)
{ {
fee=newFee; fee = newFee;
} }
qint64 WalletModelTransaction::getTotalTransactionAmount() qint64 WalletModelTransaction::getTotalTransactionAmount()
@ -40,7 +40,7 @@ qint64 WalletModelTransaction::getTotalTransactionAmount()
qint64 totalTransactionAmount = 0; qint64 totalTransactionAmount = 0;
foreach(const SendCoinsRecipient &rcp, recipients) foreach(const SendCoinsRecipient &rcp, recipients)
{ {
totalTransactionAmount+=rcp.amount; totalTransactionAmount += rcp.amount;
} }
return totalTransactionAmount; return totalTransactionAmount;
} }