Skip to content

Commit

Permalink
PySide2: qApp -> QApplication
Browse files Browse the repository at this point in the history
  • Loading branch information
looooo authored and wwmayer committed Apr 14, 2018
1 parent 0bd9f17 commit be5ea83
Show file tree
Hide file tree
Showing 33 changed files with 63 additions and 63 deletions.
18 changes: 9 additions & 9 deletions src/Mod/Arch/ArchCommands.py
Expand Up @@ -828,9 +828,9 @@ def survey(callback=False):
FreeCAD.SurveyDialog.update(1,t)
if FreeCAD.GuiUp and t:
if showUnit:
QtGui.qApp.clipboard().setText(t)
QtGui.QApplication.clipboard().setText(t)
else:
QtGui.qApp.clipboard().setText(str(u.Value))
QtGui.QApplication.clipboard().setText(str(u.Value))
else:
# single element(s)
for el in o.SubElementNames:
Expand Down Expand Up @@ -870,9 +870,9 @@ def survey(callback=False):
FreeCAD.Console.PrintMessage("Object: " + n + ", Element: " + el + ", Zcoord: " + utf8_decode(t) + "\n")
if FreeCAD.GuiUp and t:
if showUnit:
QtGui.qApp.clipboard().setText(t)
QtGui.QApplication.clipboard().setText(t)
else:
QtGui.qApp.clipboard().setText(str(u.Value))
QtGui.QApplication.clipboard().setText(str(u.Value))

FreeCAD.SurveyObserver.selection.extend(newsels)
if hasattr(FreeCAD,"SurveyObserver"):
Expand Down Expand Up @@ -990,19 +990,19 @@ def clipLength(self):
t = u.getUserPreferred()[0]
t = t.encode("utf8")
if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch").GetBool("surveyUnits",True):
QtGui.qApp.clipboard().setText(t)
QtGui.QApplication.clipboard().setText(t)
else:
QtGui.qApp.clipboard().setText(str(u.Value/u.getUserPreferred()[1]))
QtGui.QApplication.clipboard().setText(str(u.Value/u.getUserPreferred()[1]))

def clipArea(self):
if hasattr(FreeCAD,"SurveyObserver"):
u = FreeCAD.Units.Quantity(FreeCAD.SurveyObserver.totalArea,FreeCAD.Units.Area)
t = u.getUserPreferred()[0]
t = t.encode("utf8").replace("^2","²")
if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch").GetBool("surveyUnits",True):
QtGui.qApp.clipboard().setText(t)
QtGui.QApplication.clipboard().setText(t)
else:
QtGui.qApp.clipboard().setText(str(u.Value/u.getUserPreferred()[1]))
QtGui.QApplication.clipboard().setText(str(u.Value/u.getUserPreferred()[1]))

def newline(self,length=0,area=0):
FreeCADGui.Selection.clearSelection()
Expand Down Expand Up @@ -1050,7 +1050,7 @@ def exportCSV(self):
import csv
rows = self.tree.topLevelItemCount()
if rows:
filename = QtGui.QFileDialog.getSaveFileName(QtGui.qApp.activeWindow(), translate("Arch","Export CSV File"), None, "CSV file (*.csv)");
filename = QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(), translate("Arch","Export CSV File"), None, "CSV file (*.csv)");
if filename:
with open(filename[0].encode("utf8"), 'wb') as csvfile:
csvfile = csv.writer(csvfile,delimiter="\t")
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Arch/ArchNesting.py
Expand Up @@ -116,7 +116,7 @@ def update(self):
self.setCounter(self.progress)
if FreeCAD.GuiUp:
from PySide import QtGui
QtGui.qApp.processEvents()
QtGui.QApplication.processEvents()
if not self.running:
return False
return True
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Arch/ArchPanel.py
Expand Up @@ -1344,7 +1344,7 @@ def start(self):
self.form.ButtonStop.setEnabled(True)
self.form.ButtonStart.setEnabled(False)
self.form.ButtonPreview.setEnabled(False)
QtGui.qApp.processEvents()
QtGui.QApplication.processEvents()
result = self.nester.run()
self.form.progressBar.hide()
self.form.ButtonStart.setEnabled(True)
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Arch/ArchSchedule.py
Expand Up @@ -314,7 +314,7 @@ def clear(self):
self.form.list.setRowCount(0)

