diff --git a/src/plugins/servicebackends/standard/standardservicecontrol.cpp b/src/plugins/servicebackends/standard/standardservicecontrol.cpp index bc9c909..4214228 100644 --- a/src/plugins/servicebackends/standard/standardservicecontrol.cpp +++ b/src/plugins/servicebackends/standard/standardservicecontrol.cpp @@ -193,7 +193,7 @@ QString StandardServiceControl::serviceName() const if (info.isExecutable()) return QFileInfo{serviceId()}.completeBaseName(); else - return serviceId().split(QLatin1Char('/'), QString::SkipEmptyParts).last(); + return serviceId().split(QLatin1Char('/'), Qt::SkipEmptyParts).last(); } QSharedPointer StandardServiceControl::statusLock() const diff --git a/src/plugins/servicebackends/windows/windowsservicebackend.cpp b/src/plugins/servicebackends/windows/windowsservicebackend.cpp index b37a2eb..0bdb407 100644 --- a/src/plugins/servicebackends/windows/windowsservicebackend.cpp +++ b/src/plugins/servicebackends/windows/windowsservicebackend.cpp @@ -88,7 +88,7 @@ int WindowsServiceBackend::runService(int &argc, char **argv, int flags) if(_status.dwWin32ExitCode != NO_ERROR) return EXIT_FAILURE; // generate "local" arguments - auto sArgc = _svcArgs.size(); + int sArgc = _svcArgs.size(); QVector sArgv; sArgv.reserve(sArgc); for(auto &arg : _svcArgs) @@ -98,7 +98,7 @@ int WindowsServiceBackend::runService(int &argc, char **argv, int flags) // create and prepare the coreapp qCDebug(logBackend) << "setting status to start pending"; setStatus(SERVICE_START_PENDING); - QCoreApplication app(sArgc, sArgv.data(), flags); + QCoreApplication app(sArgc, sArgv.data(), flags); app.installNativeEventFilter(new SvcEventFilter{}); setStatus(SERVICE_START_PENDING); if(!preStartService()) @@ -368,8 +368,13 @@ void WindowsServiceBackend::SvcControlThread::run() } - -bool WindowsServiceBackend::SvcEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *result) +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +bool WindowsServiceBackend::SvcEventFilter::nativeEventFilter( + const QByteArray &eventType, void *message, long *result) +#else +bool WindowsServiceBackend::SvcEventFilter::nativeEventFilter( + const QByteArray &eventType, void *message, long long *result) +#endif { if(eventType == "windows_generic_MSG" || eventType == "windows_dispatcher_MSG") { diff --git a/src/plugins/servicebackends/windows/windowsservicebackend.h b/src/plugins/servicebackends/windows/windowsservicebackend.h index f3a0b1e..e08ca11 100644 --- a/src/plugins/servicebackends/windows/windowsservicebackend.h +++ b/src/plugins/servicebackends/windows/windowsservicebackend.h @@ -44,7 +44,11 @@ private Q_SLOTS: class SvcEventFilter : public QAbstractNativeEventFilter { public: - bool nativeEventFilter(const QByteArray &eventType, void *message, long *result); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &eventType, void *message, long *result); +#else + bool nativeEventFilter(const QByteArray &eventType, void *message, long long *result); +#endif }; static QPointer _backendInstance; diff --git a/src/service/service.h b/src/service/service.h index a494820..e5fa209 100644 --- a/src/service/service.h +++ b/src/service/service.h @@ -168,11 +168,11 @@ protected Q_SLOTS: //! Overload for qHash Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::Service::CommandResult key, uint seed = 0) Q_DECL_NOTHROW { - return ::qHash(static_cast(key), seed); + return static_cast(::qHash(static_cast(key), seed)); } //! Overload for qHash Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::Service::TerminalMode key, uint seed = 0) Q_DECL_NOTHROW { - return ::qHash(static_cast(key), seed); + return static_cast(::qHash(static_cast(key), seed)); } template diff --git a/src/service/servicebackend.h b/src/service/servicebackend.h index fda2f7c..28fc928 100644 --- a/src/service/servicebackend.h +++ b/src/service/servicebackend.h @@ -90,7 +90,7 @@ private Q_SLOTS: //! Overload for qHash Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::ServiceBackend::ServiceCommand key, uint seed = 0) Q_DECL_NOTHROW { - return ::qHash(static_cast(key), seed); + return static_cast(::qHash(static_cast(key), seed)); } template diff --git a/src/service/servicecontrol.h b/src/service/servicecontrol.h index ae9e4ff..eeed56c 100644 --- a/src/service/servicecontrol.h +++ b/src/service/servicecontrol.h @@ -201,15 +201,15 @@ public Q_SLOTS: //! Overload for qHash Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::ServiceControl::SupportFlags key, uint seed = 0) Q_DECL_NOTHROW { - return ::qHash(static_cast(key), seed); + return static_cast(::qHash(static_cast(key), seed)); } //! Overload for qHash Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::ServiceControl::Status key, uint seed = 0) Q_DECL_NOTHROW { - return ::qHash(static_cast(key), seed); + return static_cast(::qHash(static_cast(key), seed)); } //! Overload for qHash Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(QtService::ServiceControl::BlockMode key, uint seed = 0) Q_DECL_NOTHROW { - return ::qHash(static_cast(key), seed); + return static_cast(::qHash(static_cast(key), seed)); } // ------------- Generic Implementations ------------- diff --git a/src/service/terminal.cpp b/src/service/terminal.cpp index 295f606..b51beb2 100644 --- a/src/service/terminal.cpp +++ b/src/service/terminal.cpp @@ -30,7 +30,7 @@ Terminal::Terminal(TerminalPrivate *d_ptr, QObject *parent) : connect(d->socket, &QLocalSocket::disconnected, this, &Terminal::terminalDisconnected); - connect(d->socket, QOverload::of(&QLocalSocket::error), + connect(d->socket, &QLocalSocket::errorOccurred, this, [this](QLocalSocket::LocalSocketError e) { if(e != QLocalSocket::PeerClosedError) { setErrorString(d->socket->errorString()); @@ -283,7 +283,7 @@ TerminalPrivate::TerminalPrivate(QLocalSocket *socket, QObject *parent) : connect(socket, &QLocalSocket::disconnected, this, &TerminalPrivate::disconnected); - connect(socket, QOverload::of(&QLocalSocket::error), + connect(socket, &QLocalSocket::errorOccurred, this, &TerminalPrivate::error); connect(socket, &QLocalSocket::readyRead, this, &TerminalPrivate::readyRead); @@ -328,7 +328,7 @@ void TerminalPrivate::readyRead() terminalMode = static_cast(tMode); isLoading = false; //disconnect all but "disconencted" - that one is needed for auto-delete - disconnect(socket, QOverload::of(&QLocalSocket::error), + disconnect(socket, &QLocalSocket::errorOccurred, this, &TerminalPrivate::error); disconnect(socket, &QLocalSocket::readyRead, this, &TerminalPrivate::readyRead); diff --git a/src/service/terminalclient.cpp b/src/service/terminalclient.cpp index b025044..1b29a3e 100644 --- a/src/service/terminalclient.cpp +++ b/src/service/terminalclient.cpp @@ -255,7 +255,7 @@ void TerminalClient::setupChannels() this, &TerminalClient::connected); connect(_socket, &QLocalSocket::disconnected, this, &TerminalClient::disconnected); - connect(_socket, QOverload::of(&QLocalSocket::error), + connect(_socket, &QLocalSocket::errorOccurred, this, &TerminalClient::error); connect(_socket, &QLocalSocket::readyRead, this, &TerminalClient::socketReady,