Use QT namespace and forward declarations

Change-Id: I67a0ee96f2e21ed441bb10f55c6bf8180245846b
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>

diff --git a/examples/echoclient/echoclient.cpp b/examples/echoclient/echoclient.cpp
index 2fc9f73..e487ed6 100644 (file)
--- a/examples/echoclient/echoclient.cpp
+++ b/examples/echoclient/echoclient.cpp
@@ -41,6 +41,8 @@
 #include "echoclient.h"
 #include <QDebug>
 
+QT_USE_NAMESPACE
+
 //! [constructor]
 EchoClient::EchoClient(const QUrl &url, QObject *parent) :
     QObject(parent),

diff --git a/examples/echoclient/echoclient.h b/examples/echoclient/echoclient.h
index 841f430..3bc1162 100644 (file)
--- a/examples/echoclient/echoclient.h
+++ b/examples/echoclient/echoclient.h
@@ -44,6 +44,8 @@
 #include <QObject>
 #include <QtWebSockets/QWebSocket>
 
+QT_FORWARD_DECLARE_CLASS(QWebSocket);
+
 class EchoClient : public QObject
 {
     Q_OBJECT

diff --git a/examples/echoserver/echoserver.cpp b/examples/echoserver/echoserver.cpp
index f976762..78e99b9 100644 (file)
--- a/examples/echoserver/echoserver.cpp
+++ b/examples/echoserver/echoserver.cpp
@@ -43,6 +43,8 @@
 #include "qwebsocket.h"
 #include <QDebug>
 
+QT_USE_NAMESPACE
+
 //! [constructor]
 EchoServer::EchoServer(quint16 port, QObject *parent) :
     QObject(parent),

diff --git a/examples/echoserver/echoserver.h b/examples/echoserver/echoserver.h
index e2a31a9..bbfa9e0 100644 (file)
--- a/examples/echoserver/echoserver.h
+++ b/examples/echoserver/echoserver.h
@@ -45,8 +45,8 @@
 #include <QList>
 #include <QByteArray>
 
-class QWebSocketServer;
-class QWebSocket;
+QT_FORWARD_DECLARE_CLASS(QWebSocketServer);
+QT_FORWARD_DECLARE_CLASS(QWebSocket);
 
 class EchoServer : public QObject
 {