def importCSV(self):
filename = QtGui.QFileDialog.getOpenFileName(QtGui.qApp.activeWindow(), translate("Arch","Import CSV File"), None, "CSV file (*.csv)");
filename = QtGui.QFileDialog.getOpenFileName(QtGui.QApplication.activeWindow(), translate("Arch","Import CSV File"), None, "CSV file (*.csv)");
if filename:
self.form.list.clearContents()
import csv
Expand All @@ -333,7 +333,7 @@ def importCSV(self):
def exportCSV(self):
if self.obj:
if self.obj.Result:
filename = QtGui.QFileDialog.getSaveFileName(QtGui.qApp.activeWindow(), translate("Arch","Export CSV File"), None, "CSV file (*.csv)");
filename = QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(), translate("Arch","Export CSV File"), None, "CSV file (*.csv)");
if filename:
# the following line crashes, couldn't fnid out why
# self.obj.Result.exportFile(str(filename[0].encode("utf8")))
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Arch/importIFC.py
Expand Up @@ -184,7 +184,7 @@ def explore(filename=None):

if not filename:
from PySide import QtGui
filename = QtGui.QFileDialog.getOpenFileName(QtGui.qApp.activeWindow(),'IFC files','*.ifc')
filename = QtGui.QFileDialog.getOpenFileName(QtGui.QApplication.activeWindow(),'IFC files','*.ifc')
if filename:
filename = filename[0]

Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Arch/importIFClegacy.py
Expand Up @@ -1388,7 +1388,7 @@ def explore(filename=None):
"explore the contents of an ifc file in a Qt dialog"
if not filename:
from PySide import QtGui
filename = QtGui.QFileDialog.getOpenFileName(QtGui.qApp.activeWindow(),'IFC files','*.ifc')
filename = QtGui.QFileDialog.getOpenFileName(QtGui.QApplication.activeWindow(),'IFC files','*.ifc')
if filename:
filename = filename[0]
if filename:
Expand Down
22 changes: 11 additions & 11 deletions src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py
Expand Up @@ -252,7 +252,7 @@ def vm_stress_selected(self, state):
self.mesh_obj.ViewObject.setNodeColorByScalars(self.result_obj.NodeNumbers, self.result_obj.StressValues)
(minm, avg, maxm) = self.get_result_stats("Sabs")
self.set_result_stats("MPa", minm, avg, maxm)
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def max_shear_selected(self, state):
FreeCAD.FEM_dialog["results_type"] = "MaxShear"
Expand All @@ -261,7 +261,7 @@ def max_shear_selected(self, state):
self.mesh_obj.ViewObject.setNodeColorByScalars(self.result_obj.NodeNumbers, self.result_obj.MaxShear)
(minm, avg, maxm) = self.get_result_stats("MaxShear")
self.set_result_stats("MPa", minm, avg, maxm)
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def max_prin_selected(self, state):
FreeCAD.FEM_dialog["results_type"] = "MaxPrin"
Expand All @@ -270,7 +270,7 @@ def max_prin_selected(self, state):
self.mesh_obj.ViewObject.setNodeColorByScalars(self.result_obj.NodeNumbers, self.result_obj.PrincipalMax)
(minm, avg, maxm) = self.get_result_stats("MaxPrin")
self.set_result_stats("MPa", minm, avg, maxm)
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def temperature_selected(self, state):
FreeCAD.FEM_dialog["results_type"] = "Temp"
Expand All @@ -279,7 +279,7 @@ def temperature_selected(self, state):
self.mesh_obj.ViewObject.setNodeColorByScalars(self.result_obj.NodeNumbers, self.result_obj.Temperature)
(minm, avg, maxm) = self.get_result_stats("Temp")
self.set_result_stats("K", minm, avg, maxm)
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def massflowrate_selected(self, state):
FreeCAD.FEM_dialog["results_type"] = "MFlow"
Expand All @@ -288,7 +288,7 @@ def massflowrate_selected(self, state):
self.mesh_obj.ViewObject.setNodeColorByScalars(self.result_obj.NodeNumbers, self.result_obj.MassFlowRate)
(minm, avg, maxm) = self.get_result_stats("MFlow")
self.set_result_stats("kg/s", minm, avg, maxm)
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def networkpressure_selected(self, state):
FreeCAD.FEM_dialog["results_type"] = "NPress"
Expand All @@ -297,7 +297,7 @@ def networkpressure_selected(self, state):
self.mesh_obj.ViewObject.setNodeColorByScalars(self.result_obj.NodeNumbers, self.result_obj.NetworkPressure)
(minm, avg, maxm) = self.get_result_stats("NPress")
self.set_result_stats("MPa", minm, avg, maxm)
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def min_prin_selected(self, state):
FreeCAD.FEM_dialog["results_type"] = "MinPrin"
Expand All @@ -306,7 +306,7 @@ def min_prin_selected(self, state):
self.mesh_obj.ViewObject.setNodeColorByScalars(self.result_obj.NodeNumbers, self.result_obj.PrincipalMin)
(minm, avg, maxm) = self.get_result_stats("MinPrin")
self.set_result_stats("MPa", minm, avg, maxm)
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def peeq_selected(self, state):
FreeCAD.FEM_dialog["results_type"] = "Peeq"
Expand All @@ -315,7 +315,7 @@ def peeq_selected(self, state):
self.mesh_obj.ViewObject.setNodeColorByScalars(self.result_obj.NodeNumbers, self.result_obj.Peeq)
(minm, avg, maxm) = self.get_result_stats("Peeq")
self.set_result_stats("", minm, avg, maxm)
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def user_defined_text(self, equation):
FreeCAD.FEM_dialog["results_type"] = "user"
Expand Down Expand Up @@ -357,7 +357,7 @@ def calculate(self):
if self.suitable_results:
self.mesh_obj.ViewObject.setNodeColorByScalars(self.result_obj.NodeNumbers, UserDefinedFormula)
self.set_result_stats("", minm, avg, maxm)
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()
del x, y, z, T, Von, Peeq, P1, P2, P3, sx, sy, sz, ex, ey, ez, MF, NP # Dummy use of the variables to get around flake8 error

