diff --git a/interface/src/SecondaryCamera.cpp b/interface/src/SecondaryCamera.cpp index db51cf99c8..b9a767f700 100644 --- a/interface/src/SecondaryCamera.cpp +++ b/interface/src/SecondaryCamera.cpp @@ -9,11 +9,13 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#include "Application.h" #include "SecondaryCamera.h" -#include -#include + #include +#include +#include + +#include "Application.h" using RenderArgsPointer = std::shared_ptr; diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp index fa4fd39ca8..12230e5e1d 100644 --- a/libraries/embedded-webserver/src/HTTPConnection.cpp +++ b/libraries/embedded-webserver/src/HTTPConnection.cpp @@ -29,7 +29,7 @@ const char* HTTPConnection::StatusCode404 = "404 Not Found"; const char* HTTPConnection::StatusCode500 = "500 Internal server error"; const char* HTTPConnection::DefaultContentType = "text/plain; charset=ISO-8859-1"; -HTTPConnection::HTTPConnection (QTcpSocket* socket, HTTPManager* parentManager) : +HTTPConnection::HTTPConnection(QTcpSocket* socket, HTTPManager* parentManager) : QObject(parentManager), _parentManager(parentManager), _socket(socket), diff --git a/libraries/embedded-webserver/src/HTTPConnection.h b/libraries/embedded-webserver/src/HTTPConnection.h index 31ffbc9641..44a523423a 100644 --- a/libraries/embedded-webserver/src/HTTPConnection.h +++ b/libraries/embedded-webserver/src/HTTPConnection.h @@ -58,51 +58,51 @@ public: enum ReasonCode { NoReason = 0, NormalClosure = 1000, GoingAway = 1001 }; /// Initializes the connection. - HTTPConnection (QTcpSocket* socket, HTTPManager* parentManager); + HTTPConnection(QTcpSocket* socket, HTTPManager* parentManager); /// Destroys the connection. - virtual ~HTTPConnection (); + virtual ~HTTPConnection(); /// Returns a pointer to the underlying socket, to which WebSocket message bodies should be written. - QTcpSocket* socket () const { return _socket; } + QTcpSocket* socket() const { return _socket; } /// Returns the request operation. - QNetworkAccessManager::Operation requestOperation () const { return _requestOperation; } + QNetworkAccessManager::Operation requestOperation() const { return _requestOperation; } /// Returns a reference to the request URL. - const QUrl& requestUrl () const { return _requestUrl; } + const QUrl& requestUrl() const { return _requestUrl; } /// Returns a copy of the request header value. If it does not exist, it will return a default constructed QByteArray. QByteArray requestHeader(const QString& key) const { return _requestHeaders.value(key.toLower().toLocal8Bit()); } /// Returns a reference to the request content. - const QByteArray& requestContent () const { return _requestContent; } + const QByteArray& requestContent() const { return _requestContent; } /// Parses the request content as form data, returning a list of header/content pairs. - QList parseFormData () const; + QList parseFormData() const; /// Parses the request content as a url encoded form, returning a hash of key/value pairs. /// Duplicate keys are not supported. QHash parseUrlEncodedForm(); /// Sends a response and closes the connection. - void respond (const char* code, const QByteArray& content = QByteArray(), + void respond(const char* code, const QByteArray& content = QByteArray(), const char* contentType = DefaultContentType, const Headers& headers = Headers()); - void respond (const char* code, std::unique_ptr device, + void respond(const char* code, std::unique_ptr device, const char* contentType = DefaultContentType, const Headers& headers = Headers()); protected slots: /// Reads the request line. - void readRequest (); + void readRequest(); /// Reads the headers. - void readHeaders (); + void readHeaders(); /// Reads the content. - void readContent (); + void readContent(); protected: void respondWithStatusAndHeaders(const char* code, const char* contentType, const Headers& headers, qint64 size);