Completely reorganize the library, moving up to Qt 5.4, using C++11 where reasonably possible, and reorganizing the includes.

This commit is contained in:
Nathan Osman
2016-10-06 21:50:45 -07:00
parent 7930ef4a50
commit 7c460edb57
48 changed files with 312 additions and 247 deletions

View File

@@ -30,14 +30,12 @@
#include <QPair>
#include <QUrl>
#include <QUrlQuery>
#include <QVariantMap>
#include "QHttpEngine/qobjecthandler.h"
#include <QHttpEngine/QHttpSocket>
#include <QHttpEngine/QObjectHandler>
#include "qobjecthandler_p.h"
const QString MethodGET = "GET";
const QString MethodPOST = "POST";
QObjectHandlerPrivate::QObjectHandlerPrivate(QObjectHandler *handler)
: QObject(handler),
q(handler)
@@ -52,7 +50,7 @@ void QObjectHandlerPrivate::invokeSlot(QHttpSocket *socket, int index, const QVa
statusCode = QHttpSocket::OK;
// If this is a POST request, then decode the request body
if (socket->method() == MethodPOST) {
if (socket->method() == QHttpSocket::POST) {
// Attempt to decode the JSON from the socket
QJsonParseError error;
@@ -111,12 +109,12 @@ void QObjectHandler::process(QHttpSocket *socket, const QString &path)
QUrl url(path);
QVariantMap query = d->convertQueryString(url.query());
QString slotName = QString("%1_%2")
.arg(QString(socket->method().toLower()))
.arg(socket->method() == QHttpSocket::GET ? "get" : "post")
.arg(url.path());
// Determine the parameters the slot should have based on the method
QString parameters;
if (socket->method() == MethodGET) {
if (socket->method() == QHttpSocket::GET) {
parameters = "QVariantMap";
} else {
parameters = "QVariantMap,QVariantMap";