From 8388b40108eb3f78531dac2af07eef0e89a44c03 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@digia.com>
Date: Tue, 1 Oct 2013 15:37:10 +0200
Subject: QProcess: remove now superfluous calls to setEnabled(false)

This amends 48061944ef358bbb1e5fd7b582376868f9788c5e.

Change-Id: Ie5b56c1499a10594b4a4b3c02d5704226ef971ba
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 src/corelib/io/qprocess.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 9f5e626243..fb86b053e9 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -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
-- 
cgit v1.2.3