diff options
| -rw-r--r-- | src/websockets/qwebsocket.h | 4 | ||||
| -rw-r--r-- | src/websockets/qwebsocketcorsauthenticator.h | 4 | ||||
| -rw-r--r-- | src/websockets/qwebsocketframe_p.cpp | 1 | ||||
| -rw-r--r-- | src/websockets/qwebsocketserver.h | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h index b03820c..1087878 100644 --- a/src/websockets/qwebsocket.h +++ b/src/websockets/qwebsocket.h @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <QNetworkProxy> #endif -#include "qwebsockets_global.h" -#include "qwebsocketprotocol.h" +#include "QtWebSockets/qwebsockets_global.h" +#include "QtWebSockets/qwebsocketprotocol.h" QT_BEGIN_NAMESPACE diff --git a/src/websockets/qwebsocketcorsauthenticator.h b/src/websockets/qwebsocketcorsauthenticator.h index cd9d60c..b5d7a22 100644 --- a/src/websockets/qwebsocketcorsauthenticator.h +++ b/src/websockets/qwebsocketcorsauthenticator.h @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #ifndef QWEBSOCKETCORSAUTHENTICATOR_H #define QWEBSOCKETCORSAUTHENTICATOR_H -#include "qwebsockets_global.h" +#include "QtWebSockets/qwebsockets_global.h" QT_BEGIN_NAMESPACE @@ -45,4 +45,6 @@ private: QWebSocketCorsAuthenticatorPrivate * const d_ptr; }; +QT_END_NAMESPACE + #endif // QWEBSOCKETCORSAUTHENTICATOR_H diff --git a/src/websockets/qwebsocketframe_p.cpp b/src/websockets/qwebsocketframe_p.cpp index b4d61e7..7a26296 100644 --- a/src/websockets/qwebsocketframe_p.cpp +++ b/src/websockets/qwebsocketframe_p.cpp @@ -219,6 +219,7 @@ QWebSocketFrame QWebSocketFrame::readFrame(QIODevice *pIoDevice) qint64 bytesRead = 0; QWebSocketFrame frame; quint64 dataWaitSize = 0; + Q_UNUSED(dataWaitSize); // value is used in MACRO, Q_UNUSED to avoid compiler warnings ProcessingState processingState = PS_READ_HEADER; ProcessingState returnState = PS_READ_HEADER; bool hasMask = false; diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h index 99d61ad..0b2842c 100644 --- a/src/websockets/qwebsocketserver.h +++ b/src/websockets/qwebsocketserver.h @@ -23,8 +23,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <QObject> #include <QString> #include <QHostAddress> -#include "qwebsockets_global.h" -#include "qwebsocketprotocol.h" + +#include "QtWebSockets/qwebsockets_global.h" +#include "QtWebSockets/qwebsocketprotocol.h" QT_BEGIN_NAMESPACE |