summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-10-01 11:16:23 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-01 11:57:32 +0200
commit48061944ef358bbb1e5fd7b582376868f9788c5e (patch)
tree2539349be0ecc75c44ccdca91d172e7fa4534b61 /src/corelib/io
parent7c3efdfb6ad72955543128a5a13e3f45ef3ee7af (diff)
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>
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qprocess.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 7f4d7f0313..9f5e626243 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -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;
}
}