def select_displacement_type(self, disp_type):
Expand All @@ -373,7 +373,7 @@ def select_displacement_type(self, disp_type):
self.mesh_obj.ViewObject.setNodeColorByScalars(self.result_obj.NodeNumbers, displacements)
(minm, avg, maxm) = self.get_result_stats(disp_type)
self.set_result_stats("mm", minm, avg, maxm)
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def set_result_stats(self, unit, minm, avg, maxm):
self.form.le_min.setProperty("unit", unit)
Expand Down Expand Up @@ -401,7 +401,7 @@ def show_displacement(self, checked):
if self.suitable_results:
self.mesh_obj.ViewObject.setNodeDisplacementByVectors(self.result_obj.NodeNumbers, self.result_obj.DisplacementVectors)
self.update_displacement()
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def hsb_disp_factor_changed(self, value):
self.form.sb_displacement_factor.setValue(value)
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Import/stepZ.py
Expand Up @@ -142,13 +142,13 @@ def export(objs,filename):

if os.path.exists(outfpath_stp):
sayzw("File cannot be compressed because a file with the same name exists '"+ outfpath_stp +"'")
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()
reply = QtGui.QMessageBox.information(None,"info", "File cannot be compressed because\na file with the same name exists\n'"+ outfpath_stp + "'")
else:
ImportGui.export(objs,outfpath_stp)
if 0: #os.path.exists(namefpath):
sayzw("File cannot be compressed because a file with the same name exists '" + namefpath + "'")
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()
reply = QtGui.QMessageBox.information(None,"info", "File cannot be compressed because\na file with the same name exists\n'"+ namefpath+ "'")
else:
with builtin.open(outfpath_stp, 'rb') as f_in:
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Material/MaterialEditor.py
Expand Up @@ -261,7 +261,7 @@ def setTexture(self,pattern):

