Skip to content

Replace QRegExp with QRegularExpression - #620

Merged
laanwj merged 3 commits into
bitcoin-core:masterfrom
w0xlt:regexp-obsolete
Jun 22, 2022
Merged

Replace QRegExp with QRegularExpression#620
laanwj merged 3 commits into
bitcoin-core:masterfrom
w0xlt:regexp-obsolete

Conversation

@w0xlt

@w0xltw0xlt commented Jun 20, 2022

Copy link
Copy Markdown
Contributor

Picking up #606 (labeled "Up for grabs") and applying #606 (review) and #606 (comment).

Replaces occurrences of QRegExp usage with QRegularExpression as part of the roadmap for Qt6 integration.

Fixes#578

@hebasto

hebasto commented Jun 20, 2022

Copy link
Copy Markdown
Member

@w0xlt

Thank you for picking it up!

What is your opinion about #606 (comment)?

@hebastohebasto changed the title qt: replace QRegExp with QRegularExpressionReplace QRegExp with QRegularExpressionJun 20, 2022
@hebastohebasto mentioned this pull request Jun 20, 2022
Closed
@hebastohebasto added Refactoring Qt 6 Transition to Qt 6 labels Jun 20, 2022
@w0xlt

w0xlt commented Jun 21, 2022

Copy link
Copy Markdown
ContributorAuthor

What is your opinion about #606 (comment)?

That looks good to me. I'll take a look at it.
Would you suggest a class/file to allocate the utility function?

@hebasto

hebasto commented Jun 21, 2022

Copy link
Copy Markdown
Member

What is your opinion about #606 (comment)?

That looks good to me. I'll take a look at it. Would you suggest a class/file to allocate the utility function?

namespace GUIUtil in qt/guiutil.{h,cpp}?

@w0xlt
w0xltforce-pushed the regexp-obsolete branch 2 times, most recently from 39f50ea to c0c8b33CompareJune 21, 2022 15:39
@w0xlt

w0xlt commented Jun 21, 2022

Copy link
Copy Markdown
ContributorAuthor

Force-pushed c0c8b33 addressing #606 (comment).

hebasto
hebasto reviewed Jun 21, 2022
View reviewed changes

@hebastohebasto left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Approach ACK c0c8b33.

Suggesting to split the first commit into separated ones:

  • factoring out the extractFirstSuffixFromFilter() function (I'd prefer to use UpperCamelCase name convention for this new standalone function)
  • replacement QRegExp with QRegularExpression

Also please apply clang-format-diff.py for each your commit.

Comment threadsrc/qt/test/optiontests.cpp Outdated
Comment threadsrc/qt/test/optiontests.cpp
Comment threadsrc/qt/utilitydialog.cpp
hebasto
hebasto reviewed Jun 21, 2022
View reviewed changes
Comment threadsrc/qt/guiutil.h Outdated
w0xltand others added 3 commits June 21, 2022 19:16
@w0xlt
qt: Add a function that extracts the suffix from a filter
c378535
Extract the 'Extract first suffix from filter pattern...'
functionality into a testable utility function
@w0xlt@prusnak@jarolrod
qt: Replace QRegExp with QRegularExpression
ace9af5
Co-authored-by: Pavol Rusnak <pavol@rusnak.io>
Co-authored-by: Jarol Rodriguez <jarolrod@tutanota.com>
@w0xlt
test, qt: Add tests for GUIUtil::extractFirstSuffixFromFilter
67364eb
@w0xlt

w0xlt commented Jun 21, 2022

Copy link
Copy Markdown
ContributorAuthor

@hebasto thanks for the review.
Force-pushed 67364eb addressing your suggestions.

hebasto
hebasto approved these changes Jun 21, 2022
View reviewed changes

@hebastohebasto left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ACK 67364eb

@laanwj

laanwj commented Jun 22, 2022•
edited
Loading

Copy link
Copy Markdown
Member

Code review and lightly tested ACK 67364eb

@laanwj
laanwj merged commit 58b9d6c into bitcoin-core:masterJun 22, 2022
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 22, 2022
@laanwjjagdeep sidhu
Mergebitcoin-core/gui#620: Replace QRegExp with QRegularExpression
63a9192
@w0xlt
w0xlt deleted the regexp-obsolete branch June 23, 2022 11:12
@bitcoin-corebitcoin-core locked and limited conversation to collaborators Jun 23, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@hebastohebastohebasto approved these changes

Assignees

No one assigned

Labels

Qt 6Transition to Qt 6Refactoring

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Replace QRegExp with QRegularExpression

3 participants

@w0xlt@hebasto@laanwj