Added QT_BEGIN_NAMESPACE and QT_END_NAMESPACE to files

Documented internal classes and methods as \private

diff --git a/src/dataprocessor_p.cpp b/src/dataprocessor_p.cpp
index a760787..d0b22f2 100644 (file)
--- a/src/dataprocessor_p.cpp
+++ b/src/dataprocessor_p.cpp
@@ -6,9 +6,14 @@
 #include <QTextCodec>
 #include <QTextDecoder>
 
+QT_BEGIN_NAMESPACE
+
 const quint64 MAX_FRAME_SIZE_IN_BYTES = INT_MAX - 1;
 const quint64 MAX_MESSAGE_SIZE_IN_BYTES = INT_MAX - 1;
 
+/*!
+       \internal
+ */
 class Frame
 {
 public:
@@ -67,6 +72,9 @@ private:
        bool checkValidity();
 };
 
+/*!
+       \internal
+ */
 Frame::Frame() :
        m_closeCode(QWebSocketProtocol::CC_NORMAL),
        m_closeReason(),
@@ -82,6 +90,9 @@ Frame::Frame() :
 {
 }
 
+/*!
+       \internal
+ */
 Frame::Frame(const Frame &other) :
        m_closeCode(other.m_closeCode),
        m_closeReason(other.m_closeReason),
@@ -97,6 +108,9 @@ Frame::Frame(const Frame &other) :
 {
 }
 
+/*!
+       \internal
+ */
 const Frame &Frame::operator =(const Frame &other)
 {
        m_closeCode = other.m_closeCode;
@@ -114,71 +128,113 @@ const Frame &Frame::operator =(const Frame &other)
        return *this;
 }
 
+/*!
+       \internal
+ */
 QWebSocketProtocol::CloseCode Frame::getCloseCode() const
 {
        return m_closeCode;
 }
 
+/*!
+       \internal
+ */
 QString Frame::getCloseReason() const
 {
        return m_closeReason;
 }
 
+/*!
+       \internal
+ */
 bool Frame::isFinalFrame() const
 {
        return m_isFinalFrame;
 }
 
+/*!
+       \internal
+ */
 bool Frame::isControlFrame() const
 {
        return (m_opCode & 0x08) == 0x08;
 }
 
+/*!
+       \internal
+ */
 bool Frame::isDataFrame() const
 {
        return !isControlFrame();
 }
 
+/*!
+       \internal
+ */
 bool Frame::isContinuationFrame() const
 {
        return isDataFrame() && (m_opCode == QWebSocketProtocol::OC_CONTINUE);
 }
 
+/*!
+       \internal
+ */
 bool Frame::hasMask() const
 {
        return m_mask != 0;
 }
 
+/*!
+       \internal
+ */
 quint32 Frame::getMask() const
 {
        return m_mask;
 }
 
+/*!
+       \internal
+ */
 int Frame::getRsv1() const
 {
        return m_rsv1;
 }
 
+/*!
+       \internal
+ */
 int Frame::getRsv2() const
 {
        return m_rsv2;
 }
 
+/*!
+       \internal
+ */
 int Frame::getRsv3() const
 {
        return m_rsv3;
 }
 
+/*!
+       \internal
+ */
 QWebSocketProtocol::OpCode Frame::getOpCode() const
 {
        return m_opCode;
 }
 
+/*!
+       \internal
+ */
 QByteArray Frame::getPayload() const
 {
        return m_payload;
 }
 
+/*!
+       \internal
+ */
 void Frame::clear()
 {
        m_closeCode = QWebSocketProtocol::CC_NORMAL;
@@ -194,6 +250,9 @@ void Frame::clear()
        m_isValid = false;
 }
 
