eric6/Project/ProjectProtocolsBrowser.py

changeset 8143
2c730d5fd177
parent 7959
44e15eda6506
child 8220
006ee31b4835
--- a/eric6/Project/ProjectProtocolsBrowser.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Project/ProjectProtocolsBrowser.py	Tue Mar 02 17:17:09 2021 +0100
@@ -456,7 +456,7 @@
                     " the project?"),
             files)
         
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             for fn2, fn in zip(fullNames, files):
                 self.closeSourceWindow.emit(fn2)
                 self.project.deleteFile(fn)
@@ -504,7 +504,7 @@
         
         ioEncoding = Preferences.getSystem("IOEncoding")
         
-        self.compileProc.setReadChannel(QProcess.StandardOutput)
+        self.compileProc.setReadChannel(QProcess.ProcessChannel.StandardOutput)
         while self.compileProc and self.compileProc.canReadLine():
             s = 'protoc: '
             output = str(self.compileProc.readLine(), ioEncoding, 'replace')
@@ -521,7 +521,7 @@
         
         ioEncoding = Preferences.getSystem("IOEncoding")
         
-        self.compileProc.setReadChannel(QProcess.StandardError)
+        self.compileProc.setReadChannel(QProcess.ProcessChannel.StandardError)
         while self.compileProc and self.compileProc.canReadLine():
             s = 'protoc: '
             error = str(self.compileProc.readLine(), ioEncoding, 'replace')
@@ -541,7 +541,7 @@
         """
         self.__compileRunning = False
         ui = e5App().getObject("UserInterface")
-        if exitStatus == QProcess.NormalExit and exitCode == 0:
+        if exitStatus == QProcess.ExitStatus.NormalExit and exitCode == 0:
             path = os.path.dirname(self.__protoFile)
             fileList = glob.glob(os.path.join(path, "*_pb2.py"))
             if grpc:
@@ -669,7 +669,7 @@
                     break
                 proc = self.__compileProto(fn, True, progress, grpc=grpc)
                 if proc is not None:
-                    while proc.state() == QProcess.Running:
+                    while proc.state() == QProcess.ProcessState.Running:
                         QApplication.processEvents()
                         QThread.msleep(300)
                         QApplication.processEvents()
@@ -707,7 +707,7 @@
                     break
                 proc = self.__compileProto(fn, True, progress, grpc=grpc)
                 if proc is not None:
-                    while proc.state() == QProcess.Running:
+                    while proc.state() == QProcess.ProcessState.Running:
                         QApplication.processEvents()
                         QThread.msleep(300)
                         QApplication.processEvents()

eric ide

mercurial