diff -r 27f636beebad -r 2c730d5fd177 eric6/Project/ProjectInterfacesBrowser.py
--- a/eric6/Project/ProjectInterfacesBrowser.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Project/ProjectInterfacesBrowser.py Tue Mar 02 17:17:09 2021 +0100
@@ -464,7 +464,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)
@@ -483,7 +483,7 @@
ioEncoding = Preferences.getSystem("IOEncoding")
- self.compileProc.setReadChannel(QProcess.StandardOutput)
+ self.compileProc.setReadChannel(QProcess.ProcessChannel.StandardOutput)
while self.compileProc and self.compileProc.canReadLine():
s = 'omniidl: '
output = str(self.compileProc.readLine(), ioEncoding, 'replace')
@@ -500,7 +500,7 @@
ioEncoding = Preferences.getSystem("IOEncoding")
- self.compileProc.setReadChannel(QProcess.StandardError)
+ self.compileProc.setReadChannel(QProcess.ProcessChannel.StandardError)
while self.compileProc and self.compileProc.canReadLine():
s = 'omniidl: '
error = str(self.compileProc.readLine(), ioEncoding, 'replace')
@@ -516,7 +516,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.idlFile)
poaList = glob.glob(os.path.join(path, "*__POA"))
npoaList = [f.replace("__POA", "") for f in poaList]
@@ -624,7 +624,7 @@
break
proc = self.__compileIDL(fn, True, progress)
if proc is not None:
- while proc.state() == QProcess.Running:
+ while proc.state() == QProcess.ProcessState.Running:
QApplication.processEvents()
QThread.msleep(300)
QApplication.processEvents()
@@ -659,7 +659,7 @@
break
proc = self.__compileIDL(fn, True, progress)
if proc is not None:
- while proc.state() == QProcess.Running:
+ while proc.state() == QProcess.ProcessState.Running:
QApplication.processEvents()
QThread.msleep(300)
QApplication.processEvents()
@@ -680,7 +680,7 @@
dlg = IdlCompilerOptionsDialog(
params["IncludeDirs"][:], params["DefinedNames"][:],
params["UndefinedNames"][:], self.project, self)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
include, defined, undefined = dlg.getData()
if include != params["IncludeDirs"]:
params["IncludeDirs"] = include[:]