+/*!
+       \internal
+ */
 bool Frame::isValid() const
 {
        return m_isValid;
@@ -201,6 +260,9 @@ bool Frame::isValid() const
 
 #define WAIT_FOR_MORE_DATA(dataSizeInBytes)  { returnState = processingState; processingState = PS_WAIT_FOR_MORE_DATA; dataWaitSize = dataSizeInBytes; }
 
+/*!
+       \internal
+ */
 Frame Frame::readFrame(QTcpSocket *pSocket)
 {
        bool isDone = false;
@@ -382,6 +444,9 @@ Frame Frame::readFrame(QTcpSocket *pSocket)
        return frame;
 }
 
+/*!
+       \internal
+ */
 void Frame::setError(QWebSocketProtocol::CloseCode code, QString closeReason)
 {
        clear();
@@ -390,6 +455,9 @@ void Frame::setError(QWebSocketProtocol::CloseCode code, QString closeReason)
        m_isValid = false;
 }
 
+/*!
+       \internal
+ */
 bool Frame::checkValidity()
 {
        if (!isValid())
@@ -425,6 +493,9 @@ bool Frame::checkValidity()
        return m_isValid;
 }
 
+/*!
+       \internal
+ */
 DataProcessor::DataProcessor(QObject *parent) :
        QObject(parent),
        m_processingState(PS_READ_HEADER),
@@ -443,6 +514,9 @@ DataProcessor::DataProcessor(QObject *parent) :
        clear();
 }
 
+/*!
+       \internal
+ */
 DataProcessor::~DataProcessor()
 {
        clear();
@@ -453,6 +527,9 @@ DataProcessor::~DataProcessor()
        }
 }
 
+/*!
+       \internal
+ */
 void DataProcessor::process(QTcpSocket *pSocket)
 {
        bool isDone = false;
@@ -540,6 +617,9 @@ void DataProcessor::process(QTcpSocket *pSocket)
        }
 }
 
+/*!
+       \internal
+ */
 void DataProcessor::clear()
 {
        m_processingState = PS_READ_HEADER;
@@ -564,3 +644,5 @@ void DataProcessor::clear()
                m_pConverterState = new QTextCodec::ConverterState(QTextCodec::ConvertInvalidToNull | QTextCodec::IgnoreHeader);
        }
 }
+
+QT_END_NAMESPACE

diff --git a/src/dataprocessor_p.h b/src/dataprocessor_p.h
index c0840b3..77b6209 100644 (file)
--- a/src/dataprocessor_p.h
+++ b/src/dataprocessor_p.h
@@ -18,6 +18,8 @@
 #include <QTextCodec>
 #include "qwebsocketprotocol.h"
 
+QT_BEGIN_NAMESPACE
+
 class QTcpSocket;
 
 /**
@@ -68,4 +70,6 @@ private:
        QTextCodec *m_pTextCodec;
 };
 
+QT_END_NAMESPACE
+
 #endif // DATAPROCESSOR_P_H

diff --git a/src/handshakerequest_p.cpp b/src/handshakerequest_p.cpp
index c2b2403..7f02fde 100644 (file)
--- a/src/handshakerequest_p.cpp
+++ b/src/handshakerequest_p.cpp
@@ -7,6 +7,11 @@
 #include <QStringList>
 #include "qwebsocketprotocol.h"
 
+QT_BEGIN_NAMESPACE
+
+/*!
+       \internal
+ */
 HandshakeRequest::HandshakeRequest(int port, bool isSecure) :
        m_port(port),
        m_isSecure(isSecure),
@@ -21,10 +26,16 @@ HandshakeRequest::HandshakeRequest(int port, bool isSecure) :
 {
 }
 
+/*!
+       \internal
+ */
 HandshakeRequest::~HandshakeRequest()
 {
 }
 
+/*!
+       \internal
+ */
 void HandshakeRequest::clear()
 {
        m_port = -1;
@@ -39,66 +50,105 @@ void HandshakeRequest::clear()
        m_requestUrl.clear();
 }
 
+/*!
+       \internal
+ */
 int HandshakeRequest::getPort() const
 {
        return m_requestUrl.port(m_port);
 }
 
+/*!
+       \internal
+ */
 bool HandshakeRequest::isSecure() const
 {
        return m_isSecure;
 }
 
