diff options
| author | Itay Grudev <itay+github.com@grudev.com> | 2022-04-03 20:57:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-03 20:57:38 +0300 |
| commit | 50b7b905d6a84a2723834c496deffc4cb3618583 (patch) | |
| tree | e724e0fccfdaec70abd450b749d74306477cc264 | |
| parent | Merge pull request #149 from itay-grudev/ci-on-pr (diff) | |
| parent | make it compile with Qt 6.2.x and stricter compile settings (diff) | |
| download | singleapplication-50b7b905d6a84a2723834c496deffc4cb3618583.tar.xz | |
Merge pull request #148 from christoph-cullmann/master
Make it compile with Qt 6.2.x and stricter compile settings
| -rw-r--r-- | singleapplication_p.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/singleapplication_p.cpp b/singleapplication_p.cpp index 652e0a3..a037f71 100644 --- a/singleapplication_p.cpp +++ b/singleapplication_p.cpp @@ -141,7 +141,7 @@ void SingleApplicationPrivate::genBlockServerName() appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() ); if ( ! appDataList.isEmpty() ) - appData.addData( appDataList.join( "" ).toUtf8() ); + appData.addData( appDataList.join(QString()).toUtf8() ); if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ){ appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() ); @@ -171,7 +171,7 @@ void SingleApplicationPrivate::genBlockServerName() // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with // server naming requirements. - blockServerName = appData.result().toBase64().replace("/", "_"); + blockServerName = QString::fromUtf8(appData.result().toBase64().replace("/", "_")); } void SingleApplicationPrivate::initializeMemoryBlock() const @@ -270,7 +270,7 @@ bool SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType conne 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()))); + quint16 checksum = qChecksum(QByteArray(initMsg.constData(), static_cast<quint32>(initMsg.length()))); #else quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length())); #endif @@ -472,7 +472,7 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock ) readStream >> msgChecksum; #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16)))); + const quint16 actualChecksum = qChecksum(QByteArray(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)))); #else const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16))); #endif |