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

remove usage of qDeleteInEventHandler from QProcess 

qDeleteInEventHandler is a mere wrapper for delete these days.

Change-Id: I0828edf3ca17642b5abf97aab66672490c35f177
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
bb10
Joerg Bornemann 2013-10-01 11:16:23 +02:00 committed by The Qt Project
parent 7c3efdfb6a
commit 48061944ef
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -855,7 +855,7 @@ void QProcessPrivate::cleanup()
}
if (processFinishedNotifier) {
processFinishedNotifier->setEnabled(false);
qDeleteInEventHandler(processFinishedNotifier);
delete processFinishedNotifier;
processFinishedNotifier = 0;
}
@ -866,32 +866,32 @@ void QProcessPrivate::cleanup()
if (stdoutChannel.notifier) {
stdoutChannel.notifier->setEnabled(false);
qDeleteInEventHandler(stdoutChannel.notifier);
delete stdoutChannel.notifier;
stdoutChannel.notifier = 0;
}
if (stderrChannel.notifier) {
stderrChannel.notifier->setEnabled(false);
qDeleteInEventHandler(stderrChannel.notifier);
delete stderrChannel.notifier;
stderrChannel.notifier = 0;
}
if (stdinChannel.notifier) {
stdinChannel.notifier->setEnabled(false);
qDeleteInEventHandler(stdinChannel.notifier);
delete stdinChannel.notifier;
stdinChannel.notifier = 0;
}
if (startupSocketNotifier) {
startupSocketNotifier->setEnabled(false);
qDeleteInEventHandler(startupSocketNotifier);
delete startupSocketNotifier;
startupSocketNotifier = 0;
}
if (deathNotifier) {
deathNotifier->setEnabled(false);
qDeleteInEventHandler(deathNotifier);
delete deathNotifier;
deathNotifier = 0;
}
#ifdef Q_OS_WIN
if (notifier) {
qDeleteInEventHandler(notifier);
delete notifier;
notifier = 0;
}
#endif
@ -1161,10 +1161,9 @@ void QProcessPrivate::closeWriteChannel()
qDebug("QProcessPrivate::closeWriteChannel()");
#endif
if (stdinChannel.notifier) {
extern void qDeleteInEventHandler(QObject *o);
stdinChannel.notifier->setEnabled(false);
if (stdinChannel.notifier) {
qDeleteInEventHandler(stdinChannel.notifier);
delete stdinChannel.notifier;
stdinChannel.notifier = 0;
}
}