+/*!
+       \internal
+ */
 bool HandshakeRequest::isValid() const
 {
        return m_isValid;
 }
 
+/*!
+       \internal
+ */
 QMap<QString, QString> HandshakeRequest::getHeaders() const
 {
        return m_headers;
 }
 
+/*!
+       \internal
+ */
 QList<QWebSocketProtocol::Version> HandshakeRequest::getVersions() const
 {
        return m_versions;
 }
 
+/*!
+       \internal
+ */
 QString HandshakeRequest::getResourceName() const
 {
        return m_requestUrl.path();
 }
 
+/*!
+       \internal
+ */
 QString HandshakeRequest::getKey() const
 {
        return m_key;
 }
 
+/*!
+       \internal
+ */
 QString HandshakeRequest::getHost() const
 {
        return m_requestUrl.host();
 }
 
+/*!
+       \internal
+ */
 QString HandshakeRequest::getOrigin() const
 {
        return m_origin;
 }
 
+/*!
+       \internal
+ */
 QList<QString> HandshakeRequest::getProtocols() const
 {
        return m_protocols;
 }
 
+/*!
+       \internal
+ */
 QList<QString> HandshakeRequest::getExtensions() const
 {
        return m_extensions;
 }
 
+/*!
+       \internal
+ */
 QUrl HandshakeRequest::getRequestUrl() const
 {
        return m_requestUrl;
 }
 
+/*!
+       \internal
+ */
 QTextStream &HandshakeRequest::readFromStream(QTextStream &textStream)
 {
        m_isValid = false;
@@ -189,7 +239,12 @@ QTextStream &HandshakeRequest::readFromStream(QTextStream &textStream)
        return textStream;
 }
 
+/*!
+       \internal
+ */
 QTextStream &operator >>(QTextStream &stream, HandshakeRequest &request)
 {
        return request.readFromStream(stream);
 }
+
+QT_END_NAMESPACE

diff --git a/src/handshakerequest_p.h b/src/handshakerequest_p.h
index 428835e..59613f5 100644 (file)
--- a/src/handshakerequest_p.h
+++ b/src/handshakerequest_p.h
@@ -19,6 +19,8 @@
 
 #include "qwebsocketprotocol.h"
 
+QT_BEGIN_NAMESPACE
+
 class QTextStream;
 
 class HandshakeRequest
@@ -61,4 +63,6 @@ private:
 
 QTextStream &operator >>(QTextStream &stream, HandshakeRequest &request);
 
+QT_END_NAMESPACE
+
 #endif // HANDSHAKEREQUEST_P_H

diff --git a/src/handshakeresponse_p.cpp b/src/handshakeresponse_p.cpp
index ca7bd0d..82537fe 100644 (file)
--- a/src/handshakeresponse_p.cpp
+++ b/src/handshakeresponse_p.cpp
@@ -9,6 +9,11 @@
 #include <QSet>
 #include <QList>
 
