Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2v5.10.0-beta1

Change-Id: I54f0bcd46ffb496156e46d723275cdd29601e45c

1 files changed, 10 insertions, 11 deletions

diff --git a/examples/webchannel/shared/websocketclientwrapper.h b/examples/webchannel/shared/websocketclientwrapper.h
index f03b825..efb8b4b 100644
--- a/examples/webchannel/shared/websocketclientwrapper.h
+++ b/examples/webchannel/shared/websocketclientwrapper.h
@@ -48,33 +48,32 @@
 **
 ****************************************************************************/
 
-#ifndef WEBSOCKETTRANSPORTSERVER_H
-#define WEBSOCKETTRANSPORTSERVER_H
+#ifndef WEBSOCKETCLIENTWRAPPER_H
+#define WEBSOCKETCLIENTWRAPPER_H
 
 #include <QObject>
 
-QT_BEGIN_NAMESPACE
+class WebSocketTransport;
 
+QT_BEGIN_NAMESPACE
 class QWebSocketServer;
-class WebSocketTransport;
+QT_END_NAMESPACE
 
 class WebSocketClientWrapper : public QObject
 {
     Q_OBJECT
 
 public:
-    WebSocketClientWrapper(QWebSocketServer *server, QObject *parent = 0);
+    WebSocketClientWrapper(QWebSocketServer *server, QObject *parent = nullptr);
 
-Q_SIGNALS:
-    void clientConnected(WebSocketTransport* client);
+signals:
+    void clientConnected(WebSocketTransport *client);
 
-private Q_SLOTS:
+private slots:
     void handleNewConnection();
 
 private:
     QWebSocketServer *m_server;
 };
 
-QT_END_NAMESPACE
-
-#endif // WEBSOCKETTRANSPORTSERVER_H
+#endif // WEBSOCKETCLIENTWRAPPER_H