diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-05-14 14:20:04 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-05-14 14:20:04 +0300 |
| commit | 8c7fd3327ecfb31fde4ae843a5d66e0ef29026ff (patch) | |
| tree | b48975200ce3eee6c5dbf1070c71b8d71ece1ffb /launcher/LoggedProcess.cpp | |
| parent | e4449a0ba32593b4fd76e3f2ced176e5b3bbd952 (diff) | |
| parent | d5c6a1b4d1e6d052e42366d19ffa0047168e030d (diff) | |
| download | PrismLauncher-8c7fd3327ecfb31fde4ae843a5d66e0ef29026ff.tar.gz PrismLauncher-8c7fd3327ecfb31fde4ae843a5d66e0ef29026ff.tar.bz2 PrismLauncher-8c7fd3327ecfb31fde4ae843a5d66e0ef29026ff.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert
Diffstat (limited to 'launcher/LoggedProcess.cpp')
| -rw-r--r-- | launcher/LoggedProcess.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/launcher/LoggedProcess.cpp b/launcher/LoggedProcess.cpp index c8d5c34e..d70f6d00 100644 --- a/launcher/LoggedProcess.cpp +++ b/launcher/LoggedProcess.cpp @@ -44,12 +44,8 @@ LoggedProcess::LoggedProcess(QObject *parent) : QProcess(parent) // QProcess has a strange interface... let's map a lot of those into a few. connect(this, &QProcess::readyReadStandardOutput, this, &LoggedProcess::on_stdOut); connect(this, &QProcess::readyReadStandardError, this, &LoggedProcess::on_stdErr); - connect(this, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(on_exit(int,QProcess::ExitStatus))); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - connect(this, SIGNAL(errorOccurred(QProcess::ProcessError)), this, SLOT(on_error(QProcess::ProcessError))); -#else - connect(this, SIGNAL(error(QProcess::ProcessError)), this, SLOT(on_error(QProcess::ProcessError))); -#endif + connect(this, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &LoggedProcess::on_exit); + connect(this, &QProcess::errorOccurred, this, &LoggedProcess::on_error); connect(this, &QProcess::stateChanged, this, &LoggedProcess::on_stateChange); } |