replace QRegExp with QRegularExpression by Be-ing · Pull Request #4289 · mixxxdj/mixxx

Be-ing · 2021-09-16T17:41:33Z

QRegExp has been removed in Qt6.

uklotzde · 2021-09-16T20:33:04Z

+// devices that have an equivalent "deviceName" and ### section.
+const QRegularExpression midiDeviceNameRegex("^(.*) MIDI (\\d+)( .*)?$");
+
+const QRegularExpression inputRegex("^(.*) in (\\d+)( .*)?$");


Should work, is more efficient, and easier to read:

const QRegularExpression kInputRegex = QStringLiteral("^(.*) in (\\d+)( .*)?$");

Also the naming of constants doesn't comply with our coding style.

uklotzde · 2021-09-16T20:36:21Z

-const QRegExp kForbiddenChars =
-        QRegExp("[<>:\"\\/|?*\\\\]|(\\.\\.)"
+const QRegularExpression kForbiddenChars =
+        QRegularExpression(


Simple use QStringLiteral(...) instead of QRegularExpression(...).

Be-ing · 2021-09-17T04:39:03Z

I don't know what's going on with GitHub... I didn't merge nor close this PR??

Be-ing · 2021-09-17T05:15:31Z

I'm puzzled by these test failures:

❯ ctest --rerun-failed --output-on-failure
Test project /home/be/sw/mixxx/build
    Start 558: SearchQueryParserTest.NumericFilterOperators
1/2 Test #558: SearchQueryParserTest.NumericFilterOperators .....................***Failed    0.40 sec
QML debugging is enabled. Only use this in a safe environment.
Note: Google Test filter = SearchQueryParserTest.NumericFilterOperators
[==========] Running 1 test from 1 test suite.
[----------] Global test environment set-up.
[----------] 1 test from SearchQueryParserTest
[ RUN      ] SearchQueryParserTest.NumericFilterOperators
../src/test/searchqueryparsertest.cpp:462: Failure
Value of: pQuery->match(pTrack)
  Actual: false
Expected: true
../src/test/searchqueryparsertest.cpp:463: Failure
Expected equality of these values:
  QtPrivate::asString(QString("bpm >= 127.12")).toLocal8Bit().constData()
    Which is: "bpm >= 127.12"
  QtPrivate::asString(pQuery->toSql()).toLocal8Bit().constData()
    Which is: ""
../src/test/searchqueryparsertest.cpp:480: Failure
Value of: pQuery->match(pTrack)
  Actual: false
Expected: true
../src/test/searchqueryparsertest.cpp:481: Failure
Expected equality of these values:
  QtPrivate::asString(QString("bpm <= 127.12")).toLocal8Bit().constData()
    Which is: "bpm <= 127.12"
  QtPrivate::asString(pQuery->toSql()).toLocal8Bit().constData()
    Which is: ""
info [0x1f2e130] TrackCollection - Disconnecting database
info [0x1f2e130] GlobalTrackCache - Destroying instance
[  FAILED  ] SearchQueryParserTest.NumericFilterOperators (18 ms)
[----------] 1 test from SearchQueryParserTest (18 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test suite ran. (18 ms total)
[  PASSED  ] 0 tests.
[  FAILED  ] 1 test, listed below:
[  FAILED  ] SearchQueryParserTest.NumericFilterOperators

 1 FAILED TEST

    Start 563: SearchQueryParserTest.HumanReadableDurationSearchWithOperators
2/2 Test #563: SearchQueryParserTest.HumanReadableDurationSearchWithOperators ...***Failed    0.18 sec
QML debugging is enabled. Only use this in a safe environment.
Note: Google Test filter = SearchQueryParserTest.HumanReadableDurationSearchWithOperators
[==========] Running 1 test from 1 test suite.
[----------] Global test environment set-up.
[----------] 1 test from SearchQueryParserTest
[ RUN      ] SearchQueryParserTest.HumanReadableDurationSearchWithOperators
../src/test/searchqueryparsertest.cpp:609: Failure
Value of: pQuery->match(pTrack)
  Actual: false
Expected: true
../src/test/searchqueryparsertest.cpp:610: Failure
Expected equality of these values:
  QtPrivate::asString(QString("duration >= 90")).toLocal8Bit().constData()
    Which is: "duration >= 90"
  QtPrivate::asString(pQuery->toSql()).toLocal8Bit().constData()
    Which is: ""
../src/test/searchqueryparsertest.cpp:618: Failure
Value of: pQuery->match(pTrack)
  Actual: false
Expected: true
../src/test/searchqueryparsertest.cpp:619: Failure
Expected equality of these values:
  QtPrivate::asString(QString("duration >= 90")).toLocal8Bit().constData()
    Which is: "duration >= 90"
  QtPrivate::asString(pQuery->toSql()).toLocal8Bit().constData()
    Which is: ""
../src/test/searchqueryparsertest.cpp:636: Failure
Value of: pQuery->match(pTrack)
  Actual: false
Expected: true
../src/test/searchqueryparsertest.cpp:637: Failure
Expected equality of these values:
  QtPrivate::asString(QString("duration <= 150")).toLocal8Bit().constData()
    Which is: "duration <= 150"
  QtPrivate::asString(pQuery->toSql()).toLocal8Bit().constData()
    Which is: ""
../src/test/searchqueryparsertest.cpp:645: Failure
Value of: pQuery->match(pTrack)
  Actual: false
Expected: true
../src/test/searchqueryparsertest.cpp:646: Failure
Expected equality of these values:
  QtPrivate::asString(QString("duration <= 150")).toLocal8Bit().constData()
    Which is: "duration <= 150"
  QtPrivate::asString(pQuery->toSql()).toLocal8Bit().constData()
    Which is: ""
../src/test/searchqueryparsertest.cpp:654: Failure
Value of: pQuery->match(pTrack)
  Actual: false
Expected: true
../src/test/searchqueryparsertest.cpp:655: Failure
Expected equality of these values:
  QtPrivate::asString(QString("duration <= 150")).toLocal8Bit().constData()
    Which is: "duration <= 150"
  QtPrivate::asString(pQuery->toSql()).toLocal8Bit().constData()
    Which is: ""
../src/test/searchqueryparsertest.cpp:663: Failure
Value of: pQuery->match(pTrack)
  Actual: false
Expected: true
../src/test/searchqueryparsertest.cpp:664: Failure
Expected equality of these values:
  QtPrivate::asString(QString("duration <= 120")).toLocal8Bit().constData()
    Which is: "duration <= 120"
  QtPrivate::asString(pQuery->toSql()).toLocal8Bit().constData()
    Which is: ""
../src/test/searchqueryparsertest.cpp:672: Failure
Value of: pQuery->match(pTrack)
  Actual: false
Expected: true
../src/test/searchqueryparsertest.cpp:673: Failure
Expected equality of these values:
  QtPrivate::asString(QString("duration <= 120")).toLocal8Bit().constData()
    Which is: "duration <= 120"
  QtPrivate::asString(pQuery->toSql()).toLocal8Bit().constData()
    Which is: ""
../src/test/searchqueryparsertest.cpp:681: Failure
Value of: pQuery->match(pTrack)
  Actual: false
Expected: true
../src/test/searchqueryparsertest.cpp:682: Failure
Expected equality of these values:
  QtPrivate::asString(QString("duration >= 63")).toLocal8Bit().constData()
    Which is: "duration >= 63"
  QtPrivate::asString(pQuery->toSql()).toLocal8Bit().constData()
    Which is: ""
info [0x2365130] TrackCollection - Disconnecting database
info [0x2365130] GlobalTrackCache - Destroying instance
[  FAILED  ] SearchQueryParserTest.HumanReadableDurationSearchWithOperators (16 ms)
[----------] 1 test from SearchQueryParserTest (16 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test suite ran. (16 ms total)
[  PASSED  ] 0 tests.
[  FAILED  ] 1 test, listed below:
[  FAILED  ] SearchQueryParserTest.HumanReadableDurationSearchWithOperators

 1 FAILED TEST


0% tests passed, 2 tests failed out of 2

Total Test time (real) =   0.60 sec

The following tests FAILED:
        558 - SearchQueryParserTest.NumericFilterOperators (Failed)
        563 - SearchQueryParserTest.HumanReadableDurationSearchWithOperators (Failed)
Errors while running CTest

uklotzde · 2021-09-17T08:16:13Z

This is really strange, zero changes?!

Be-ing · 2021-09-17T11:43:47Z

It looks like my most recent changes were lost?? I cherry-picked a commit from my reflog...

Be-ing · 2021-09-17T17:14:03Z

I think what happened before was that I accidentally amended by commit in this branch to the latest commit in the main branch which confused GitHub.

Be-ing · 2021-09-17T17:35:18Z

Any ideas why SearchQueryParserTest.NumericFilterOperators and SearchQueryParserTest.HumanReadableDurationSearchWithOperators are failing? These features seem to work fine using them from the GUI.

uklotzde · 2021-09-18T09:05:56Z

Any ideas why SearchQueryParserTest.NumericFilterOperators and SearchQueryParserTest.HumanReadableDurationSearchWithOperators are failing? These features seem to work fine using them from the GUI.

I am also clueless 🤷 Didn't find any cause for this failure. Probably some undiscovered undefined behavior somewhere in the query parser?

uklotzde · 2021-09-18T11:05:16Z

Any ideas why SearchQueryParserTest.NumericFilterOperators and SearchQueryParserTest.HumanReadableDurationSearchWithOperators are failing? These features seem to work fine using them from the GUI.

I am also clueless shrug Didn't find any cause for this failure. Probably some undiscovered undefined behavior somewhere in the query parser?

Fixed: Be-ing#58

QRegEx was removed in Qt6.

uklotzde · 2021-09-19T06:48:30Z

Thank you! LGTM

jospezial · 2021-11-07T17:40:51Z

On Gentoo with 5.15.2 git from kde:

FAILED: CMakeFiles/mixxx-lib.dir/src/skin/legacy/legacyskin.cpp.o 
/usr/bin/x86_64-pc-linux-gnu-g++ -DMIXXX_BUILD_RELEASE -DNDEBUG -DPA_USE_ALSA -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_PRINTSUPPORT_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICKWIDGETS_LIB -DQT_QUICK_LIB -DQT_SQL_LIB -DQT_SVG_LIB -DQT_TABLET_SUPPORT -DQT_TESTCASE_BUILDDIR=\"/var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999_build\" -DQT_TESTLIB_LIB -DQT_USE_QSTRINGBUILDER -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_XML_LIB -DSFC_SUPPORTS_SET_COMPRESSION_LEVEL -D__BATTERY__ -D__BULK__ -D__FAAD__ -D__FFMPEG__ -D__HID__ -D__KEYFINDER__ -D__LILV__ -D__LINUX__ -D__MAD__ -D__MODPLUG__ -D__MP4V2__ -D__OPUS__ -D__QTKEYCHAIN__ -D__SNDFILE__ -D__SQLITE3__ -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__UNIX__ -D__VINYLCONTROL__ -D__WV__ -Dx86_64 -I/var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999_build/mixxx-lib_autogen/include -I/var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/src -I/var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999_build/src -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/fidlib -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/googletest/googletest/include -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/portaudio -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/rigtorp/SPSCQueue/include -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/replaygain -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/reverb -isystem /usr/include/glib-2.0 -isystem /usr/lib64/glib-2.0/include -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/kaitai -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/mp3guessenc-0.27.4 -isystem /usr/include/qt5 -isystem /usr/include/qt5/QtConcurrent -isystem /usr/include/qt5/QtCore -isystem /usr/lib64/qt5/mkspecs/linux-g++ -isystem /usr/include/qt5/QtGui -isystem /usr/include/qt5/QtNetwork -isystem /usr/include/qt5/QtOpenGL -isystem /usr/include/qt5/QtWidgets -isystem /usr/include/qt5/QtPrintSupport -isystem /usr/include/qt5/QtQml -isystem /usr/include/qt5/QtQuickWidgets -isystem /usr/include/qt5/QtQuick -isystem /usr/include/qt5/QtQmlModels -isystem /usr/include/qt5/QtSql -isystem /usr/include/qt5/QtSvg -isystem /usr/include/qt5/QtTest -isystem /usr/include/qt5/QtXml -isystem /usr/include/qt5/QtX11Extras -isystem /usr/include/qt5/QtDBus -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/qm-dsp -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/qm-dsp/include -isystem /usr/include/taglib -isystem /usr/include/libupower-glib -isystem /usr/include/lilv-0 -isystem /usr/include/opus -isystem /usr/include/hidapi -isystem /usr/include/libusb-1.0 -isystem /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/lib/xwax -isystem /usr/include/wavpack  -march=native -mtune=native -O2 -pipe -fvisibility=hidden -fvisibility-inlines-hidden -pipe -Wall -Wextra -Woverloaded-virtual -Wfloat-conversion -Werror=return-type -Wformat=2 -Wformat-security -Wvla -Wundef -pthread -fPIC -std=gnu++17 -MD -MT CMakeFiles/mixxx-lib.dir/src/skin/legacy/legacyskin.cpp.o -MF CMakeFiles/mixxx-lib.dir/src/skin/legacy/legacyskin.cpp.o.d -o CMakeFiles/mixxx-lib.dir/src/skin/legacy/legacyskin.cpp.o -c /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/src/skin/legacy/legacyskin.cpp
/var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/src/skin/legacy/legacyskin.cpp:8:40: error: variable ‘const QRegularExpression {anonymous}::kMinSizeRegExp’ has initializer but incomplete type
    8 | const QRegularExpression kMinSizeRegExp(QStringLiteral("<MinimumSize>(\\d+), *(\\d+)<"));
      |                                        ^
/var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/src/skin/legacy/legacyskin.cpp:9:37: error: variable ‘const QRegularExpression {anonymous}::kDigitRegex’ has initializer but incomplete type
    9 | const QRegularExpression kDigitRegex(QStringLiteral("\\d"));
      |                                     ^
/var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/src/skin/legacy/legacyskin.cpp: In member function ‘virtual bool mixxx::skin::legacy::LegacySkin::fitsScreenSize(const QScreen&) const’:
/var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/src/skin/legacy/legacyskin.cpp:93:33: error: aggregate ‘QRegularExpressionMatch match’ has incomplete type and cannot be defined
   93 |         QRegularExpressionMatch match;
      |                                 ^~~~~
ninja: build stopped: subcommand failed.

Be-ing · 2021-11-07T17:52:58Z

That cannot be reproduced on CI or developers' machines so my guess is the problem is Gentoo's packaging somehow. Anyway, if you want to add some #includes to resolve it, please make a pull request.

Should fix a build error: /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/src/skin/legacy/legacyskin.cpp:8:40: error: variable ‘const QRegularExpression {anonymous}::kMinSizeRegExp’ has initializer but incomplete type 8 | const QRegularExpression kMinSizeRegExp(QStringLiteral("<MinimumSize>(\\d+), *(\\d+)<")); | ^ /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/src/skin/legacy/legacyskin.cpp:9:37: error: variable ‘const QRegularExpression {anonymous}::kDigitRegex’ has initializer but incomplete type 9 | const QRegularExpression kDigitRegex(QStringLiteral("\\d")); | ^ /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/src/skin/legacy/legacyskin.cpp: In member function ‘virtual bool mixxx::skin::legacy::LegacySkin::fitsScreenSize(const QScreen&) const’: /var/tmp/portage/media-sound/mixxx-9999/work/mixxx-9999/src/skin/legacy/legacyskin.cpp:93:33: error: aggregate ‘QRegularExpressionMatch match’ has incomplete type and cannot be defined 93 | QRegularExpressionMatch match; | ^~~~~ Reported here: mixxxdj#4289 (comment)

github-actions Bot added library ui labels Sep 16, 2021

Be-ing removed library ui labels Sep 16, 2021

Be-ing force-pushed the qregularexpression branch from ef03632 to 42d3933 Compare September 16, 2021 18:46

github-actions Bot added library ui labels Sep 16, 2021

uklotzde reviewed Sep 16, 2021

View reviewed changes

Holzhaus reviewed Sep 16, 2021

View reviewed changes

Comment thread src/controllers/dlgprefcontroller.cpp

Be-ing closed this Sep 17, 2021

Be-ing force-pushed the qregularexpression branch from 42d3933 to 9fc8b6b Compare September 17, 2021 04:38

Be-ing reopened this Sep 17, 2021

Be-ing force-pushed the qregularexpression branch from be01f3b to b869e36 Compare September 17, 2021 17:13

Be-ing force-pushed the qregularexpression branch from b869e36 to bc74458 Compare September 17, 2021 21:27

github-actions Bot added the code quality label Sep 18, 2021

Be-ing force-pushed the qregularexpression branch from f565770 to 1288e3e Compare September 18, 2021 15:30

uklotzde suggested changes Sep 18, 2021

View reviewed changes

Comment thread src/track/keyutils.cpp

Be-ing force-pushed the qregularexpression branch from 1288e3e to 1503762 Compare September 18, 2021 15:54

uklotzde reviewed Sep 18, 2021

View reviewed changes

Comment thread src/util/regex.h Outdated

Be-ing force-pushed the qregularexpression branch from 1503762 to 03108b4 Compare September 18, 2021 19:53

uklotzde reviewed Sep 18, 2021

View reviewed changes

Comment thread src/util/regex.h Outdated

replace QRegEx with QRegularExpression

81884d6

QRegEx was removed in Qt6.

uklotzde added 2 commits September 18, 2021 17:25

Fix parsing of numeric operators in search queries

3a6bd19

Fix parsing of duration seconds in search queries

2d4f7d0

Be-ing force-pushed the qregularexpression branch from 03108b4 to 2d4f7d0 Compare September 18, 2021 22:25

uklotzde approved these changes Sep 18, 2021

View reviewed changes

uklotzde merged commit d480aa0 into mixxxdj:main Sep 19, 2021

Be-ing deleted the qregularexpression branch November 7, 2021 17:51

Holzhaus mentioned this pull request Nov 7, 2021

LegacySkin: Add missing include for QRegularExpression #4506

Merged

daschuer mentioned this pull request Dec 12, 2021

Updated CHANGELOG.md for 2.4 beta #4564

Merged

Uh oh!

Conversation

Be-ing commented Sep 16, 2021

Uh oh!

uklotzde Sep 16, 2021

Choose a reason for hiding this comment

Uh oh!

uklotzde Sep 16, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Be-ing commented Sep 17, 2021

Uh oh!

Be-ing commented Sep 17, 2021

Uh oh!

uklotzde commented Sep 17, 2021

Uh oh!

Be-ing commented Sep 17, 2021

Uh oh!

Be-ing commented Sep 17, 2021

Uh oh!

Be-ing commented Sep 17, 2021

Uh oh!

uklotzde commented Sep 18, 2021

Uh oh!

uklotzde commented Sep 18, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

uklotzde commented Sep 19, 2021

Uh oh!

jospezial commented Nov 7, 2021

Uh oh!

Be-ing commented Nov 7, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants