Skip to content

scripted-diff: Drop redundant QString calls#250

Merged
maflcko merged 1 commit into
bitcoin-core:masterfrom
hebasto:210314-tr
Mar 15, 2021
Merged

scripted-diff: Drop redundant QString calls#250
maflcko merged 1 commit into
bitcoin-core:masterfrom
hebasto:210314-tr

Conversation

@hebasto

@hebasto hebasto commented Mar 14, 2021

Copy link
Copy Markdown
Member

The return type of QObject::tr function is QString 🐅

-BEGIN VERIFY SCRIPT-
sed -i 's/QString(QObject::tr(\([^)]*\))/QObject::tr(\1/' src/qt/guiutil.cpp
-END VERIFY SCRIPT-

@jarolrod jarolrod left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK def1e64, tested on macOS 10.14.6 Qt 5.15.2

This change is correct according to the Qt docs: https://doc.qt.io/qt-5/qobject.html#tr

Verified that these are all the occurrences of this case. Ran bitcoin-qt and verified there are no alterations of behavior with this change.

@maflcko
maflcko merged commit 6bc51af into bitcoin-core:master Mar 15, 2021
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Mar 15, 2021
def1e64 scripted-diff: Drop redundant QString calls (Hennadii Stepanov)

Pull request description:

  The return type of `QObject::tr` function _is_ `QString` 🐅

ACKs for top commit:
  jarolrod:
    ACK def1e64, tested on macOS 10.14.6 Qt 5.15.2

Tree-SHA512: ef405c87a30d6965f6887511d8666b6da57d258ca07833a3fa2dc9fd147d0539d33c57f7551ee13c1dd8024d6057139595c6ce5d088dd6efd7aa13db2a3eebdb
@hebasto
hebasto deleted the 210314-tr branch March 15, 2021 17:07
gwillen pushed a commit to ElementsProject/elements that referenced this pull request Jun 28, 2022
@bitcoin-core bitcoin-core locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants