Move metatype declaration inside namespace

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

diff --git a/tests/auto/dataprocessor/tst_dataprocessor.cpp b/tests/auto/dataprocessor/tst_dataprocessor.cpp
index fb9313b..8a2930f 100644 (file)
--- a/tests/auto/dataprocessor/tst_dataprocessor.cpp
+++ b/tests/auto/dataprocessor/tst_dataprocessor.cpp
@@ -47,9 +47,6 @@
 
 #include "private/qwebsocketdataprocessor_p.h"
 
-Q_DECLARE_METATYPE(QWebSocketProtocol::CloseCode)
-Q_DECLARE_METATYPE(QWebSocketProtocol::OpCode)
-
 const quint8 FIN = 0x80;
 const quint8 RSV1 = 0x40;
 const quint8 RSV2 = 0x30;
@@ -58,6 +55,9 @@ const quint8 MASK = 0x80;
 
 QT_USE_NAMESPACE
 
+Q_DECLARE_METATYPE(QWebSocketProtocol::CloseCode)
+Q_DECLARE_METATYPE(QWebSocketProtocol::OpCode)
+
 class tst_DataProcessor : public QObject
 {
     Q_OBJECT

diff --git a/tests/auto/websocketprotocol/tst_websocketprotocol.cpp b/tests/auto/websocketprotocol/tst_websocketprotocol.cpp
index fdf6516..e9e05e3 100644 (file)
--- a/tests/auto/websocketprotocol/tst_websocketprotocol.cpp
+++ b/tests/auto/websocketprotocol/tst_websocketprotocol.cpp
@@ -44,11 +44,11 @@
 
 #include "qwebsocketprotocol.h"
 
+QT_USE_NAMESPACE
+
 Q_DECLARE_METATYPE(QWebSocketProtocol::CloseCode)
 Q_DECLARE_METATYPE(QWebSocketProtocol::OpCode)
 
-QT_USE_NAMESPACE
-
 class tst_WebSocketProtocol : public QObject
 {
     Q_OBJECT