Allow build with qt6 #8
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pvuorela
reviewed
Oct 14, 2023
pvuorela
reviewed
Nov 28, 2023
| @@ -1059,7 +1059,7 @@ bool DatabaseIO::getGroups(const QString &localUid, const QString &remoteUid, QL | |||
| if (!remoteUid.isEmpty()) | |||
| q += "Groups.remoteUids = :remoteUid "; | |||
| } | |||
| q += "GROUP BY Groups.id " + queryOrder; | |||
| q += QString("GROUP BY Groups.id " + queryOrder).toUtf8(); | |||
There was a problem hiding this comment.
No need to create a string from the whole thing, and better if not needing to use QString(char*). Just do "... + queryOrder.toUtf8()".
| @@ -36,7 +36,11 @@ void RecipientEventModelTest::initTestCase() | |||
| { | |||
| initTestDatabase(); | |||
|
|
|||
| qsrand(QDateTime::currentDateTime().toTime_t()); | |||
| #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | |||
| srand( QDateTime::currentDateTime().toSecsSinceEpoch() ); | |||
There was a problem hiding this comment.
Why seed srand() since rand() isn't used here? If Qt api is used for random number, qt api should be seeded.
Same issue on multiple places.
| bool randomRemote = true; | ||
| if (arguments.count() > 3) { | ||
| remoteUid = arguments.at(3); | ||
| randomRemote = false; | ||
| } | ||
|
|
||
| #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | ||
| QRandomGenerator qrand; |
There was a problem hiding this comment.
I'd avoid qrand as name since that's used on qt side too. But then again I don't think there's need to declare such an instance at all, could instead just use "QRandomGenerator::global()->generate()" instead of qrand()?
Applies to lot of places.
| @@ -21,5 +21,6 @@ | |||
| ############################################################################### | |||
|
|
|||
| TEMPLATE = subdirs | |||
| CONFIG += ORDERED | |||
pvuorela
requested changes
Dec 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.