Use QT_NO_KEYWORDS

Allow to mix with libraries defining their own signals and slots.

Author: kleag

CMakeLists.txt

@@ -63,6 +63,7 @@ set(CMAKE_PREFIX_PATH
   "${CMAKE_PREFIX_PATH}" 
 )
 
+add_definitions(-DQT_NO_KEYWORDS)
 find_package(Qt5 REQUIRED Core Network)
 set(Qt5_INCLUDES ${Qt5_INCLUDES} ${Qt5Core_INCLUDE_DIRS}  ${Qt5Network_INCLUDE_DIRS})
 set(Qt5_LIBRARIES ${Qt5_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} )
@@ -107,6 +108,6 @@ SET(CPACK_STRIP_FILES "")
 SET(CPACK_SOURCE_STRIP_FILES "")
 # set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_GENERATOR ${SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR})
-set(CPACK_RPM_PACKAGE_REQUIRES "qt5 >= 5.2")
+# set(CPACK_RPM_PACKAGE_REQUIRES "qt5 >= 5.2")
 
 INCLUDE(CPack)

examples/bodydata/bodydata.h

@@ -12,7 +12,7 @@ class BodyData : public QObject
 public:
     BodyData();
 
-private slots:
+private Q_SLOTS:
     void handleRequest(QHttpRequest *req, QHttpResponse *resp);
 };
 
@@ -26,10 +26,10 @@ class Responder : public QObject
     Responder(QHttpRequest *req, QHttpResponse *resp);
     ~Responder();
 
-signals:
+Q_SIGNALS:
     void done();
 
-private slots:
+private Q_SLOTS:
     void accumulate(const QByteArray &data);
     void reply();
 

examples/greeting/greeting.h

@@ -11,6 +11,6 @@ class Greeting : public QObject
 public:
     Greeting();
 
-private slots:
+private Q_SLOTS:
     void handleRequest(QHttpRequest *req, QHttpResponse *resp);
 };

examples/helloworld/helloworld.h

@@ -11,6 +11,6 @@ class HelloWorld : public QObject
 public:
     HelloWorld();
 
-private slots:
+private Q_SLOTS:
     void handleRequest(QHttpRequest *req, QHttpResponse *resp);
 };

src/qhttpconnection.cpp

@@ -80,7 +80,7 @@ void QHttpConnection::socketDisconnected()
             return;
 
         m_request->setSuccessful(false);
-        emit m_request->end();
+        Q_EMIT m_request->end();
     }
 }
 
@@ -94,7 +94,7 @@ void QHttpConnection::updateWriteCount(qint64 count)
     {
         m_transmitLen = 0;
         m_transmitPos = 0;
-        emit allBytesWritten();
+        Q_EMIT allBytesWritten();
     }
 }
 
@@ -219,7 +219,7 @@ int QHttpConnection::HeadersComplete(http_parser *parser)
     connect(response, SIGNAL(done()), theConnection, SLOT(responseDone()));
 
     // we are good to go!
-    emit theConnection->newRequest(theConnection->m_request, response);
+    Q_EMIT theConnection->newRequest(theConnection->m_request, response);
     return 0;
 }
 
@@ -230,7 +230,7 @@ int QHttpConnection::MessageComplete(http_parser *parser)
     Q_ASSERT(theConnection->m_request);
 
     theConnection->m_request->setSuccessful(true);
-    emit theConnection->m_request->end();
+    Q_EMIT theConnection->m_request->end();
     return 0;
 }
 
@@ -282,7 +282,7 @@ int QHttpConnection::Body(http_parser *parser, const char *at, size_t length)
     QHttpConnection *theConnection = static_cast<QHttpConnection *>(parser->data);
     Q_ASSERT(theConnection->m_request);
 
-    emit theConnection->m_request->data(QByteArray(at, length));
+    Q_EMIT theConnection->m_request->data(QByteArray(at, length));
     return 0;
 }
 

src/qhttpconnection.h

@@ -41,11 +41,11 @@ class QHTTPSERVER_API QHttpConnection : public QObject
     void write(const QByteArray &data);
     void flush();
 
-signals:
+Q_SIGNALS:
     void newRequest(QHttpRequest *, QHttpResponse *);
     void allBytesWritten();
 
-private slots:
+private Q_SLOTS:
     void parseRequest();
     void responseDone();
     void socketDisconnected();

src/qhttprequest.h

@@ -163,7 +163,7 @@ class QHTTPSERVER_API QHttpRequest : public QObject
         @sa data() body() */
     void storeBody();
 
-signals:
+Q_SIGNALS:
     /// Emitted when new body data has been received.
     /** @note This may be emitted zero or more times
         depending on the request type.
@@ -174,7 +174,7 @@ class QHTTPSERVER_API QHttpRequest : public QObject
     /** @note The no more data() signals will be emitted after this. */
     void end();
 
-private slots:
+private Q_SLOTS:
     void appendBody(const QByteArray &body);
 
 private:

src/qhttpresponse.cpp

@@ -74,7 +74,7 @@ void QHttpResponse::writeHeaders()
     if (m_finished)
         return;
 
-    foreach(const QString & name, m_headers.keys()) {
+    Q_FOREACH(const QString & name, m_headers.keys()) {
         QString value = m_headers[name];
         if (name.compare("connection", Qt::CaseInsensitive) == 0) {
             m_sentConnectionHeader = true;
@@ -172,7 +172,7 @@ void QHttpResponse::end(const QByteArray &data)
         write(data);
     m_finished = true;
 
-    emit done();
+    Q_EMIT done();
 
     /// @todo End connection and delete ourselves. Is this a still valid note?
     deleteLater();
@@ -181,6 +181,6 @@ void QHttpResponse::end(const QByteArray &data)
 void QHttpResponse::connectionClosed()
 {
     m_finished = true;
-    emit done();
+    Q_EMIT done();
     deleteLater();
 }

src/qhttpresponse.h

@@ -91,7 +91,7 @@ class QHTTPSERVER_API QHttpResponse : public QObject
     friend class QHttpConnection;
     /// @endcond
 
-public slots:
+public Q_SLOTS:
     /// Sets a response header @c field to @c value.
     /** @note You must call this with all your custom headers
         before calling writeHead(), write() or end().
@@ -118,12 +118,12 @@ public slots:
         and the connection itself will be closed if
         this is the last response.
 
-        This will emit done() and queue this object
+        This will Q_EMIT done() and queue this object
         for deletion. For details see \ref memorymanagement.
         @param data Optional data to be written before finishing. */
     void end(const QByteArray &data = "");
 
-signals:
+Q_SIGNALS:
     /// Emitted when all the data has been sent
     /** This signal indicates that the underlaying socket has transmitted all
         of it's buffered data. It is possible to implement memory-efficient
@@ -157,7 +157,7 @@ public slots:
     bool m_useChunkedEncoding;
     bool m_finished;
 
-private slots:
+private Q_SLOTS:
     void connectionClosed();
 };
 

src/qhttpserver.h

@@ -81,15 +81,15 @@ class QHTTPSERVER_API QHttpServer : public QObject
 
     /// Stop the server and listening for new connections.
     void close();
-signals:
+Q_SIGNALS:
     /// Emitted when a client makes a new request to the server.
     /** The slot should use the given @c request and @c response
         objects to communicate with the client.
         @param request New incoming request.
         @param response Response object to the request. */
     void newRequest(QHttpRequest *request, QHttpResponse *response);
 
-private slots:
+private Q_SLOTS:
     void newConnection();
 
 private: