summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocketcorsauthenticator.cpp
diff options
context:
space:
mode:
authorKurt Pattyn <pattyn.kurt@gmail.com>2013-12-07 12:54:09 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-10 11:46:11 +0100
commit7d35f5c6b7b8b187388523674b4a95585f369d78 (patch)
tree9c56fc7bc7eddc0da37e0d144e054eef288eb1e2 /src/websockets/qwebsocketcorsauthenticator.cpp
parent7c8d645c4759f7290fd31fe439abf0a99aac9161 (diff)
downloadqtwebsockets-7d35f5c6b7b8b187388523674b4a95585f369d78.tar.gz
Cleanup code to comply with Qt style
- Correct placement of curly braces - Remove commented-out code - Remove superfluous qDebug statements - Add missing QT_BEGIN_NAMESPACE declarations - Add move semantics - Add cleanup handling to QWebSocketServerPrivate - Add error handling to handshake response, QWebSocketServerPrivate, QWebSocketServer, dataprocessor Change-Id: I0690dc2c444fd6fc0db974d1459bf41bd8c31d40 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets/qwebsocketcorsauthenticator.cpp')
-rw-r--r--src/websockets/qwebsocketcorsauthenticator.cpp24
1 files changed, 20 insertions, 4 deletions
diff --git a/src/websockets/qwebsocketcorsauthenticator.cpp b/src/websockets/qwebsocketcorsauthenticator.cpp
index c2117c6..f43447f 100644
--- a/src/websockets/qwebsocketcorsauthenticator.cpp
+++ b/src/websockets/qwebsocketcorsauthenticator.cpp
@@ -93,10 +93,6 @@ QWebSocketCorsAuthenticator::QWebSocketCorsAuthenticator(const QString &origin)
*/
QWebSocketCorsAuthenticator::~QWebSocketCorsAuthenticator()
{
- if (d_ptr)
- {
- delete d_ptr;
- }
}
/*!
@@ -121,6 +117,26 @@ QWebSocketCorsAuthenticator &QWebSocketCorsAuthenticator::operator =(const QWebS
return *this;
}
+#ifdef Q_COMPILER_RVALUE_REFS
+QWebSocketCorsAuthenticator::QWebSocketCorsAuthenticator(QWebSocketCorsAuthenticator &&other) :
+ d_ptr(other.d_ptr.take())
+{}
+
+QWebSocketCorsAuthenticator &QWebSocketCorsAuthenticator::operator =(QWebSocketCorsAuthenticator &&other)
+{
+ qSwap(d_ptr, other.d_ptr);
+ return *this;
+}
+
+#endif
+
+void QWebSocketCorsAuthenticator::swap(QWebSocketCorsAuthenticator &other)
+{
+ if (&other != this) {
+ qSwap(d_ptr, other.d_ptr);
+ }
+}
+
/*!
Returns the origin this autenticator is handling about.
*/