whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QProcess: remove now superfluous calls to setEnabled(false) 

This amends 48061944ef.

Change-Id: Ie5b56c1499a10594b4a4b3c02d5704226ef971ba
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
bb10
Joerg Bornemann 2013-10-01 15:37:10 +02:00 committed by The Qt Project
parent 803253ba73
commit 8388b40108
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/corelib/io/qprocess.cpp
View File

@ -854,7 +854,6 @@ void QProcessPrivate::cleanup()
pid = 0;
}
if (processFinishedNotifier) {
processFinishedNotifier->setEnabled(false);
delete processFinishedNotifier;
processFinishedNotifier = 0;
}
@ -865,27 +864,22 @@ void QProcessPrivate::cleanup()
dying = false;
if (stdoutChannel.notifier) {
stdoutChannel.notifier->setEnabled(false);
delete stdoutChannel.notifier;
stdoutChannel.notifier = 0;
}
if (stderrChannel.notifier) {
stderrChannel.notifier->setEnabled(false);
delete stderrChannel.notifier;
stderrChannel.notifier = 0;
}
if (stdinChannel.notifier) {
stdinChannel.notifier->setEnabled(false);
delete stdinChannel.notifier;
stdinChannel.notifier = 0;
}
if (startupSocketNotifier) {
startupSocketNotifier->setEnabled(false);
delete startupSocketNotifier;
startupSocketNotifier = 0;
}
if (deathNotifier) {
deathNotifier->setEnabled(false);
delete deathNotifier;
deathNotifier = 0;
}
@ -1161,11 +1155,8 @@ void QProcessPrivate::closeWriteChannel()
qDebug("QProcessPrivate::closeWriteChannel()");
#endif
if (stdinChannel.notifier) {
stdinChannel.notifier->setEnabled(false);
if (stdinChannel.notifier) {
delete stdinChannel.notifier;
stdinChannel.notifier = 0;
}
delete stdinChannel.notifier;
stdinChannel.notifier = 0;
}
#ifdef Q_OS_WIN
// ### Find a better fix, feeding the process little by little