+QT_BEGIN_NAMESPACE
+
+/*!
+       \internal
+ */
 HandshakeResponse::HandshakeResponse(const HandshakeRequest &request,
                                                                         const QString &serverName,
                                                                         bool isOriginAllowed,
@@ -26,25 +31,40 @@ HandshakeResponse::HandshakeResponse(const HandshakeRequest &request,
        m_isValid = true;
 }
 
+/*!
+       \internal
+ */
 HandshakeResponse::~HandshakeResponse()
 {
 }
 
+/*!
+       \internal
+ */
 bool HandshakeResponse::isValid() const
 {
        return m_isValid;
 }
 
+/*!
+       \internal
+ */
 bool HandshakeResponse::canUpgrade() const
 {
        return m_isValid && m_canUpgrade;
 }
 
+/*!
+       \internal
+ */
 QString HandshakeResponse::getAcceptedProtocol() const
 {
        return m_acceptedProtocol;
 }
 
+/*!
+       \internal
+ */
 QString HandshakeResponse::calculateAcceptKey(const QString &key) const
 {
        QString tmpKey = key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";  //the UID comes from RFC6455
@@ -52,6 +72,9 @@ QString HandshakeResponse::calculateAcceptKey(const QString &key) const
        return QString(hash.toBase64());
 }
 
+/*!
+       \internal
+ */
 QString HandshakeResponse::getHandshakeResponse(const HandshakeRequest &request,
                                                                                                const QString &serverName,
                                                                                                bool isOriginAllowed,
@@ -135,6 +158,9 @@ QString HandshakeResponse::getHandshakeResponse(const HandshakeRequest &request,
        return response.join("\r\n");
 }
 
+/*!
+       \internal
+ */
 QTextStream &HandshakeResponse::writeToStream(QTextStream &textStream) const
 {
        if (!m_response.isEmpty())
@@ -148,17 +174,28 @@ QTextStream &HandshakeResponse::writeToStream(QTextStream &textStream) const
        return textStream;
 }
 
+/*!
+       \internal
+ */
 QTextStream &operator <<(QTextStream &stream, const HandshakeResponse &response)
 {
        return response.writeToStream(stream);
 }
 
+/*!
+       \internal
+ */
 QWebSocketProtocol::Version HandshakeResponse::getAcceptedVersion() const
 {
        return m_acceptedVersion;
 }
 
+/*!
+       \internal
+ */
 QString HandshakeResponse::getAcceptedExtension() const
 {
        return m_acceptedExtension;
 }
+
+QT_END_NAMESPACE

diff --git a/src/handshakeresponse_p.h b/src/handshakeresponse_p.h
index 29564fd..7e1d3c5 100644 (file)
--- a/src/handshakeresponse_p.h
+++ b/src/handshakeresponse_p.h
@@ -14,6 +14,8 @@
 #include <QObject>
 #include "qwebsocketprotocol.h"
 
+QT_BEGIN_NAMESPACE
+
 class HandshakeRequest;
 class QString;
 class QTextStream;
@@ -62,4 +64,6 @@ private:
        friend QTextStream &operator <<(QTextStream &stream, const HandshakeResponse &response);
 };
 
+QT_END_NAMESPACE
+
 #endif // HANDSHAKERESPONSE_P_H

diff --git a/src/qwebsocket.cpp b/src/qwebsocket.cpp
index 118bec9..7fab343 100644 (file)
--- a/src/qwebsocket.cpp
+++ b/src/qwebsocket.cpp
@@ -1,14 +1,3 @@
-#include "qwebsocket.h"
-#include "qwebsocket_p.h"
-#include <QUrl>
-#include <QTcpSocket>
-#include <QByteArray>
-#include <QHostAddress>
-
-#include <QDebug>
-
-#include <limits>
-
 /*!
        \class QWebSocket
        \brief The class QWebSocket implements a TCP socket that talks the websocket protocol.
@@ -151,6 +140,18 @@ not been filled in with new information when the signal returns.
 
   \sa ping()
   */
+#include "qwebsocket.h"
+#include "qwebsocket_p.h"
+#include <QUrl>
+#include <QTcpSocket>
+#include <QByteArray>
+#include <QHostAddress>
+
+#include <QDebug>
+
+#include <limits>
+
+QT_BEGIN_NAMESPACE
 
 const quint64 FRAME_SIZE_IN_BYTES = 512 * 512 * 2;     //maximum size of a frame when sending a message
 
@@ -499,3 +500,5 @@ bool QWebSocket::isValid()
 {
        return d_ptr->isValid();
 }
+
+QT_END_NAMESPACE

diff --git a/src/qwebsocket.h b/src/qwebsocket.h
index c912b3b..8556185 100644 (file)
--- a/src/qwebsocket.h
+++ b/src/qwebsocket.h
@@ -19,6 +19,8 @@
 #include "qwebsocketsglobal.h"
 #include "qwebsocketprotocol.h"
 
+QT_BEGIN_NAMESPACE
+
 class QTcpSocket;
 class QWebSocketPrivate;
 
@@ -90,4 +92,6 @@ private:
        friend class QWebSocketPrivate;
 };
 
