From eb186e1b9f497d2dc04ff5f0bee96fc9755f792c Mon Sep 17 00:00:00 2001 From: Daniel Girardeau-Montaut Date: Thu, 30 Jun 2022 17:42:50 +0200 Subject: [PATCH] Avoid using 'signals' and 'emit' from Qt to avoid conflicts with other libs (e.g. TBB) --- include/jsonrpcserver.h | 2 +- src/jsonrpcserver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/jsonrpcserver.h b/include/jsonrpcserver.h index c23e36b..55ce483 100644 --- a/include/jsonrpcserver.h +++ b/include/jsonrpcserver.h @@ -48,7 +48,7 @@ public: void listen(unsigned int port); void close(); -signals: +Q_SIGNALS: JsonRPCResult execute(QString method, QMap params); private slots: void onNewConnection(); diff --git a/src/jsonrpcserver.cpp b/src/jsonrpcserver.cpp index 8f82c82..7b2b715 100644 --- a/src/jsonrpcserver.cpp +++ b/src/jsonrpcserver.cpp @@ -82,7 +82,7 @@ void JsonRPCServer::processTextMessage(QString message) JsonRPCResult result; if(!method.isEmpty() && !obj.value("jsonrpc").toString().isEmpty()) { // perform the RPC - result = emit execute(method, params); + result = Q_EMIT execute(method, params); } else { result = JsonRPCResult::error(-32600, "Invalid Request"); }