fix some cosmetic glitches in the codebase #2961

pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:cosmetic changing 11 files +33 −37

Diapolo commented at 11:13 PM on August 30, 2013: none
- 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

in src/qt/paymentserver.cpp:None in 1a3a1151f3 outdated

 363 |          {
 364 | -            QByteArray temp; temp.append(url.queryItemValue("request"));
 365 | +            QByteArray temp; temp.append(uri.queryItemValue("request"));
 366 |              QString decoded = QUrl::fromPercentEncoding(temp);
 367 | -            QUrl fetchUrl(decoded, QUrl::StrictMode);
 368 | +            QUrl fetchUri(decoded, QUrl::StrictMode);

gavinandresen commented at 1:32 AM on August 31, 2013:

NACK. request must be a URL, it cannot be the more general URI. (e.g. you cannot specify request=bitcoin:...etc )

Diapolo commented at 8:58 AM on August 31, 2013:

Thanks for clarification :), fixed.

in src/qt/forms/qrcodedialog.ui:None in 40d8bca0af outdated
```
 185 | @@ -186,7 +186,7 @@
 186 |   <customwidgets>
 187 |    <customwidget>
 188 |     <class>BitcoinAmountField</class>
 189 | -   <extends>QSpinBox</extends>
 190 | +   <extends>QLineEdit</extends>
```
laanwj commented at 10:37 AM on September 5, 2013:

Sure about this?

Diapolo commented at 8:08 AM on September 6, 2013:

Yeah, when you remove the custom class definiton via Qt Designer our BitcoinAmountField get's converted to a QLineEdit field. Try for yourself, if you want to be sure :).

laanwj commented at 6:48 AM on September 9, 2013:

I believe you. I was concerned it might be accidental. I don't think it matters much either, AFAIK it only affects how the widget is shown in the designer.
in src/qt/paymentserver.cpp:None in 40d8bca0af outdated
```
  85 | @@ -88,9 +86,8 @@ static QString ipcServerName()
  86 |  
  87 |  static void ReportInvalidCertificate(const QSslCertificate& cert)
  88 |  {
  89 | -    if (fDebug) {
```
laanwj commented at 10:40 AM on September 5, 2013:

Personally I prefer if you keep the { and }, don't remove them even if there is only one statement under them. This is a wise safety precaution in C/C++, it can prevent horrible bugs when people add a statement but forget to add {} again.

Diapolo commented at 8:07 AM on September 6, 2013:

Reverted and agreed.
laanwj commented at 6:48 AM on September 9, 2013: member

Needs rebase

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

d78900cc1b

Diapolo commented at 10:37 AM on September 9, 2013: none

Rebased
laanwj referenced this in commit 2bc004c658 on Sep 9, 2013
laanwj merged this on Sep 9, 2013
laanwj closed this on Sep 9, 2013
BitcoinPullTester commented at 11:25 AM on September 9, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/d78900cc1bb188a29dfb23b1f41b00f35ceb69f7 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.
DrahtBot locked this on Sep 8, 2021

Contributors