diff options
author | Kai Koehne <kai.koehne@qt.io> | 2017-08-28 13:28:23 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2017-08-29 09:36:38 +0000 |
commit | 046040e4b08972018fcb10ef882a35f7162cb38c (patch) | |
tree | 90a9853cff853e8019939f10dc4895d65e71d8f0 | |
parent | 351fed844a5d4c97d5d1510f1979d645adde338d (diff) | |
download | qtwebchannel-046040e4b08972018fcb10ef882a35f7162cb38c.tar.gz |
Examples: Use Qt 5 connect
Change-Id: I33aa6f8244770bf19b45f69cfc62a5469168418d
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
-rw-r--r-- | examples/webchannel/chatserver-cpp/chatserver.cpp | 4 | ||||
-rw-r--r-- | examples/webchannel/standalone/main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/webchannel/chatserver-cpp/chatserver.cpp b/examples/webchannel/chatserver-cpp/chatserver.cpp index fb25344..0678dc5 100644 --- a/examples/webchannel/chatserver-cpp/chatserver.cpp +++ b/examples/webchannel/chatserver-cpp/chatserver.cpp @@ -58,13 +58,13 @@ ChatServer::ChatServer(QObject *parent) : QObject(parent) { QTimer* t = new QTimer(this); - connect(t, SIGNAL(timeout()), this, SLOT(sendKeepAlive())); + connect(t, &QTimer::timeout, this, &ChatServer::sendKeepAlive); t->start(10000); m_keepAliveCheckTimer = new QTimer(this); m_keepAliveCheckTimer->setSingleShot(true); m_keepAliveCheckTimer->setInterval(2000); - connect(m_keepAliveCheckTimer, SIGNAL(timeout()), this, SLOT(checkKeepAliveResponses())); + connect(m_keepAliveCheckTimer, &QTimer::timeout, this, &ChatServer::checkKeepAliveResponses); } ChatServer::~ChatServer() diff --git a/examples/webchannel/standalone/main.cpp b/examples/webchannel/standalone/main.cpp index 0aeb45c..f468652 100644 --- a/examples/webchannel/standalone/main.cpp +++ b/examples/webchannel/standalone/main.cpp @@ -78,7 +78,7 @@ public: ui.setupUi(&dialog); dialog.show(); - connect(ui.send, SIGNAL(clicked()), SLOT(clicked())); + connect(ui.send, &QPushButton::clicked, this, &Dialog::clicked); } void displayMessage(const QString &message) |