From e3e9a63cde6f566d8de0c00173c7f471c20351bf Mon Sep 17 00:00:00 2001 From: jniemann66 Date: Sat, 28 Apr 2018 11:15:20 +1000 Subject: [PATCH 1/2] fixed some compiler warnings when using -Wextra -Wall --- .gitignore | 1 + src/src/proxysocket.cpp | 1 + src/src/qiodevicecopier_p.h | 4 ++-- src/src/server.cpp | 4 ++-- src/src/socket.cpp | 2 ++ src/src/socket_p.h | 3 ++- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 02821b4..9c9b901 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +/CMakeLists.txt /CMakeLists.txt.user diff --git a/src/src/proxysocket.cpp b/src/src/proxysocket.cpp index cbcde7c..9232194 100644 --- a/src/src/proxysocket.cpp +++ b/src/src/proxysocket.cpp @@ -137,6 +137,7 @@ void ProxySocket::onUpstreamReadyRead() void ProxySocket::onUpstreamError(QAbstractSocket::SocketError socketError) { + Q_UNUSED(socketError); if (mHeadersParsed) { mDownstreamSocket->close(); } else { diff --git a/src/src/qiodevicecopier_p.h b/src/src/qiodevicecopier_p.h index 1212e81..e93fec2 100644 --- a/src/src/qiodevicecopier_p.h +++ b/src/src/qiodevicecopier_p.h @@ -36,6 +36,8 @@ class QIODeviceCopierPrivate : public QObject { Q_OBJECT + QIODeviceCopier *const q; + public: QIODeviceCopierPrivate(QIODeviceCopier *copier, QIODevice *srcDevice, QIODevice *destDevice); @@ -56,8 +58,6 @@ public Q_SLOTS: void nextBlock(); private: - - QIODeviceCopier *const q; }; } diff --git a/src/src/server.cpp b/src/src/server.cpp index e27593e..4ce0b2f 100644 --- a/src/src/server.cpp +++ b/src/src/server.cpp @@ -33,8 +33,8 @@ using namespace QHttpEngine; ServerPrivate::ServerPrivate(Server *httpServer) : QObject(httpServer), - q(httpServer), - handler(0) + handler(0), + q(httpServer) { } diff --git a/src/src/socket.cpp b/src/src/socket.cpp index 7fc7777..ba29fc7 100644 --- a/src/src/socket.cpp +++ b/src/src/socket.cpp @@ -116,6 +116,8 @@ void SocketPrivate::onReadyRead() case ReadFinished: readBuffer.clear(); break; + default: + break; } } diff --git a/src/src/socket_p.h b/src/src/socket_p.h index cb1d743..82c2928 100644 --- a/src/src/socket_p.h +++ b/src/src/socket_p.h @@ -34,6 +34,8 @@ class SocketPrivate : public QObject { Q_OBJECT + Socket*const q; + public: SocketPrivate(Socket *httpSocket, QTcpSocket *tcpSocket); @@ -80,7 +82,6 @@ private Q_SLOTS: bool readHeaders(); void readData(); - Socket*const q; }; } From 9892da6e6be2725750b7797cec855767818fe17c Mon Sep 17 00:00:00 2001 From: jniemann66 Date: Sat, 28 Apr 2018 11:26:49 +1000 Subject: [PATCH 2/2] reverted .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9c9b901..02821b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/CMakeLists.txt /CMakeLists.txt.user