def openfile(self):
"Opens a FCMat file"
filename = QtGui.QFileDialog.getOpenFileName(QtGui.qApp.activeWindow(),'Open FreeCAD Material file','*.FCMat')
filename = QtGui.QFileDialog.getOpenFileName(QtGui.QApplication.activeWindow(),'Open FreeCAD Material file','*.FCMat')
if filename:
self.clearEditor()
import importFCMat
Expand All @@ -275,7 +275,7 @@ def savefile(self):
name = str(self.widget.Editor.findItems(translate("Material","Name"),QtCore.Qt.MatchRecursive,0)[0].text(1))
if not name:
name = "Material"
filename = QtGui.QFileDialog.getSaveFileName(QtGui.qApp.activeWindow(),'Save FreeCAD Material file',name+'.FCMat')
filename = QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(),'Save FreeCAD Material file',name+'.FCMat')
if filename:
d = self.getDict()
if d:
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/PartDesign/FeatureHole/HoleGui.py
Expand Up @@ -30,10 +30,10 @@
class HoleGui:
def getMainWindow(self):
"returns the main window"
# using QtGui.qApp.activeWindow() isn't very reliable because if another
# using QtGui.QApplication.activeWindow() isn't very reliable because if another
# widget than the mainwindow is active (e.g. a dialog) the wrong widget is
# returned
toplevel = QtGui.qApp.topLevelWidgets()
toplevel = QtGui.QApplication.topLevelWidgets()
for i in toplevel:
if i.metaObject().className() == "Gui::MainWindow":
return i
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/PartDesign/FeatureHole/TaskHole.py
Expand Up @@ -82,10 +82,10 @@ def isAllowedAlterSelection(self):

def getMainWindow(self):
"returns the main window"
# using QtGui.qApp.activeWindow() isn't very reliable because if another
# using QtGui.QApplication.activeWindow() isn't very reliable because if another
# widget than the mainwindow is active (e.g. a dialog) the wrong widget is
# returned
toplevel = QtGui.qApp.topLevelWidgets()
toplevel = QtGui.QApplication.topLevelWidgets()
for i in toplevel:
if i.metaObject().className() == "Gui::MainWindow":
return i
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/PartDesign/Scripts/Gear.py
Expand Up @@ -13,10 +13,10 @@ def proceed():
compute()
except:
hide()
QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()

def compute():
QtGui.qApp.setOverrideCursor(QtCore.Qt.WaitCursor)
QtGui.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor)

if FreeCAD.ActiveDocument==None:
FreeCAD.newDocument("Gear")
Expand Down Expand Up @@ -232,7 +232,7 @@ def compute():
App.ActiveDocument.recompute()
Gui.SendMsgToActiveView("ViewFit")

QtGui.qApp.restoreOverrideCursor()
QtGui.QApplication.restoreOverrideCursor()


hide()
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/PartDesign/WizardShaft/WizardShaft.py
Expand Up @@ -31,7 +31,7 @@ class TaskWizardShaft:
Gui = FreeCADGui

def __init__(self, doc):
mw = QtGui.qApp.activeWindow()
mw = QtGui.QApplication.activeWindow()
#cw = mw.centralWidget() # This is a qmdiarea widget
cw = mw.findChild(QtGui.QMdiArea)
self.doc = doc
Expand Down Expand Up @@ -87,7 +87,7 @@ def __init__(self, doc):
self.form.setLayout(layout)

# Switch to feature window
mdi=QtGui.qApp.activeWindow().findChild(QtGui.QMdiArea)
mdi=QtGui.QApplication.activeWindow().findChild(QtGui.QMdiArea)
cw.setActiveSubWindow(featureWindow)

