Replace delete loop with qDeleteAll
authorKurt Pattyn <pattyn.kurt@gmail.com>
Mon, 3 Feb 2014 00:34:46 +0000 (01:34 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 5 Feb 2014 13:03:12 +0000 (14:03 +0100)
Change-Id: If63acc08307c0a411072a2a37ac52661e7e02594
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
examples/echoserver/echoserver.cpp
examples/simplechat/chatserver.cpp
examples/sslechoserver/sslechoserver.cpp

index fdfb087..b802f95 100644 (file)
@@ -64,10 +64,7 @@ EchoServer::EchoServer(quint16 port, QObject *parent) :
 EchoServer::~EchoServer()
 {
     m_pWebSocketServer->close();
-    while (!m_clients.isEmpty()) {
-        QWebSocket *pWebSocket = m_clients.takeFirst();
-        delete pWebSocket;
-    }
+    qDeleteAll(m_clients.begin(), m_clients.end());
 }
 
 //! [onNewConnection]
index 0ca4b47..e341a76 100644 (file)
@@ -65,10 +65,7 @@ ChatServer::ChatServer(quint16 port, QObject *parent) :
 ChatServer::~ChatServer()
 {
     m_pWebSocketServer->close();
-    while (!m_clients.isEmpty()) {
-        QWebSocket *pWebSocket = m_clients.takeFirst();
-        delete pWebSocket;
-    }
+    qDeleteAll(m_clients.begin(), m_clients.end());
 }
 //! [constructor]
 
index cbe17f0..9614c5b 100644 (file)
@@ -85,10 +85,7 @@ SslEchoServer::SslEchoServer(quint16 port, QObject *parent) :
 SslEchoServer::~SslEchoServer()
 {
     m_pWebSocketServer->close();
-    while (!m_clients.isEmpty()) {
-        QWebSocket *pWebSocket = m_clients.takeFirst();
-        delete pWebSocket;
-    }
+    qDeleteAll(m_clients.begin(), m_clients.end());
 }
 
 //! [onNewConnection]