Mercurial Repositories > eric / file diff

diff -r 27f636beebad -r 2c730d5fd177 eric6/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py	Tue Mar 02 17:17:09 2021 +0100
@@ -57,7 +57,7 @@
         for process in [self.__process, self.__process2]:
             if (
                 process is not None and
-                process.state() != QProcess.NotRunning
+                process.state() != QProcess.ProcessState.NotRunning
             ):
                 process.terminate()
                 QTimer.singleShot(2000, process.kill)
@@ -165,8 +165,8 @@
         @param exitStatus exit status of the process (QProcess.ExitStatus)
         """
         if (
-            self.__process.state() == QProcess.NotRunning and
-            self.__process2.state() == QProcess.NotRunning
+            self.__process.state() == QProcess.ProcessState.NotRunning and
+            self.__process2.state() == QProcess.ProcessState.NotRunning
         ):
             self.finished.emit()
     
@@ -225,7 +225,7 @@
         @param process reference to the process providing output
         @type QProcess
         """
-        process.setReadChannel(QProcess.StandardOutput)
+        process.setReadChannel(QProcess.ProcessChannel.StandardOutput)
         
         isTopDiff = process == self.__process