From: Kurt Pattyn <pattyn.kurt@gmail.com>
Date: Sat, 18 Jan 2014 21:14:39 +0000 (+0100)
Subject: Move currentVersion method to private namespace
X-Git-Tag: v5.3.0-alpha1~63
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab0704e1559c316e65b4bce4e1ab913cdee4dfa2;p=contrib%2Fqtwebsockets.git

Move currentVersion method to private namespace

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

diff --git a/src/websockets/qwebsockethandshakeresponse.cpp b/src/websockets/qwebsockethandshakeresponse.cpp
index 3700b21..cc1844d 100644
--- a/src/websockets/qwebsockethandshakeresponse.cpp
+++ b/src/websockets/qwebsockethandshakeresponse.cpp
@@ -42,6 +42,7 @@
 #include "qwebsockethandshakeresponse_p.h"
 #include "qwebsockethandshakerequest_p.h"
 #include "qwebsocketprotocol.h"
+#include "qwebsocketprotocol_p.h"
 
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
diff --git a/src/websockets/qwebsocketprotocol.h b/src/websockets/qwebsocketprotocol.h
index c058937..1affc76 100644
--- a/src/websockets/qwebsocketprotocol.h
+++ b/src/websockets/qwebsocketprotocol.h
@@ -84,8 +84,6 @@ enum CloseCode
     CloseCodeTlsHandshakeFailed     = 1015
 };
 
-inline Version currentVersion() { return VersionLatest; }
-
 }	//end namespace QWebSocketProtocol
 
 QT_END_NAMESPACE
diff --git a/src/websockets/qwebsocketprotocol_p.h b/src/websockets/qwebsocketprotocol_p.h
index e2c883a..4ce51b5 100644
--- a/src/websockets/qwebsocketprotocol_p.h
+++ b/src/websockets/qwebsocketprotocol_p.h
@@ -86,6 +86,8 @@ inline bool isCloseCodeValid(int closeCode)
             ((closeCode >= 3000) || (closeCode < 1012));
 }
 
+inline Version currentVersion() { return VersionLatest; }
+
 void Q_AUTOTEST_EXPORT mask(QByteArray *payload, quint32 maskingKey);
 void Q_AUTOTEST_EXPORT mask(char *payload, quint64 size, quint32 maskingKey);
 }	//end namespace QWebSocketProtocol