+QT_END_NAMESPACE
+
 #endif // QWEBSOCKET_H

diff --git a/src/qwebsocket_p.cpp b/src/qwebsocket_p.cpp
index 2e0f184..dd1af0d 100644 (file)
--- a/src/qwebsocket_p.cpp
+++ b/src/qwebsocket_p.cpp
@@ -16,6 +16,8 @@
 
 #include <limits>
 
+QT_BEGIN_NAMESPACE
+
 const quint64 FRAME_SIZE_IN_BYTES = 512 * 512 * 2;     //maximum size of a frame when sending a message
 
 /*!
@@ -1153,3 +1155,5 @@ bool QWebSocketPrivate::isValid()
        }
        return valid;
 }
+
+QT_END_NAMESPACE

diff --git a/src/qwebsocket_p.h b/src/qwebsocket_p.h
index 188337b..d0feeba 100644 (file)
--- a/src/qwebsocket_p.h
+++ b/src/qwebsocket_p.h
@@ -30,6 +30,8 @@
 #include "qwebsocketprotocol.h"
 #include "dataprocessor_p.h"
 
+QT_BEGIN_NAMESPACE
+
 class HandshakeRequest;
 class HandshakeResponse;
 class QTcpSocket;
@@ -173,4 +175,6 @@ private:
        friend class QWebSocket;
 };
 
+QT_END_NAMESPACE
+
 #endif // QWEBSOCKET_H

diff --git a/src/qwebsocketprotocol.cpp b/src/qwebsocketprotocol.cpp
index 44694dc..c7b6e85 100644 (file)
--- a/src/qwebsocketprotocol.cpp
+++ b/src/qwebsocketprotocol.cpp
@@ -139,6 +139,8 @@
   \internal
 */
 
+QT_BEGIN_NAMESPACE
+
 /**
  * @brief Contains constants related to the WebSocket standard.
  */
@@ -216,3 +218,5 @@ namespace QWebSocketProtocol
                }
        }
 }      //end namespace WebSocketProtocol
+
+QT_END_NAMESPACE

diff --git a/src/qwebsocketprotocol.h b/src/qwebsocketprotocol.h
index a2f39f1..37755af 100644 (file)
--- a/src/qwebsocketprotocol.h
+++ b/src/qwebsocketprotocol.h
@@ -6,9 +6,12 @@
 #ifndef QWEBSOCKETPROTOCOL_H
 #define QWEBSOCKETPROTOCOL_H
 
+#include <qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
 class QString;
 class QByteArray;
-#include <qglobal.h>
 
 namespace QWebSocketProtocol
 {
@@ -86,4 +89,6 @@ namespace QWebSocketProtocol
 
 }      //end namespace QWebSocketProtocol
 
+QT_END_NAMESPACE
+
 #endif // QWEBSOCKETPROTOCOL_H

