diff options
Diffstat (limited to 'src/libs/installer/qprocesswrapper.cpp')
| -rw-r--r-- | src/libs/installer/qprocesswrapper.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/libs/installer/qprocesswrapper.cpp b/src/libs/installer/qprocesswrapper.cpp index 9396a3b56..1bf60ead2 100644 --- a/src/libs/installer/qprocesswrapper.cpp +++ b/src/libs/installer/qprocesswrapper.cpp @@ -43,20 +43,17 @@ QProcessWrapper::QProcessWrapper(QObject *parent) qRegisterMetaType<QProcess::ProcessState>(); m_timer.start(250); - connect(&m_timer, SIGNAL(timeout()), this, SLOT(processSignals())); - connect(&process, SIGNAL(bytesWritten(qint64)), SIGNAL(bytesWritten(qint64))); - connect(&process, SIGNAL(aboutToClose()), SIGNAL(aboutToClose())); - connect(&process, SIGNAL(readChannelFinished()), SIGNAL(readChannelFinished())); + connect(&m_timer, &QTimer::timeout, this, &QProcessWrapper::processSignals); + connect(&process, &QIODevice::bytesWritten, this, &QProcessWrapper::bytesWritten); + connect(&process, &QIODevice::aboutToClose, this, &QProcessWrapper::aboutToClose); + connect(&process, &QIODevice::readChannelFinished, this, &QProcessWrapper::readChannelFinished); connect(&process, SIGNAL(error(QProcess::ProcessError)), SIGNAL(error(QProcess::ProcessError))); - connect(&process, SIGNAL(readyReadStandardOutput()), SIGNAL(readyReadStandardOutput())); - connect(&process, SIGNAL(readyReadStandardError()), SIGNAL(readyReadStandardError())); - connect(&process, SIGNAL(finished(int)), SIGNAL(finished(int))); - connect(&process, SIGNAL(finished(int,QProcess::ExitStatus)), - SIGNAL(finished(int,QProcess::ExitStatus))); - connect(&process, SIGNAL(readyRead()), SIGNAL(readyRead())); - connect(&process, SIGNAL(started()), SIGNAL(started())); - connect(&process, SIGNAL(stateChanged(QProcess::ProcessState)), - SIGNAL(stateChanged(QProcess::ProcessState))); + connect(&process, &QProcess::readyReadStandardOutput, this, &QProcessWrapper::readyReadStandardOutput); + connect(&process, &QProcess::readyReadStandardError, this, &QProcessWrapper::readyReadStandardError); + connect(&process, SIGNAL(finished(int,QProcess::ExitStatus)), SIGNAL(finished(int,QProcess::ExitStatus))); + connect(&process, &QIODevice::readyRead, this, &QProcessWrapper::readyRead); + connect(&process, &QProcess::started, this, &QProcessWrapper::started); + connect(&process, &QProcess::stateChanged, this, &QProcessWrapper::stateChanged); } QProcessWrapper::~QProcessWrapper() @@ -97,7 +94,6 @@ void QProcessWrapper::processSignals() emit stateChanged(static_cast<QProcess::ProcessState> (receivedSignals.takeFirst() .toInt())); } else if (name == QLatin1String(Protocol::QProcessSignalFinished)) { - emit finished(receivedSignals.first().toInt()); emit finished(receivedSignals.takeFirst().toInt(), static_cast<QProcess::ExitStatus> (receivedSignals.takeFirst().toInt())); } |