diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-03-05 22:00:05 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2015-03-06 13:47:27 +0000 |
| commit | 329c493764cae50c0db341dbe5b63df60f3ca2d3 (patch) | |
| tree | ffa33e70e15b32b98540f427e1b1d1856985b39d /src/libs/utils/consoleprocess_unix.cpp | |
| parent | 0c5dac717e7ff554a9d565800bef6f040875fb5e (diff) | |
| download | qt-creator-329c493764cae50c0db341dbe5b63df60f3ca2d3.tar.gz | |
Utils: Modernize connections
Change-Id: I4650abc84e7c82a4054197319f6c849af9e5b8ce
Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/libs/utils/consoleprocess_unix.cpp')
| -rw-r--r-- | src/libs/utils/consoleprocess_unix.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index 93b152b7d4..15cc2b574e 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -62,7 +62,8 @@ ConsoleProcessPrivate::ConsoleProcessPrivate() : ConsoleProcess::ConsoleProcess(QObject *parent) : QObject(parent), d(new ConsoleProcessPrivate) { - connect(&d->m_stubServer, SIGNAL(newConnection()), SLOT(stubConnectionAvailable())); + connect(&d->m_stubServer, &QLocalServer::newConnection, + this, &ConsoleProcess::stubConnectionAvailable); d->m_process.setProcessChannelMode(QProcess::ForwardedChannels); } @@ -177,7 +178,7 @@ bool ConsoleProcess::start(const QString &program, const QString &args) return false; } d->m_stubConnectTimer = new QTimer(this); - connect(d->m_stubConnectTimer, SIGNAL(timeout()), SLOT(stop())); + connect(d->m_stubConnectTimer, &QTimer::timeout, this, &ConsoleProcess::stop); d->m_stubConnectTimer->setSingleShot(true); d->m_stubConnectTimer->start(10000); d->m_executable = program; @@ -282,8 +283,8 @@ void ConsoleProcess::stubConnectionAvailable() d->m_stubConnected = true; emit stubStarted(); d->m_stubSocket = d->m_stubServer.nextPendingConnection(); - connect(d->m_stubSocket, SIGNAL(readyRead()), SLOT(readStubOutput())); - connect(d->m_stubSocket, SIGNAL(disconnected()), SLOT(stubExited())); + connect(d->m_stubSocket, &QIODevice::readyRead, this, &ConsoleProcess::readStubOutput); + connect(d->m_stubSocket, &QLocalSocket::disconnected, this, &ConsoleProcess::stubExited); } static QString errorMsg(int code) |