Skip to content

Qt6: Fix qChecksum() deprecation warnings #4433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Be-ing merged 1 commit into from
Oct 16, 2021
Merged

Qt6: Fix qChecksum() deprecation warnings #4433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/library/coverart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,15 @@ QString typeToString(CoverInfo::Type type) {

quint16 calculateLegacyHash(
const QImage& image) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
auto legacyHash = qChecksum(QByteArrayView(
reinterpret_cast<const char*>(image.constBits()),
image.sizeInBytes()));
#else
auto legacyHash = qChecksum(
reinterpret_cast<const char*>(image.constBits()),
image.sizeInBytes());
#endif
// In rare cases the calculated checksum could be equal to the
// reserved value CoverInfo::defaultLegacyHash() which might cause
// unexpected behavior. In this case we simply invert all bits to
Expand Down
25 changes: 18 additions & 7 deletions src/library/dao/analysisdao.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,15 @@ QList<AnalysisDao::AnalysisInfo> AnalysisDao::loadAnalysesFromQuery(TrackId trac
int checksum = query->value(dataChecksumColumn).toInt();
QString dataPath = analysisPath.absoluteFilePath(
QString::number(info.analysisId));
QByteArray compressedData = loadDataFromFile(dataPath);
int file_checksum = qChecksum(compressedData.constData(),
compressedData.length());
const QByteArray compressedData = loadDataFromFile(dataPath);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const int file_checksum = qChecksum(
compressedData);
#else
const int file_checksum = qChecksum(
compressedData.constData(),
compressedData.length());
#endif
if (checksum != file_checksum) {
qDebug() << "WARNING: Corrupt analysis loaded from" << dataPath
<< "length" << compressedData.length();
Expand Down Expand Up @@ -114,10 +120,15 @@ bool AnalysisDao::saveAnalysis(AnalysisDao::AnalysisInfo* info) {
PerformanceTimer time;
time.start();

QByteArray compressedData = qCompress(info->data, kCompressionLevel);
int checksum = qChecksum(compressedData.constData(),
compressedData.length());

const QByteArray compressedData = qCompress(info->data, kCompressionLevel);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const int checksum = qChecksum(
compressedData);
#else
const int checksum = qChecksum(
compressedData.constData(),
compressedData.length());
#endif
QSqlQuery query(m_database);
if (info->analysisId == -1) {
query.prepare(QString(
Expand Down