def slotAllx(self):
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Path/PathScripts/PathJobCmd.py
Expand Up @@ -247,7 +247,7 @@ def Activated(self):
job = self.GetJob()
dialog = DlgJobTemplateExport(job)
if dialog.exec_() == 1:
foo = QtGui.QFileDialog.getSaveFileName(QtGui.qApp.activeWindow(),
foo = QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(),
"Path - Job Template",
PathPreferences.filePath(),
"job_*.json")[0]
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Path/PathScripts/PathPost.py
Expand Up @@ -137,7 +137,7 @@ def resolveFileName(self, job):
filename = "%s%03d%s" % (fn, n, ext)

if openDialog:
foo = QtGui.QFileDialog.getSaveFileName(QtGui.qApp.activeWindow(), "Output File", filename)
foo = QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(), "Output File", filename)
if foo:
filename = foo[0]
else:
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/Path/PathScripts/PathPreferencesPathJob.py
Expand Up @@ -279,7 +279,7 @@ def browseDefaultJobTemplate(self):
path = self.form.leDefaultJobTemplate.text()
if not path:
path = self.bestGuessForFilePath()
foo = QtGui.QFileDialog.getOpenFileName(QtGui.qApp.activeWindow(),
foo = QtGui.QFileDialog.getOpenFileName(QtGui.QApplication.activeWindow(),
"Path - Job Template",
path,
"job_*.json")[0]
Expand All @@ -289,13 +289,13 @@ def browseDefaultJobTemplate(self):

def browseDefaultFilePath(self):
path = self.bestGuessForFilePath()
foo = QtGui.QFileDialog.getExistingDirectory(QtGui.qApp.activeWindow(), "Path - External File Directory", path)
foo = QtGui.QFileDialog.getExistingDirectory(QtGui.QApplication.activeWindow(), "Path - External File Directory", path)
if foo:
self.form.leDefaultFilePath.setText(foo)

def browseOutputFile(self):
path = self.form.leOutputFile.text()
foo = QtGui.QFileDialog.getExistingDirectory(QtGui.qApp.activeWindow(), "Path - Output File/Directory", path)
foo = QtGui.QFileDialog.getExistingDirectory(QtGui.QApplication.activeWindow(), "Path - Output File/Directory", path)
if foo:
self.form.leOutputFile.setText(foo)

Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Plot/plotAxes/TaskPanel.py
Expand Up @@ -151,7 +151,7 @@ def setupUi(self):
return False

def getMainWindow(self):
toplevel = QtGui.qApp.topLevelWidgets()
toplevel = QtGui.QApplication.topLevelWidgets()
for i in toplevel:
if i.metaObject().className() == "Gui::MainWindow":
return i
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Plot/plotLabels/TaskPanel.py
Expand Up @@ -110,7 +110,7 @@ def setupUi(self):
return False

def getMainWindow(self):
toplevel = QtGui.qApp.topLevelWidgets()
toplevel = QtGui.QApplication.topLevelWidgets()
for i in toplevel:
if i.metaObject().className() == "Gui::MainWindow":
return i
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Plot/plotPositions/TaskPanel.py
Expand Up @@ -99,7 +99,7 @@ def setupUi(self):
return False

def getMainWindow(self):
toplevel = QtGui.qApp.topLevelWidgets()
toplevel = QtGui.QApplication.topLevelWidgets()
for i in toplevel:
if i.metaObject().className() == "Gui::MainWindow":
return i
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Plot/plotSave/TaskPanel.py
Expand Up @@ -105,7 +105,7 @@ def setupUi(self):
return False

def getMainWindow(self):
toplevel = QtGui.qApp.topLevelWidgets()
toplevel = QtGui.QApplication.topLevelWidgets()
for i in toplevel:
if i.metaObject().className() == "Gui::MainWindow":
return i
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Plot/plotSeries/TaskPanel.py
Expand Up @@ -127,7 +127,7 @@ def setupUi(self):
return False

def getMainWindow(self):
toplevel = QtGui.qApp.topLevelWidgets()
toplevel = QtGui.QApplication.topLevelWidgets()
for i in toplevel:
if i.metaObject().className() == "Gui::MainWindow":
return i
Expand Down

0 comments on commit be5ea83

Please sign in to comment.