diff --git a/src/qwebsocketserver.cpp b/src/qwebsocketserver.cpp
index 1634185..cc7322c 100644 (file)
--- a/src/qwebsocketserver.cpp
+++ b/src/qwebsocketserver.cpp
@@ -1,11 +1,3 @@
-#include <QTcpServer>
-#include <QTcpSocket>
-#include <QNetworkProxy>
-#include "qwebsocketprotocol.h"
-#include "qwebsocket.h"
-#include "qwebsocketserver.h"
-#include "qwebsocketserver_p.h"
-
 /*!
        \class WebSocketServer
 
@@ -66,6 +58,16 @@
        \sa hasPendingConnections() and nextPendingConnection().
 */
 
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QNetworkProxy>
+#include "qwebsocketprotocol.h"
+#include "qwebsocket.h"
+#include "qwebsocketserver.h"
+#include "qwebsocketserver_p.h"
+
+QT_BEGIN_NAMESPACE
+
 /*!
        Constructs a new WebSocketServer.
 
@@ -306,3 +308,5 @@ bool QWebSocketServer::isOriginAllowed(const QString &origin) const
        Q_UNUSED(origin)
        return true;
 }
+
+QT_END_NAMESPACE

diff --git a/src/qwebsocketserver.h b/src/qwebsocketserver.h
index 05f93cf..21efe54 100644 (file)
--- a/src/qwebsocketserver.h
+++ b/src/qwebsocketserver.h
@@ -13,6 +13,8 @@
 #include "qwebsocketsglobal.h"
 #include "qwebsocketprotocol.h"
 
+QT_BEGIN_NAMESPACE
+
 class QWebSocketServerPrivate;
 class QWebSocket;
 
@@ -57,4 +59,6 @@ private:
        friend class QWebSocketServerPrivate;
 };
 
+QT_END_NAMESPACE
+
 #endif // QWEBSOCKETSERVER_H

diff --git a/src/qwebsocketserver_p.cpp b/src/qwebsocketserver_p.cpp
index 5836029..79e4ef1 100644 (file)
--- a/src/qwebsocketserver_p.cpp
+++ b/src/qwebsocketserver_p.cpp
@@ -9,6 +9,11 @@
 #include "qwebsocket.h"
 #include "qwebsocket_p.h"
 
+QT_BEGIN_NAMESPACE
+
+/*!
+       \internal
+ */
 QWebSocketServerPrivate::QWebSocketServerPrivate(const QString &serverName, QWebSocketServer * const pWebSocketServer, QObject *parent) :
        QObject(parent),
        q_ptr(pWebSocketServer),
@@ -21,6 +26,9 @@ QWebSocketServerPrivate::QWebSocketServerPrivate(const QString &serverName, QWeb
        connect(m_pTcpServer, SIGNAL(newConnection()), this, SLOT(onNewConnection()));
 }
 
+/*!
+       \internal
+ */
 QWebSocketServerPrivate::~QWebSocketServerPrivate()
 {
        while (!m_pendingConnections.isEmpty())
@@ -32,36 +40,57 @@ QWebSocketServerPrivate::~QWebSocketServerPrivate()
        m_pTcpServer->deleteLater();
 }
 
+/*!
+       \internal
+ */
 void QWebSocketServerPrivate::close()
 {
        m_pTcpServer->close();
 }
 
+/*!
+       \internal
+ */
 QString QWebSocketServerPrivate::errorString() const
 {
        return m_pTcpServer->errorString();
 }
 
+/*!
+       \internal
+ */
 bool QWebSocketServerPrivate::hasPendingConnections() const
 {
        return !m_pendingConnections.isEmpty();
 }
 
+/*!
+       \internal
+ */
 bool QWebSocketServerPrivate::isListening() const
 {
        return m_pTcpServer->isListening();
 }
 
+/*!
+       \internal
+ */
 bool QWebSocketServerPrivate::listen(const QHostAddress &address, quint16 port)
 {
        return m_pTcpServer->listen(address, port);
 }
 
+/*!
+       \internal
+ */
 int QWebSocketServerPrivate::maxPendingConnections() const
 {
        return m_pTcpServer->maxPendingConnections();
 }
 
+/*!
+       \internal
+ */
 void QWebSocketServerPrivate::addPendingConnection(QWebSocket *pWebSocket)
 {
        if (m_pendingConnections.size() < maxPendingConnections())
@@ -70,6 +99,9 @@ void QWebSocketServerPrivate::addPendingConnection(QWebSocket *pWebSocket)
        }
 }
 
+/*!
+       \internal
+ */
 QWebSocket *QWebSocketServerPrivate::nextPendingConnection()
 {
        QWebSocket *pWebSocket = 0;
@@ -85,21 +117,36 @@ QNetworkProxy QWebSocketServerPrivate::proxy() const
        return m_pTcpServer->proxy();
 }
 
+/*!
+       \internal
+ */
+/*!
+       \internal
+ */
 QHostAddress QWebSocketServerPrivate::serverAddress() const
 {
        return m_pTcpServer->serverAddress();
 }
 
