paymentserver: style fixes / cleanup #3108

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:paymentserver_style changing 3 files +34 −26

Diapolo commented at 9:48 AM on October 18, 2013: none
- rename reportError() into message() to be in line with our default message() signal/slot naming (and can be used for all types of messages)
- rename some QStrings to not collide with message() function
- add a missing message for malformed URIs that IS also used in BitcoinGUI
- fix / extend some comments and misc style fixes

paymentserver: style fixes / cleanup

- rename reportError() into message() to be in line with our default
  message() signal/slot naming (and can be used for all types of messages)
- rename some QStrings to not collide with message() function
- add a missing message for malformed URIs that IS also used in BitcoinGUI
- fix / extend some comments and misc style fixes

95d4a2be95

in src/qt/paymentserver.cpp:None in 8edae96637 outdated

 573 | @@ -566,11 +574,11 @@ void PaymentServer::netRequestFinished(QNetworkReply* reply)
 574 |      reply->deleteLater();
 575 |      if (reply->error() != QNetworkReply::NoError)
 576 |      {
 577 | -        QString message = QObject::tr("Error communicating with %1: %2")
 578 | +        QString strMessage = QObject::tr("Error communicating with %1: %2")

laanwj commented at 2:02 PM on October 18, 2013:

Don't do this please. Within the GUI we don't use type prefixes, certainly not for local variables.

Diapolo commented at 2:28 PM on October 19, 2013:

Reworked to msg instead. Reason for the rename was a compiation error, because of message() and the variable message, now solved.

BitcoinPullTester commented at 2:47 PM on October 19, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/95d4a2be95a4b902c4cda4a8b57c7be9e572aee6 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
Diapolo commented at 2:14 AM on October 20, 2013: none

@laanwj As I'm working on fixing current problems with payment request handling it would be cool to quickly merge this, if ACKed.
laanwj referenced this in commit 76eb192076 on Oct 20, 2013
laanwj merged this on Oct 20, 2013
laanwj closed this on Oct 20, 2013
Diapolo deleted the branch on Oct 22, 2013
Bushstar referenced this in commit 22ac6ba4ef on Apr 8, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

Diapolo

laanwj

BitcoinPullTester