From 491333701ef4cfe25a25007d2d88aa6361ed2304 Mon Sep 17 00:00:00 2001 From: Kurt Pattyn Date: Sat, 2 Nov 2013 10:53:25 +0100 Subject: [PATCH] Use QT namespace and forward declarations Change-Id: I67a0ee96f2e21ed441bb10f55c6bf8180245846b Reviewed-by: Kurt Pattyn --- examples/echoclient/echoclient.cpp | 2 ++ examples/echoclient/echoclient.h | 2 ++ examples/echoserver/echoserver.cpp | 2 ++ examples/echoserver/echoserver.h | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/examples/echoclient/echoclient.cpp b/examples/echoclient/echoclient.cpp index 2fc9f73..e487ed6 100644 --- a/examples/echoclient/echoclient.cpp +++ b/examples/echoclient/echoclient.cpp @@ -41,6 +41,8 @@ #include "echoclient.h" #include +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 --- a/examples/echoclient/echoclient.h +++ b/examples/echoclient/echoclient.h @@ -44,6 +44,8 @@ #include #include +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 --- a/examples/echoserver/echoserver.cpp +++ b/examples/echoserver/echoserver.cpp @@ -43,6 +43,8 @@ #include "qwebsocket.h" #include +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 --- a/examples/echoserver/echoserver.h +++ b/examples/echoserver/echoserver.h @@ -45,8 +45,8 @@ #include #include -class QWebSocketServer; -class QWebSocket; +QT_FORWARD_DECLARE_CLASS(QWebSocketServer); +QT_FORWARD_DECLARE_CLASS(QWebSocket); class EchoServer : public QObject { -- 2.7.4