diff options
| author | Jonas Kvinge <jonas@jkvinge.net> | 2020-10-18 00:58:52 +0200 |
|---|---|---|
| committer | Jonas Kvinge <jonas@jkvinge.net> | 2020-10-18 00:58:52 +0200 |
| commit | b5e6e2ba750dada199bedbff103186b4d83db920 (patch) | |
| tree | f2420430f4125d496595c6832ddd25ef56a6dad7 | |
| parent | Merge pull request #113 from Shatur95/fix-conversion-warning (diff) | |
| download | singleapplication-b5e6e2ba750dada199bedbff103186b4d83db920.tar.xz | |
Fix use of qChecksum with Qt 6
| -rw-r--r-- | singleapplication_p.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/singleapplication_p.cpp b/singleapplication_p.cpp index bb154bf..4a8061f 100644 --- a/singleapplication_p.cpp +++ b/singleapplication_p.cpp @@ -255,7 +255,11 @@ bool SingleApplicationPrivate::connectToPrimary( int timeout, ConnectionType con writeStream << blockServerName.toLatin1(); writeStream << static_cast<quint8>(connectionType); writeStream << instanceNumber; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length()))); +#else quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length())); +#endif writeStream << checksum; // The header indicates the message length that follows @@ -276,10 +280,12 @@ bool SingleApplicationPrivate::connectToPrimary( int timeout, ConnectionType con quint16 SingleApplicationPrivate::blockChecksum() { - return qChecksum( - static_cast <const char *>( memory->data() ), - offsetof( InstancesInfo, checksum ) - ); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum))); +#else + quint16 checksum = qChecksum(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum)); +#endif + return checksum; } qint64 SingleApplicationPrivate::primaryPid() @@ -415,7 +421,11 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock ) quint16 msgChecksum = 0; readStream >> msgChecksum; - const quint16 actualChecksum = qChecksum( msgBytes.constData(), static_cast<quint32>( msgBytes.length() - sizeof( quint16 ) ) ); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16)))); +#else + const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16))); +#endif bool isValid = readStream.status() == QDataStream::Ok && QLatin1String(latin1Name) == blockServerName && |