Replace 'signals' and 'slots' macros wih 'QT_SIGNALS' and 'QT_SLOTS'

When using qmake with QT 6, the 'signals' and 'slots' macros will yield an error. This is done on purpose, because those keywords can cause conflicts when mixing QT with other libraries with their own signal slot subsystem (for example boost). More info here: https://doc.qt.io/qt-5/signalsandslots.html#using-qt-with-3rd-party-signals-and-slots
emqx · Apr 11, 2022 · a5c001d · a5c001d
1 parent 6abd396
commit a5c001d
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/src/mqtt/qmqtt_client.h b/src/mqtt/qmqtt_client.h
@@ -216,7 +216,7 @@ class Q_MQTT_EXPORT Client : public QObject
     void setSslConfiguration(const QSslConfiguration& config);
 #endif // QT_NO_SSL
 
-public slots:
+public Q_SLOTS:
     void setHost(const QHostAddress& host);
     void setHostName(const QString& hostName);
     void setPort(const quint16 port);
@@ -246,7 +246,7 @@ public slots:
     void ignoreSslErrors(const QList<QSslError>& errors);
 #endif // QT_NO_SSL
 
-signals:
+Q_SIGNALS:
     void connected();
     void disconnected();
     void error(const QMQTT::ClientError error);
@@ -260,7 +260,7 @@ public slots:
     void sslErrors(const QList<QSslError>& errors);
 #endif // QT_NO_SSL
 
-protected slots:
+protected Q_SLOTS:
     void onNetworkConnected();
     void onNetworkDisconnected();
     void onNetworkReceived(const QMQTT::Frame& frame);

diff --git a/src/mqtt/qmqtt_network_p.h b/src/mqtt/qmqtt_network_p.h
@@ -91,15 +91,15 @@ class Network : public NetworkInterface
     void setSslConfiguration(const QSslConfiguration& config);
 #endif // QT_NO_SSL
 
-public slots:
+public Q_SLOTS:
     void connectToHost(const QHostAddress& host, const quint16 port);
     void connectToHost(const QString& hostName, const quint16 port);
     void disconnectFromHost();
 #ifndef QT_NO_SSL
     void ignoreSslErrors();
 #endif // QT_NO_SSL
 
-protected slots:
+protected Q_SLOTS:
     void onSocketError(QAbstractSocket::SocketError socketError);
 
 protected:
@@ -125,7 +125,7 @@ protected slots:
     int _shift;
     QByteArray _data;
 
-protected slots:
+protected Q_SLOTS:
     void onSocketReadReady();
     void onDisconnected();
     void connectToHost();

diff --git a/src/mqtt/qmqtt_networkinterface.h b/src/mqtt/qmqtt_networkinterface.h
@@ -69,15 +69,15 @@ class Q_MQTT_EXPORT NetworkInterface : public QObject
     virtual void setSslConfiguration(const QSslConfiguration& config) = 0;
 #endif // QT_NO_SSL
 
-public slots:
+public Q_SLOTS:
     virtual void connectToHost(const QHostAddress& host, const quint16 port) = 0;
     virtual void connectToHost(const QString& hostName, const quint16 port) = 0;
     virtual void disconnectFromHost() = 0;
 #ifndef QT_NO_SSL
     virtual void ignoreSslErrors() = 0;
 #endif // QT_NO_SSL
 
-signals:
+Q_SIGNALS:
     void connected();
     void disconnected();
     void received(const QMQTT::Frame& frame);

diff --git a/src/mqtt/qmqtt_routesubscription.h b/src/mqtt/qmqtt_routesubscription.h
@@ -56,10 +56,10 @@ class Q_MQTT_EXPORT RouteSubscription : public QObject
 
     QString route() const;
 
-signals:
+Q_SIGNALS:
     void received(const RoutedMessage &message);
 
-private slots:
+private Q_SLOTS:
     void routeMessage(const Message &message);
 
 private:

diff --git a/src/mqtt/qmqtt_socketinterface.h b/src/mqtt/qmqtt_socketinterface.h
@@ -70,7 +70,7 @@ class Q_MQTT_EXPORT SocketInterface : public QObject
     virtual void setSslConfiguration(const QSslConfiguration& config) { Q_UNUSED(config); }
 #endif // QT_NO_SSL
 
-signals:
+Q_SIGNALS:
     void connected();
     void disconnected();
     void error(QAbstractSocket::SocketError socketError);

diff --git a/src/mqtt/qmqtt_timerinterface.h b/src/mqtt/qmqtt_timerinterface.h
@@ -52,7 +52,7 @@ class Q_MQTT_EXPORT TimerInterface : public QObject
     virtual void start() = 0;
     virtual void stop() = 0;
 
-signals:
+Q_SIGNALS:
     void timeout();
 };
 

diff --git a/src/mqtt/qmqtt_websocketiodevice_p.h b/src/mqtt/qmqtt_websocketiodevice_p.h
@@ -57,7 +57,7 @@ class WebSocketIODevice : public QIODevice
 
     virtual qint64 bytesAvailable() const;
 
-signals:
+Q_SIGNALS:
     void connected();
 
     void disconnected();
@@ -71,7 +71,7 @@ class WebSocketIODevice : public QIODevice
 
     virtual qint64 writeData(const char *data, qint64 maxSize);
 
-private slots:
+private Q_SLOTS:
     void binaryMessageReceived(const QByteArray &frame);
 
 private:

diff --git a/tests/benchmarks/message/main.cpp b/tests/benchmarks/message/main.cpp
@@ -6,7 +6,7 @@ class tst_message: public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void emptyMessage();
     void message();
     void equality_data();

diff --git a/tests/gtest/tests/tcpserver.h b/tests/gtest/tests/tcpserver.h
@@ -21,7 +21,7 @@ class TcpServer : public QTcpServer
     QTcpSocket* _socket;
     QByteArray _data;
 
-protected slots:
+protected Q_SLOTS:
     void on_newConnection();
     void on_readyRead();
 };