diff options
Diffstat (limited to 'examples/webchannel/shared')
4 files changed, 5 insertions, 15 deletions
diff --git a/examples/webchannel/shared/websocketclientwrapper.cpp b/examples/webchannel/shared/websocketclientwrapper.cpp index 3743bdd..a69e56a 100644 --- a/examples/webchannel/shared/websocketclientwrapper.cpp +++ b/examples/webchannel/shared/websocketclientwrapper.cpp @@ -61,8 +61,6 @@ published objects. */ -QT_BEGIN_NAMESPACE - /*! Construct the client wrapper with the given parent. @@ -84,5 +82,3 @@ void WebSocketClientWrapper::handleNewConnection() { emit clientConnected(new WebSocketTransport(m_server->nextPendingConnection())); } - -QT_END_NAMESPACE diff --git a/examples/webchannel/shared/websocketclientwrapper.h b/examples/webchannel/shared/websocketclientwrapper.h index f03b825..9c8184c 100644 --- a/examples/webchannel/shared/websocketclientwrapper.h +++ b/examples/webchannel/shared/websocketclientwrapper.h @@ -53,10 +53,11 @@ #include <QObject> -QT_BEGIN_NAMESPACE +class WebSocketTransport; +QT_BEGIN_NAMESPACE class QWebSocketServer; -class WebSocketTransport; +QT_END_NAMESPACE class WebSocketClientWrapper : public QObject { @@ -75,6 +76,4 @@ private: QWebSocketServer *m_server; }; -QT_END_NAMESPACE - #endif // WEBSOCKETTRANSPORTSERVER_H diff --git a/examples/webchannel/shared/websockettransport.cpp b/examples/webchannel/shared/websockettransport.cpp index a65bc2d..4dbec39 100644 --- a/examples/webchannel/shared/websockettransport.cpp +++ b/examples/webchannel/shared/websockettransport.cpp @@ -64,8 +64,6 @@ be send over the QWebSocket to the remote client. */ -QT_BEGIN_NAMESPACE - /*! Construct the transport object and wrap the given socket. @@ -115,5 +113,3 @@ void WebSocketTransport::textMessageReceived(const QString &messageData) } emit messageReceived(message.object(), this); } - -QT_END_NAMESPACE diff --git a/examples/webchannel/shared/websockettransport.h b/examples/webchannel/shared/websockettransport.h index 44cb92e..7158aa5 100644 --- a/examples/webchannel/shared/websockettransport.h +++ b/examples/webchannel/shared/websockettransport.h @@ -54,8 +54,9 @@ #include <QtWebChannel/QWebChannelAbstractTransport> QT_BEGIN_NAMESPACE - class QWebSocket; +QT_END_NAMESPACE + class WebSocketTransport : public QWebChannelAbstractTransport { Q_OBJECT @@ -72,6 +73,4 @@ private: QWebSocket *m_socket; }; -QT_END_NAMESPACE - #endif // WEBSOCKETTRANSPORT_H |