Rename source files.

examples/auth/client.cpp

@@ -30,7 +30,7 @@
 #include <QNetworkReply>
 #include <QUrl>
 
-#include <qhttpengine/qlocalfile.h>
+#include <qhttpengine/localfile.h>
 
 int main(int argc, char * argv[])
 {

examples/chatserver/apihandler.h

@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QStringList>
 
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/socket.h>
 
 class ApiHandler : public QObject
 {

examples/chatserver/main.cpp

@@ -27,9 +27,9 @@
 #include <QRegExp>
 #include <QStringList>
 
-#include <qhttpengine/qfilesystemhandler.h>
-#include <qhttpengine/qhttphandler.h>
-#include <qhttpengine/qhttpserver.h>
+#include <qhttpengine/filesystemhandler.h>
+#include <qhttpengine/handler.h>
+#include <qhttpengine/server.h>
 #include <qhttpengine/qobjecthandler.h>
 
 #include "apihandler.h"

examples/fileserver/main.cpp

@@ -27,8 +27,8 @@
 #include <QHostAddress>
 #include <QStringList>
 
-#include <qhttpengine/qfilesystemhandler.h>
-#include <qhttpengine/qhttpserver.h>
+#include <qhttpengine/filesystemhandler.h>
+#include <qhttpengine/server.h>
 
 int main(int argc, char * argv[])
 {

include/qhttpengine/basicauthmiddleware.h

@@ -23,7 +23,7 @@
 #ifndef QHTTPENGINE_QHTTPBASICAUTH_H
 #define QHTTPENGINE_QHTTPBASICAUTH_H
 
-#include <qhttpengine/qhttpmiddleware.h>
+#include <qhttpengine/middleware.h>
 
 #include "qhttpengine_global.h"
 

include/qhttpengine/filesystemhandler.h

@@ -23,7 +23,7 @@
 #ifndef QHTTPENGINE_QFILESYSTEMHANDLER_H
 #define QHTTPENGINE_QFILESYSTEMHANDLER_H
 
-#include <qhttpengine/qhttphandler.h>
+#include <qhttpengine/handler.h>
 
 #include "qhttpengine_global.h"
 

include/qhttpengine/localauthmiddleware.h

@@ -25,7 +25,7 @@
 
 #include <QVariantMap>
 
-#include <qhttpengine/qhttpmiddleware.h>
+#include <qhttpengine/middleware.h>
 
 #include "qhttpengine_global.h"
 

include/qhttpengine/parser.h

@@ -25,7 +25,7 @@
 
 #include <QList>
 
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/socket.h>
 
 #include "qhttpengine_global.h"
 

include/qhttpengine/proxyhandler.h

@@ -25,7 +25,7 @@
 
 #include <QHostAddress>
 
-#include <qhttpengine/qhttphandler.h>
+#include <qhttpengine/handler.h>
 
 #include "qhttpengine_global.h"
 

include/qhttpengine/qobjecthandler.h

@@ -23,7 +23,7 @@
 #ifndef QHTTPENGINE_QOBJECTHANDLER_H
 #define QHTTPENGINE_QOBJECTHANDLER_H
 
-#include <qhttpengine/qhttphandler.h>
+#include <qhttpengine/handler.h>
 
 #include "qhttpengine_global.h"
 

include/qhttpengine/socket.h

@@ -27,7 +27,7 @@
 #include <QMultiMap>
 #include <QIODevice>
 
-#include <qhttpengine/qibytearray.h>
+#include <qhttpengine/ibytearray.h>
 
 #include "qhttpengine_global.h"
 

src/CMakeLists.txt

@@ -4,19 +4,19 @@ file(GLOB HEADERS "${CMAKE_SOURCE_DIR}/include/qhttpengine/*")
 set(HEADERS "${HEADERS}" "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine_global.h")
 
 set(SRC
-    qfilesystemhandler.cpp
-    qhttpbasicauth.cpp
-    qhttphandler.cpp
-    qhttpparser.cpp
-    qhttprange.cpp
-    qhttpserver.cpp
-    qhttpsocket.cpp
+    filesystemhandler.cpp
+    basicauthmiddleware.cpp
+    handler.cpp
+    parser.cpp
+    range.cpp
+    server.cpp
+    socket.cpp
     qiodevicecopier.cpp
-    qlocalauth.cpp
-    qlocalfile.cpp
+    localauthmiddleware.cpp
+    localfile.cpp
     qobjecthandler.cpp
-    qproxyhandler.cpp
-    qproxysocket.cpp
+    proxyhandler.cpp
+    proxysocket.cpp
 )
 
 if(WIN32)

src/basicauthmiddleware.cpp

@@ -20,12 +20,12 @@
  * IN THE SOFTWARE.
  */
 
-#include <qhttpengine/qhttpbasicauth.h>
-#include <qhttpengine/qhttpparser.h>
-#include <qhttpengine/qhttpsocket.h>
-#include <qhttpengine/qibytearray.h>
+#include <qhttpengine/basicauthmiddleware.h>
+#include <qhttpengine/parser.h>
+#include <qhttpengine/socket.h>
+#include <qhttpengine/ibytearray.h>
 
-#include "qhttpbasicauth_p.h"
+#include "basicauthmiddleware_p.h"
 
 HttpBasicAuthPrivate::HttpBasicAuthPrivate(QObject *parent, const QString &realm)
     : QObject(parent),

src/filesystemhandler.cpp

@@ -25,11 +25,11 @@
 #include <QFileInfoList>
 #include <QUrl>
 
-#include <qhttpengine/qfilesystemhandler.h>
-#include <qhttpengine/qhttprange.h>
+#include <qhttpengine/filesystemhandler.h>
+#include <qhttpengine/range.h>
 #include <qhttpengine/qiodevicecopier.h>
 
-#include "qfilesystemhandler_p.h"
+#include "filesystemhandler_p.h"
 
 // Template for listing directory contents
 const QString ListTemplate =

src/filesystemhandler_p.h

@@ -27,8 +27,8 @@
 #include <QMimeDatabase>
 #include <QObject>
 
-#include <qhttpengine/qfilesystemhandler.h>
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/filesystemhandler.h>
+#include <qhttpengine/socket.h>
 
 class FilesystemHandlerPrivate : public QObject
 {

src/handler.cpp

@@ -20,11 +20,11 @@
  * IN THE SOFTWARE.
  */
 
-#include <qhttpengine/qhttphandler.h>
-#include <qhttpengine/qhttpmiddleware.h>
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/handler.h>
+#include <qhttpengine/middleware.h>
+#include <qhttpengine/socket.h>
 
-#include "qhttphandler_p.h"
+#include "handler_p.h"
 
 HttpHandlerPrivate::HttpHandlerPrivate(HttpHandler *handler)
     : QObject(handler),

src/handler_p.h

@@ -28,7 +28,7 @@
 #include <QPair>
 #include <QRegExp>
 
-#include <qhttpengine/qhttphandler.h>
+#include <qhttpengine/handler.h>
 
 typedef QPair<QRegExp, QString> Redirect;
 typedef QPair<QRegExp, HttpHandler*> SubHandler;

src/localauthmiddleware.cpp

@@ -24,10 +24,10 @@
 #include <QJsonObject>
 #include <QUuid>
 
-#include <qhttpengine/qhttpsocket.h>
-#include <qhttpengine/qlocalauth.h>
+#include <qhttpengine/socket.h>
+#include <qhttpengine/localauthmiddleware.h>
 
-#include "qlocalauth_p.h"
+#include "localauthmiddleware_p.h"
 
 LocalAuthPrivate::LocalAuthPrivate(QObject *parent)
     : QObject(parent),

src/localauthmiddleware_p.h

@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QVariantMap>
 
-#include <qhttpengine/qlocalfile.h>
+#include <qhttpengine/localfile.h>
 
 class LocalAuthPrivate : public QObject
 {

src/localfile.cpp

@@ -30,9 +30,9 @@
 #  include <windows.h>
 #endif
 
-#include <qhttpengine/qlocalfile.h>
+#include <qhttpengine/localfile.h>
 
-#include "qlocalfile_p.h"
+#include "localfile_p.h"
 
 LocalFilePrivate::LocalFilePrivate(LocalFile *localFile)
     : QObject(localFile),

src/parser.cpp

@@ -24,7 +24,7 @@
 #include <QUrl>
 #include <QUrlQuery>
 
-#include <qhttpengine/qhttpparser.h>
+#include <qhttpengine/parser.h>
 
 void HttpParser::split(const QByteArray &data, const QByteArray &delim, int maxSplit, QByteArrayList &parts)
 {

src/proxyhandler.cpp

@@ -20,10 +20,10 @@
  * IN THE SOFTWARE.
  */
 
-#include <qhttpengine/qproxyhandler.h>
+#include <qhttpengine/proxyhandler.h>
 
-#include "qproxyhandler_p.h"
-#include "qproxysocket.h"
+#include "proxyhandler_p.h"
+#include "proxysocket.h"
 
 ProxyHandlerPrivate::ProxyHandlerPrivate(QObject *parent, const QHostAddress &address, quint16 port)
     : QObject(parent),

src/proxyhandler_p.h

@@ -26,7 +26,7 @@
 #include <QHostAddress>
 #include <QObject>
 
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/socket.h>
 
 class ProxyHandlerPrivate : public QObject
 {

src/proxysocket.cpp

@@ -20,9 +20,9 @@
  * IN THE SOFTWARE.
  */
 
-#include <qhttpengine/qhttpparser.h>
+#include <qhttpengine/parser.h>
 
-#include "qproxysocket.h"
+#include "proxysocket.h"
 
 QProxySocket::QProxySocket(HttpSocket *socket, const QString &path, const QHostAddress &address, quint16 port)
     : QObject(socket),

src/proxysocket.h

@@ -27,7 +27,7 @@
 #include <QObject>
 #include <QTcpSocket>
 
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/socket.h>
 
 /**
  * @brief HTTP socket for connecting to a proxy

src/qobjecthandler.cpp

@@ -23,7 +23,7 @@
 #include <QGenericArgument>
 #include <QMetaMethod>
 
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/socket.h>
 #include <qhttpengine/qobjecthandler.h>
 
 #include "qobjecthandler_p.h"

src/range.cpp

@@ -22,9 +22,9 @@
 
 #include <QRegExp>
 
-#include <qhttpengine/qhttprange.h>
+#include <qhttpengine/range.h>
 
-#include "qhttprange_p.h"
+#include "range_p.h"
 
 HttpRangePrivate::HttpRangePrivate(HttpRange *range)
     : q(range)

src/range_p.h

@@ -23,7 +23,7 @@
 #ifndef QHTTPENGINE_QHTTPRANGEPRIVATE_H
 #define QHTTPENGINE_QHTTPRANGEPRIVATE_H
 
-#include <qhttpengine/qhttprange.h>
+#include <qhttpengine/range.h>
 
 class HttpRangePrivate
 {

src/server.cpp

@@ -24,10 +24,10 @@
 #  include <QSslSocket>
 #endif
 
-#include <qhttpengine/qhttphandler.h>
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/handler.h>
+#include <qhttpengine/socket.h>
 
-#include "qhttpserver_p.h"
+#include "server_p.h"
 
 HttpServerPrivate::HttpServerPrivate(HttpServer *httpServer)
     : QObject(httpServer),

src/server_p.h

@@ -30,7 +30,7 @@
 #  include <QSslConfiguration>
 #endif
 
-#include <qhttpengine/qhttpserver.h>
+#include <qhttpengine/server.h>
 
 class HttpHandler;
 

src/socket.cpp

@@ -26,9 +26,9 @@
 #include <QJsonParseError>
 #include <QTcpSocket>
 
-#include <qhttpengine/qhttpparser.h>
+#include <qhttpengine/parser.h>
 
-#include "qhttpsocket_p.h"
+#include "socket_p.h"
 
 // Predefined error response requires a simple HTML template to be returned to
 // the client describing the error condition

src/socket_p.h

@@ -23,7 +23,7 @@
 #ifndef QHTTPENGINE_QHTTPSOCKETPRIVATE_H
 #define QHTTPENGINE_QHTTPSOCKETPRIVATE_H
 
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/socket.h>
 
 class QTcpSocket;
 

tests/TestQFilesystemHandler.cpp

@@ -27,8 +27,8 @@
 #include <QTemporaryDir>
 #include <QTest>
 
-#include <qhttpengine/qhttpsocket.h>
-#include <qhttpengine/qfilesystemhandler.h>
+#include <qhttpengine/socket.h>
+#include <qhttpengine/filesystemhandler.h>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/TestQHttpBasicAuth.cpp

@@ -22,9 +22,9 @@
 
 #include <QTest>
 
-#include <qhttpengine/qhttpbasicauth.h>
-#include <qhttpengine/qhttphandler.h>
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/basicauthmiddleware.h>
+#include <qhttpengine/handler.h>
+#include <qhttpengine/socket.h>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/TestQHttpHandler.cpp

@@ -23,8 +23,8 @@
 #include <QRegExp>
 #include <QTest>
 
-#include <qhttpengine/qhttpsocket.h>
-#include <qhttpengine/qhttphandler.h>
+#include <qhttpengine/socket.h>
+#include <qhttpengine/handler.h>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/TestQHttpMiddleware.cpp

@@ -22,9 +22,9 @@
 
 #include <QTest>
 
-#include <qhttpengine/qhttphandler.h>
-#include <qhttpengine/qhttpmiddleware.h>
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/handler.h>
+#include <qhttpengine/middleware.h>
+#include <qhttpengine/socket.h>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/TestQHttpParser.cpp

@@ -24,9 +24,9 @@
 #include <QObject>
 #include <QTest>
 
-#include <qhttpengine/qhttpparser.h>
-#include <qhttpengine/qhttpsocket.h>
-#include <qhttpengine/qibytearray.h>
+#include <qhttpengine/parser.h>
+#include <qhttpengine/socket.h>
+#include <qhttpengine/ibytearray.h>
 
 typedef QList<QByteArray> QByteArrayList;
 

tests/TestQHttpRange.cpp

@@ -24,7 +24,7 @@
 #include <QString>
 #include <QTest>
 
-#include <qhttpengine/qhttprange.h>
+#include <qhttpengine/range.h>
 
 class TestQHttpRange : public QObject
 {

tests/TestQHttpServer.cpp

@@ -32,8 +32,8 @@
 #  include <QSslSocket>
 #endif
 
-#include <qhttpengine/qhttpserver.h>
-#include <qhttpengine/qhttphandler.h>
+#include <qhttpengine/server.h>
+#include <qhttpengine/handler.h>
 
 #include "common/qsimplehttpclient.h"
 

tests/TestQHttpSocket.cpp

@@ -26,8 +26,8 @@
 #include <QSignalSpy>
 #include <QTest>
 
-#include <qhttpengine/qhttpsocket.h>
-#include <qhttpengine/qhttpparser.h>
+#include <qhttpengine/socket.h>
+#include <qhttpengine/parser.h>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/TestQIByteArray.cpp

@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QTest>
 
-#include <qhttpengine/qibytearray.h>
+#include <qhttpengine/ibytearray.h>
 
 const char *Value1 = "test";
 const char *Value2 = "TEST";

tests/TestQLocalAuth.cpp

@@ -26,8 +26,8 @@
 #include <QTest>
 #include <QVariantMap>
 
-#include <qhttpengine/qhttpsocket.h>
-#include <qhttpengine/qlocalauth.h>
+#include <qhttpengine/socket.h>
+#include <qhttpengine/localauthmiddleware.h>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/TestQLocalFile.cpp

@@ -25,7 +25,7 @@
 #include <QObject>
 #include <QTest>
 
-#include <qhttpengine/qlocalfile.h>
+#include <qhttpengine/localfile.h>
 
 const QString ApplicationName = "QHttpEngine";
 

tests/TestQObjectHandler.cpp

@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QTest>
 
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/socket.h>
 #include <qhttpengine/qobjecthandler.h>
 
 #include "common/qsimplehttpclient.h"

tests/TestQProxyHandler.cpp

@@ -24,10 +24,10 @@
 #include <QObject>
 #include <QTest>
 
-#include <qhttpengine/qhttpserver.h>
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/server.h>
+#include <qhttpengine/socket.h>
 #include <qhttpengine/qobjecthandler.h>
-#include <qhttpengine/qproxyhandler.h>
+#include <qhttpengine/proxyhandler.h>
 
 #include "common/qsimplehttpclient.h"
 #include "common/qsocketpair.h"

tests/common/qsimplehttpclient.h

@@ -27,8 +27,8 @@
 #include <QObject>
 #include <QTcpSocket>
 
-#include <qhttpengine/qhttpparser.h>
-#include <qhttpengine/qhttpsocket.h>
+#include <qhttpengine/parser.h>
+#include <qhttpengine/socket.h>
 
 /**
  * @brief Simple HTTP client for testing purposes