diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-28 12:01:49 -0700 |
|---|---|---|
| committer | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-28 12:01:49 -0700 |
| commit | b28f682ad9726c536f49579a3bd810cacc6e45ef (patch) | |
| tree | 01d826f424072c8d9b78e9b6c6289ec3200bf092 /launcher/LoggedProcess.cpp | |
| parent | 086a7e19f099c6c9b9529afb2360300e534876bf (diff) | |
| parent | 954d4d701a136e79c25b58f9680d26a555a6e6fe (diff) | |
| download | PrismLauncher-b28f682ad9726c536f49579a3bd810cacc6e45ef.tar.gz PrismLauncher-b28f682ad9726c536f49579a3bd810cacc6e45ef.tar.bz2 PrismLauncher-b28f682ad9726c536f49579a3bd810cacc6e45ef.zip | |
Merge branch 'develop' into feature/images-for-resource-page
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); } |