summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Keller <rainer.keller@digia.com>2014-07-28 13:10:41 +0200
committerRainer Keller <rainer.keller@digia.com>2014-08-01 11:22:24 +0300
commita6a806bc5e34dfaad1a39fffb237838f2f70a484 (patch)
tree918cbf05ef633dae545b48ddddaa5e1a88f66822
parent7180862844fcc4460923224f13c8b2d4dd540e9b (diff)
Use compile time connections
Change-Id: I0322e8f594a07d0173a732e5036e4d9ca524232c Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
-rw-r--r--process.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/process.cpp b/process.cpp
index 18faead..abf3eab 100644
--- a/process.cpp
+++ b/process.cpp
@@ -88,11 +88,11 @@ Process::Process()
, mDebug(false)
{
mProcess->setProcessChannelMode(QProcess::SeparateChannels);
- connect(mProcess, SIGNAL(readyReadStandardError()), this, SLOT(readyReadStandardError()));
- connect(mProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readyReadStandardOutput()));
- connect(mProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished(int, QProcess::ExitStatus)));
- connect(mProcess, SIGNAL(error(QProcess::ProcessError)), this, SLOT(error(QProcess::ProcessError)));
- connect(mProcess, SIGNAL(finished(int, QProcess::ExitStatus)), qApp, SLOT(quit()));
+ connect(mProcess, &QProcess::readyReadStandardError, this, &Process::readyReadStandardError);
+ connect(mProcess, &QProcess::readyReadStandardOutput, this, &Process::readyReadStandardOutput);
+ connect(mProcess, (void (QProcess::*)(int, QProcess::ExitStatus))&QProcess::finished, this, &Process::finished);
+ connect(mProcess, (void (QProcess::*)(QProcess::ProcessError))&QProcess::error, this, &Process::error);
+ connect(mProcess, (void (QProcess::*)(int, QProcess::ExitStatus))&QProcess::finished, qApp, &QCoreApplication::quit);
if (pipe2(pipefd, O_CLOEXEC) != 0)
qWarning("Could not create pipe");
@@ -238,7 +238,7 @@ void Process::incomingConnection(int i)
void Process::setSocketNotifier(QSocketNotifier *s)
{
- connect(s, SIGNAL(activated(int)), this, SLOT(incomingConnection(int)));
+ connect(s, &QSocketNotifier::activated, this, &Process::incomingConnection);
}
void Process::setConfig(const Config &config)