+/*!
+       \internal
+ */
 QAbstractSocket::SocketError QWebSocketServerPrivate::serverError() const
 {
        return m_pTcpServer->serverError();
 }
 
+/*!
+       \internal
+ */
 quint16 QWebSocketServerPrivate::serverPort() const
 {
        return m_pTcpServer->serverPort();
 }
 
+/*!
+       \internal
+ */
 void QWebSocketServerPrivate::setMaxPendingConnections(int numConnections)
 {
        m_pTcpServer->setMaxPendingConnections(numConnections);
@@ -110,21 +157,33 @@ void QWebSocketServerPrivate::setProxy(const QNetworkProxy &networkProxy)
        m_pTcpServer->setProxy(networkProxy);
 }
 
+/*!
+       \internal
+ */
 bool QWebSocketServerPrivate::setSocketDescriptor(int socketDescriptor)
 {
        return m_pTcpServer->setSocketDescriptor(socketDescriptor);
 }
 
+/*!
+       \internal
+ */
 int QWebSocketServerPrivate::socketDescriptor() const
 {
        return m_pTcpServer->socketDescriptor();
 }
 
+/*!
+       \internal
+ */
 bool QWebSocketServerPrivate::waitForNewConnection(int msec, bool *timedOut)
 {
        return m_pTcpServer->waitForNewConnection(msec, timedOut);
 }
 
+/*!
+       \internal
+ */
 QList<QWebSocketProtocol::Version> QWebSocketServerPrivate::supportedVersions() const
 {
        QList<QWebSocketProtocol::Version> supportedVersions;
@@ -132,24 +191,36 @@ QList<QWebSocketProtocol::Version> QWebSocketServerPrivate::supportedVersions()
        return supportedVersions;
 }
 
+/*!
+       \internal
+ */
 QList<QString> QWebSocketServerPrivate::supportedProtocols() const
 {
        QList<QString> supportedProtocols;
        return supportedProtocols;      //no protocols are currently supported
 }
 
+/*!
+       \internal
+ */
 QList<QString> QWebSocketServerPrivate::supportedExtensions() const
 {
        QList<QString> supportedExtensions;
        return supportedExtensions;     //no extensions are currently supported
 }
 
+/*!
+       \internal
+ */
 void QWebSocketServerPrivate::onNewConnection()
 {
        QTcpSocket *pTcpSocket = m_pTcpServer->nextPendingConnection();
        connect(pTcpSocket, SIGNAL(readyRead()), this, SLOT(handshakeReceived()));
 }
 
+/*!
+       \internal
+ */
 void QWebSocketServerPrivate::onCloseConnection()
 {
        QTcpSocket *pTcpSocket = qobject_cast<QTcpSocket*>(sender());
@@ -159,6 +230,9 @@ void QWebSocketServerPrivate::onCloseConnection()
        }
 }
 
+/*!
+       \internal
+ */
 void QWebSocketServerPrivate::handshakeReceived()
 {
        QTcpSocket *pTcpSocket = qobject_cast<QTcpSocket*>(sender());
@@ -219,3 +293,5 @@ void QWebSocketServerPrivate::handshakeReceived()
                qDebug() << "WebSocketServerPrivate::handshakeReceived: Sender socket is NULL. This should not happen!!!";
        }
 }
+
+QT_END_NAMESPACE

diff --git a/src/qwebsocketserver_p.h b/src/qwebsocketserver_p.h
index 8834972..00a6c4e 100644 (file)
--- a/src/qwebsocketserver_p.h
+++ b/src/qwebsocketserver_p.h
@@ -23,6 +23,8 @@
 #include <QHostAddress>
 #include "qwebsocket.h"
 
+QT_BEGIN_NAMESPACE
+
 class QTcpServer;
 class QWebSocketServer;
 
@@ -73,4 +75,6 @@ private:
        void addPendingConnection(QWebSocket *pWebSocket);
 };
 
+QT_END_NAMESPACE
+
 #endif // QWEBSOCKETSERVER_P_H