Moved all of the header files to a separate directory.

examples/chatserver/apihandler.h

@@ -25,7 +25,7 @@
 
 #include <QStringList>
 
-#include <QObjectHandler>
+#include <QHttpEngine/QObjectHandler>
 
 class ApiHandler : public QObjectHandler
 {

examples/chatserver/main.cpp

@@ -27,9 +27,9 @@
 #include <QRegExp>
 #include <QStringList>
 
-#include <QFilesystemHandler>
-#include <QHttpHandler>
-#include <QHttpServer>
+#include <QHttpEngine/QFilesystemHandler>
+#include <QHttpEngine/QHttpHandler>
+#include <QHttpEngine/QHttpServer>
 
 #include "apihandler.h"
 

examples/fileserver/main.cpp

@@ -27,8 +27,8 @@
 #include <QHostAddress>
 #include <QStringList>
 
-#include <QFilesystemHandler>
-#include <QHttpServer>
+#include <QHttpEngine/QFilesystemHandler>
+#include <QHttpEngine/QHttpServer>
 
 int main(int argc, char * argv[])
 {

src/CMakeLists.txt

@@ -1,26 +1,7 @@
 configure_file(qhttpengine.h.in "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine.h")
 
-set(HEADERS
-    "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine.h"
-    QFilesystemHandler
-    qfilesystemhandler.h
-    QHttpHandler
-    qhttphandler.h
-    QHttpParser
-    qhttpparser.h
-    QHttpServer
-    qhttpserver.h
-    QHttpSocket
-    qhttpsocket.h
-    QIByteArray
-    qibytearray.h
-    QIODeviceCopier
-    qiodevicecopier.h
-    QLocalFile
-    qlocalfile.h
-    QObjectHandler
-    qobjecthandler.h
-)
+file(GLOB HEADERS "${PROJECT_NAME}/*")
+set(HEADERS "${HEADERS}" "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine.h")
 
 set(SRC
     qfilesystemhandler.cpp
@@ -42,13 +23,13 @@ else()
     set(OUTPUT_NAME ${PROJECT_NAME})
 endif()
 
-add_library(qhttpengine SHARED ${SRC})
+add_library(qhttpengine SHARED ${HEADERS} ${SRC})
 qt5_use_modules(qhttpengine Network)
 
 target_include_directories(qhttpengine PUBLIC
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
-    "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}>"
+    "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>"
 )
 
 set_target_properties(qhttpengine PROPERTIES

src/QHttpEngine/qfilesystemhandler.h

@@ -29,7 +29,6 @@
 class QHTTPENGINE_EXPORT QFilesystemHandlerPrivate;
 
 /**
- * @class QFilesystemHandler qfilesystemhandler.h QFilesystemHandler
  * @brief Handler for filesystem requests
  *
  * This handler responds to requests for resources on a local filesystem. The

src/QHttpEngine/qhttphandler.h

@@ -32,7 +32,6 @@ class QHTTPENGINE_EXPORT QHttpHandlerPrivate;
 
 /**
  * @brief Base class for URL handlers
- * @headerfile qhttphandler.h QHttpHandler
  *
  * When a request is received by a QHttpServer, it invokes the route() method
  * of its handler which is used to determine what happens to the request. All

src/QHttpEngine/qhttpparser.h

@@ -39,7 +39,6 @@ typedef QMap<QIByteArray, QByteArray> QHttpHeaderMap;
 
 /**
  * @brief Utility methods for parsing HTTP requests and responses
- * @headerfile qhttpparser.h QHttpParser
  *
  * This class provides a set of static methods for parsing HTTP request and
  * response headers. Functionality is broken up into smaller methods in order

src/QHttpEngine/qhttpserver.h

@@ -34,7 +34,6 @@ class QHTTPENGINE_EXPORT QHttpServerPrivate;
 
 /**
  * @brief HTTP server
- * @headerfile qhttpserver.h QHttpServer
  *
  * This class provides a TCP server that listens for HTTP requests on the
  * specified address and port. When a new request is received, a QHttpSocket

src/QHttpEngine/qhttpsocket.h

@@ -32,7 +32,6 @@ class QHTTPENGINE_EXPORT QHttpSocketPrivate;
 
 /**
  * @brief Implementation of the HTTP protocol
- * @headerfile qhttpsocket.h QHttpSocket
  *
  * QHttpSocket provides a class derived from QIODevice that can be used to
  * read data from and write data to an HTTP client through a QTcpSocket

src/QHttpEngine/qibytearray.h

@@ -29,7 +29,6 @@
 
 /**
  * @brief Case-insensitive subclass of QByteArray
- * @headerfile qibytearray.h QIByteArray
  *
  * The QIByteArray is identical to the QByteArray class in all aspects except
  * that it performs comparisons in a case-insensitive manner.

src/QHttpEngine/qiodevicecopier.h

@@ -32,7 +32,6 @@ class QHTTPENGINE_EXPORT QIODeviceCopierPrivate;
 
 /**
  * @brief Device copier
- * @headerfile qiodevicecopier.h QIODeviceCopier
  *
  * QIODeviceCopier provides a set of methods for reading data from a QIODevice
  * and writing it to another. The class operates asynchronously and therefore

src/QHttpEngine/qlocalfile.h

@@ -31,7 +31,6 @@ class QHTTPENGINE_EXPORT QLocalFilePrivate;
 
 /**
  * @brief Locally accessible file
- * @headerfile qlocalfile.h QLocalFile
  *
  * QLocalFile uses platform-specific functions to create a file containing
  * information that will be accessible only to the local user. This is

src/QHttpEngine/qobjecthandler.h

@@ -30,7 +30,6 @@ class QHTTPENGINE_EXPORT QObjectHandlerPrivate;
 
 /**
  * @brief Handler for invoking slots
- * @headerfile qobjecthandler.h QObjectHandler
  *
  * This handler enables incoming requests to invoke a matching slot in a
  * QObject-derived class. The request body is expected to contain parameters

src/qfilesystemhandler.cpp

@@ -25,9 +25,9 @@
 #include <QFileInfoList>
 #include <QUrl>
 
-#include "qfilesystemhandler.h"
+#include "QHttpEngine/qfilesystemhandler.h"
+#include "QHttpEngine/qiodevicecopier.h"
 #include "qfilesystemhandler_p.h"
-#include "qiodevicecopier.h"
 
 // Template for listing directory contents
 const QString ListTemplate =

src/qfilesystemhandler_p.h

@@ -27,8 +27,8 @@
 #include <QMimeDatabase>
 #include <QObject>
 
-#include "qfilesystemhandler.h"
-#include "qhttpsocket.h"
+#include "QHttpEngine/qfilesystemhandler.h"
+#include "QHttpEngine/qhttpsocket.h"
 
 class QFilesystemHandlerPrivate : public QObject
 {

src/qhttphandler.cpp

@@ -20,7 +20,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "qhttphandler.h"
+#include <QHttpEngine/QHttpHandler>
+
 #include "qhttphandler_p.h"
 
 QHttpHandlerPrivate::QHttpHandlerPrivate(QHttpHandler *handler)

src/qhttphandler_p.h

@@ -28,7 +28,7 @@
 #include <QPair>
 #include <QRegExp>
 
-#include "qhttphandler.h"
+#include "QHttpEngine/qhttphandler.h"
 
 typedef QPair<QRegExp, QString> Redirect;
 typedef QPair<QRegExp, QHttpHandler*> SubHandler;

src/qhttpparser.cpp

@@ -22,7 +22,7 @@
 
 #include <QByteArray>
 
-#include "qhttpparser.h"
+#include "QHttpEngine/qhttpparser.h"
 
 void QHttpParser::split(const QByteArray &data, const QByteArray &delim, int maxSplit, QList<QByteArray> &parts)
 {

src/qhttpserver.cpp

@@ -22,9 +22,9 @@
 
 #include <QTcpSocket>
 
-#include "qhttpserver.h"
+#include "QHttpEngine/qhttpserver.h"
+#include "QHttpEngine/qhttpsocket.h"
 #include "qhttpserver_p.h"
-#include "qhttpsocket.h"
 
 QHttpServerPrivate::QHttpServerPrivate(QHttpServer *httpServer)
     : QObject(httpServer),

src/qhttpserver_p.h

@@ -26,8 +26,8 @@
 #include <QObject>
 #include <QTcpServer>
 
-#include "qhttphandler.h"
-#include "qhttpserver.h"
+#include "QHttpEngine/qhttphandler.h"
+#include "QHttpEngine/qhttpserver.h"
 
 class QHttpServerPrivate : public QObject
 {

src/qhttpsocket.cpp

@@ -22,7 +22,7 @@
 
 #include <cstring>
 
-#include "qhttpsocket.h"
+#include "QHttpEngine/qhttpsocket.h"
 #include "qhttpsocket_p.h"
 
 // Predefined error response requires a simple HTML template to be returned to

src/qhttpsocket_p.h

@@ -26,8 +26,8 @@
 #include <QObject>
 #include <QTcpSocket>
 
-#include "qhttpparser.h"
-#include "qhttpsocket.h"
+#include "QHttpEngine/qhttpparser.h"
+#include "QHttpEngine/qhttpsocket.h"
 
 class QHttpSocketPrivate : public QObject
 {

src/qibytearray.cpp

@@ -22,7 +22,7 @@
 
 #include <QString>
 
-#include "qibytearray.h"
+#include "QHttpEngine/qibytearray.h"
 
 QIByteArray::QIByteArray()
 {}

src/qiodevicecopier.cpp

@@ -22,7 +22,7 @@
 
 #include <QTimer>
 
-#include "qiodevicecopier.h"
+#include "QHttpEngine/qiodevicecopier.h"
 #include "qiodevicecopier_p.h"
 
 // Default value for the bufferSize property

src/qiodevicecopier_p.h

@@ -26,7 +26,7 @@
 #include <QIODevice>
 #include <QObject>
 
-#include "qiodevicecopier.h"
+#include "QHttpEngine/qiodevicecopier.h"
 
 class QIODeviceCopierPrivate : public QObject
 {

src/qlocalfile.cpp

@@ -30,7 +30,7 @@
 #  include <fileapi.h>
 #endif
 
-#include "qlocalfile.h"
+#include "QHttpEngine/qlocalfile.h"
 #include "qlocalfile_p.h"
 
 QLocalFilePrivate::QLocalFilePrivate(QLocalFile *localFile)

src/qlocalfile_p.h

@@ -25,7 +25,7 @@
 
 #include <QObject>
 
-#include "qlocalfile.h"
+#include "QHttpEngine/qlocalfile.h"
 
 class QLocalFilePrivate : public QObject
 {

src/qobjecthandler.cpp

@@ -28,7 +28,7 @@
 #include <QMetaType>
 #include <QVariantMap>
 
-#include "qobjecthandler.h"
+#include "QHttpEngine/qobjecthandler.h"
 #include "qobjecthandler_p.h"
 
 QObjectHandlerPrivate::QObjectHandlerPrivate(QObjectHandler *handler)

src/qobjecthandler_p.h

@@ -26,8 +26,8 @@
 #include <QMap>
 #include <QObject>
 
-#include "qhttpsocket.h"
-#include "qobjecthandler.h"
+#include "QHttpEngine/qhttpsocket.h"
+#include "QHttpEngine/qobjecthandler.h"
 
 class QObjectHandlerPrivate : public QObject
 {

tests/TestQFilesystemHandler.cpp

@@ -27,8 +27,8 @@
 #include <QTemporaryDir>
 #include <QTest>
 
-#include <QHttpSocket>
-#include <QFilesystemHandler>
+#include <QHttpEngine/QHttpSocket>
+#include <QHttpEngine/QFilesystemHandler>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/TestQHttpHandler.cpp

@@ -23,8 +23,8 @@
 #include <QRegExp>
 #include <QTest>
 
-#include <QHttpSocket>
-#include <QHttpHandler>
+#include <QHttpEngine/QHttpSocket>
+#include <QHttpEngine/QHttpHandler>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/TestQHttpParser.cpp

@@ -24,8 +24,8 @@
 #include <QObject>
 #include <QTest>
 
-#include <QHttpParser>
-#include <QIByteArray>
+#include <QHttpEngine/QHttpParser>
+#include <QHttpEngine/QIByteArray>
 
 typedef QList<QByteArray> QByteArrayList;
 

tests/TestQHttpServer.cpp

@@ -24,8 +24,8 @@
 #include <QTcpSocket>
 #include <QTest>
 
-#include <QHttpServer>
-#include <QHttpHandler>
+#include <QHttpEngine/QHttpServer>
+#include <QHttpEngine/QHttpHandler>
 
 #include "common/qsimplehttpclient.h"
 

tests/TestQHttpSocket.cpp

@@ -24,8 +24,8 @@
 #include <QSignalSpy>
 #include <QTest>
 
-#include <QHttpSocket>
-#include <QHttpParser>
+#include <QHttpEngine/QHttpSocket>
+#include <QHttpEngine/QHttpParser>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/TestQIByteArray.cpp

@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QTest>
 
-#include <QIByteArray>
+#include <QHttpEngine/QIByteArray>
 
 const char *Value1 = "test";
 const char *Value2 = "TEST";

tests/TestQIODeviceCopier.cpp

@@ -27,7 +27,7 @@
 #include <QTcpSocket>
 #include <QTest>
 
-#include <QIODeviceCopier>
+#include <QHttpEngine/QIODeviceCopier>
 
 #include "common/qsocketpair.h"
 

tests/TestQLocalFile.cpp

@@ -25,7 +25,7 @@
 #include <QObject>
 #include <QTest>
 
-#include <QLocalFile>
+#include <QHttpEngine/QLocalFile>
 
 const QString ApplicationName = "QHttpEngine";
 

tests/TestQObjectHandler.cpp

@@ -26,8 +26,8 @@
 #include <QTest>
 #include <QVariantMap>
 
-#include <QHttpSocket>
-#include <QObjectHandler>
+#include <QHttpEngine/QHttpSocket>
+#include <QHttpEngine/QObjectHandler>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/common/qsimplehttpclient.h

@@ -27,7 +27,7 @@
 #include <QObject>
 #include <QTcpSocket>
 
-#include <QHttpParser>
+#include <QHttpEngine/QHttpParser>
 
 /**
  * @brief Simple HTTP client for testing purposes