diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py index ff546472c6..7fb39ed399 100644 --- a/src/Mod/Arch/ArchCommands.py +++ b/src/Mod/Arch/ArchCommands.py @@ -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: @@ -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"): @@ -990,9 +990,9 @@ class SurveyTaskPanel: 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"): @@ -1000,9 +1000,9 @@ class SurveyTaskPanel: 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() @@ -1050,7 +1050,7 @@ class SurveyTaskPanel: 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") diff --git a/src/Mod/Arch/ArchNesting.py b/src/Mod/Arch/ArchNesting.py index bef5dd815b..0a97f55643 100644 --- a/src/Mod/Arch/ArchNesting.py +++ b/src/Mod/Arch/ArchNesting.py @@ -116,7 +116,7 @@ class Nester: 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 diff --git a/src/Mod/Arch/ArchPanel.py b/src/Mod/Arch/ArchPanel.py index 031a24470c..3c43ce9829 100644 --- a/src/Mod/Arch/ArchPanel.py +++ b/src/Mod/Arch/ArchPanel.py @@ -1344,7 +1344,7 @@ class NestTaskPanel: 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) diff --git a/src/Mod/Arch/ArchSchedule.py b/src/Mod/Arch/ArchSchedule.py index 16b45a1277..263e20a70f 100644 --- a/src/Mod/Arch/ArchSchedule.py +++ b/src/Mod/Arch/ArchSchedule.py @@ -314,7 +314,7 @@ class _ArchScheduleTaskPanel: 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 @@ -333,7 +333,7 @@ class _ArchScheduleTaskPanel: 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"))) diff --git a/src/Mod/Arch/importIFC.py b/src/Mod/Arch/importIFC.py index 2563c133d4..20e3995fe2 100644 --- a/src/Mod/Arch/importIFC.py +++ b/src/Mod/Arch/importIFC.py @@ -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] diff --git a/src/Mod/Arch/importIFClegacy.py b/src/Mod/Arch/importIFClegacy.py index 045f3f97b4..6752583ac9 100644 --- a/src/Mod/Arch/importIFClegacy.py +++ b/src/Mod/Arch/importIFClegacy.py @@ -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: diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py index d66e101597..2ce9973f1e 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py @@ -252,7 +252,7 @@ class _TaskPanelFemResultShow: 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" @@ -261,7 +261,7 @@ class _TaskPanelFemResultShow: 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" @@ -270,7 +270,7 @@ class _TaskPanelFemResultShow: 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" @@ -279,7 +279,7 @@ class _TaskPanelFemResultShow: 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" @@ -288,7 +288,7 @@ class _TaskPanelFemResultShow: 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" @@ -297,7 +297,7 @@ class _TaskPanelFemResultShow: 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" @@ -306,7 +306,7 @@ class _TaskPanelFemResultShow: 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" @@ -315,7 +315,7 @@ class _TaskPanelFemResultShow: 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" @@ -357,7 +357,7 @@ class _TaskPanelFemResultShow: 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): @@ -373,7 +373,7 @@ class _TaskPanelFemResultShow: 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) @@ -401,7 +401,7 @@ class _TaskPanelFemResultShow: 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) diff --git a/src/Mod/Import/stepZ.py b/src/Mod/Import/stepZ.py index 2875557904..87d8e9ca18 100644 --- a/src/Mod/Import/stepZ.py +++ b/src/Mod/Import/stepZ.py @@ -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: diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py index a2be1a8913..b113c17cbb 100644 --- a/src/Mod/Material/MaterialEditor.py +++ b/src/Mod/Material/MaterialEditor.py @@ -261,7 +261,7 @@ class MaterialEditor: 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 @@ -275,7 +275,7 @@ class MaterialEditor: 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: diff --git a/src/Mod/PartDesign/FeatureHole/HoleGui.py b/src/Mod/PartDesign/FeatureHole/HoleGui.py index f654f95127..60bcce50b0 100644 --- a/src/Mod/PartDesign/FeatureHole/HoleGui.py +++ b/src/Mod/PartDesign/FeatureHole/HoleGui.py @@ -30,10 +30,10 @@ from ViewProviderHole import ViewProviderHole 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 diff --git a/src/Mod/PartDesign/FeatureHole/TaskHole.py b/src/Mod/PartDesign/FeatureHole/TaskHole.py index db05f339b1..1a8ab9ccb7 100644 --- a/src/Mod/PartDesign/FeatureHole/TaskHole.py +++ b/src/Mod/PartDesign/FeatureHole/TaskHole.py @@ -82,10 +82,10 @@ class TaskHole: 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 diff --git a/src/Mod/PartDesign/Scripts/Gear.py b/src/Mod/PartDesign/Scripts/Gear.py index d8b38893cf..ee566713b5 100644 --- a/src/Mod/PartDesign/Scripts/Gear.py +++ b/src/Mod/PartDesign/Scripts/Gear.py @@ -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") @@ -232,7 +232,7 @@ def compute(): App.ActiveDocument.recompute() Gui.SendMsgToActiveView("ViewFit") - QtGui.qApp.restoreOverrideCursor() + QtGui.QApplication.restoreOverrideCursor() hide() diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.py b/src/Mod/PartDesign/WizardShaft/WizardShaft.py index 5171ed9850..454e2997d9 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaft.py +++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.py @@ -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 @@ -87,7 +87,7 @@ class TaskWizardShaft: 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): diff --git a/src/Mod/Path/PathScripts/PathJobCmd.py b/src/Mod/Path/PathScripts/PathJobCmd.py index 495202bb6e..c2703cbe94 100644 --- a/src/Mod/Path/PathScripts/PathJobCmd.py +++ b/src/Mod/Path/PathScripts/PathJobCmd.py @@ -247,7 +247,7 @@ class CommandJobTemplateExport: 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] diff --git a/src/Mod/Path/PathScripts/PathPost.py b/src/Mod/Path/PathScripts/PathPost.py index 3713714542..8f433f7c65 100644 --- a/src/Mod/Path/PathScripts/PathPost.py +++ b/src/Mod/Path/PathScripts/PathPost.py @@ -137,7 +137,7 @@ class CommandPathPost: 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: diff --git a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py index 9839883ab2..0d529aa4c3 100644 --- a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py +++ b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py @@ -279,7 +279,7 @@ class JobPreferencesPage: 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] @@ -289,13 +289,13 @@ class JobPreferencesPage: 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) diff --git a/src/Mod/Plot/plotAxes/TaskPanel.py b/src/Mod/Plot/plotAxes/TaskPanel.py index f75e3543a5..657e8637ae 100644 --- a/src/Mod/Plot/plotAxes/TaskPanel.py +++ b/src/Mod/Plot/plotAxes/TaskPanel.py @@ -151,7 +151,7 @@ class TaskPanel: 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 diff --git a/src/Mod/Plot/plotLabels/TaskPanel.py b/src/Mod/Plot/plotLabels/TaskPanel.py index abdb3187a0..5f8042b3d8 100644 --- a/src/Mod/Plot/plotLabels/TaskPanel.py +++ b/src/Mod/Plot/plotLabels/TaskPanel.py @@ -110,7 +110,7 @@ class TaskPanel: 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 diff --git a/src/Mod/Plot/plotPositions/TaskPanel.py b/src/Mod/Plot/plotPositions/TaskPanel.py index 946984b580..32ffc9b4d3 100644 --- a/src/Mod/Plot/plotPositions/TaskPanel.py +++ b/src/Mod/Plot/plotPositions/TaskPanel.py @@ -99,7 +99,7 @@ class TaskPanel: 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 diff --git a/src/Mod/Plot/plotSave/TaskPanel.py b/src/Mod/Plot/plotSave/TaskPanel.py index 8d7a784056..8ccad76778 100644 --- a/src/Mod/Plot/plotSave/TaskPanel.py +++ b/src/Mod/Plot/plotSave/TaskPanel.py @@ -105,7 +105,7 @@ class TaskPanel: 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 diff --git a/src/Mod/Plot/plotSeries/TaskPanel.py b/src/Mod/Plot/plotSeries/TaskPanel.py index 616351892e..fcab9cd288 100644 --- a/src/Mod/Plot/plotSeries/TaskPanel.py +++ b/src/Mod/Plot/plotSeries/TaskPanel.py @@ -127,7 +127,7 @@ class TaskPanel: 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 diff --git a/src/Mod/Ship/shipAreasCurve/TaskPanel.py b/src/Mod/Ship/shipAreasCurve/TaskPanel.py index 923e1ee282..8d719a8945 100644 --- a/src/Mod/Ship/shipAreasCurve/TaskPanel.py +++ b/src/Mod/Ship/shipAreasCurve/TaskPanel.py @@ -119,7 +119,7 @@ class TaskPanel: self.onData) def getMainWindow(self): - toplevel = QtGui.qApp.topLevelWidgets() + toplevel = QtGui.QApplication.topLevelWidgets() for i in toplevel: if i.metaObject().className() == "Gui::MainWindow": return i diff --git a/src/Mod/Ship/shipCapacityCurve/TaskPanel.py b/src/Mod/Ship/shipCapacityCurve/TaskPanel.py index 8f05ab4652..842d6b0747 100644 --- a/src/Mod/Ship/shipCapacityCurve/TaskPanel.py +++ b/src/Mod/Ship/shipCapacityCurve/TaskPanel.py @@ -93,7 +93,7 @@ class TaskPanel: self.retranslateUi() def getMainWindow(self): - toplevel = QtGui.qApp.topLevelWidgets() + toplevel = QtGui.QApplication.topLevelWidgets() for i in toplevel: if i.metaObject().className() == "Gui::MainWindow": return i diff --git a/src/Mod/Ship/shipCreateShip/TaskPanel.py b/src/Mod/Ship/shipCreateShip/TaskPanel.py index a6be565255..80c22b072b 100644 --- a/src/Mod/Ship/shipCreateShip/TaskPanel.py +++ b/src/Mod/Ship/shipCreateShip/TaskPanel.py @@ -107,7 +107,7 @@ class TaskPanel: self.onData) def getMainWindow(self): - toplevel = QtGui.qApp.topLevelWidgets() + toplevel = QtGui.QApplication.topLevelWidgets() for i in toplevel: if i.metaObject().className() == "Gui::MainWindow": return i diff --git a/src/Mod/Ship/shipCreateTank/TaskPanel.py b/src/Mod/Ship/shipCreateTank/TaskPanel.py index b2e95fbb25..962f2aec27 100644 --- a/src/Mod/Ship/shipCreateTank/TaskPanel.py +++ b/src/Mod/Ship/shipCreateTank/TaskPanel.py @@ -82,7 +82,7 @@ class TaskPanel: self.retranslateUi() def getMainWindow(self): - toplevel = QtGui.qApp.topLevelWidgets() + toplevel = QtGui.QApplication.topLevelWidgets() for i in toplevel: if i.metaObject().className() == "Gui::MainWindow": return i diff --git a/src/Mod/Ship/shipCreateWeight/TaskPanel.py b/src/Mod/Ship/shipCreateWeight/TaskPanel.py index 09e96b47cc..43df04bb07 100644 --- a/src/Mod/Ship/shipCreateWeight/TaskPanel.py +++ b/src/Mod/Ship/shipCreateWeight/TaskPanel.py @@ -86,7 +86,7 @@ class TaskPanel: self.retranslateUi() def getMainWindow(self): - toplevel = QtGui.qApp.topLevelWidgets() + toplevel = QtGui.QApplication.topLevelWidgets() for i in toplevel: if i.metaObject().className() == "Gui::MainWindow": return i diff --git a/src/Mod/Ship/shipGZ/TaskPanel.py b/src/Mod/Ship/shipGZ/TaskPanel.py index fea0ebd46e..bf6040b9a8 100644 --- a/src/Mod/Ship/shipGZ/TaskPanel.py +++ b/src/Mod/Ship/shipGZ/TaskPanel.py @@ -106,7 +106,7 @@ class TaskPanel: self.retranslateUi() def getMainWindow(self): - toplevel = QtGui.qApp.topLevelWidgets() + toplevel = QtGui.QApplication.topLevelWidgets() for i in toplevel: if i.metaObject().className() == "Gui::MainWindow": return i diff --git a/src/Mod/Ship/shipHydrostatics/TaskPanel.py b/src/Mod/Ship/shipHydrostatics/TaskPanel.py index 0d727e7994..442b25c482 100644 --- a/src/Mod/Ship/shipHydrostatics/TaskPanel.py +++ b/src/Mod/Ship/shipHydrostatics/TaskPanel.py @@ -165,7 +165,7 @@ class TaskPanel: self.onData) def getMainWindow(self): - toplevel = QtGui.qApp.topLevelWidgets() + toplevel = QtGui.QApplication.topLevelWidgets() for i in toplevel: if i.metaObject().className() == "Gui::MainWindow": return i diff --git a/src/Mod/Ship/shipLoadExample/TaskPanel.py b/src/Mod/Ship/shipLoadExample/TaskPanel.py index 46594aa301..2b57e3faaa 100644 --- a/src/Mod/Ship/shipLoadExample/TaskPanel.py +++ b/src/Mod/Ship/shipLoadExample/TaskPanel.py @@ -84,7 +84,7 @@ class TaskPanel: self.retranslateUi() def getMainWindow(self): - toplevel = QtGui.qApp.topLevelWidgets() + toplevel = QtGui.QApplication.topLevelWidgets() for i in toplevel: if i.metaObject().className() == "Gui::MainWindow": return i diff --git a/src/Mod/Ship/shipOutlineDraw/TaskPanel.py b/src/Mod/Ship/shipOutlineDraw/TaskPanel.py index 8a17fe214c..e9b6b09588 100644 --- a/src/Mod/Ship/shipOutlineDraw/TaskPanel.py +++ b/src/Mod/Ship/shipOutlineDraw/TaskPanel.py @@ -166,7 +166,7 @@ class TaskPanel: self.TSections, self.ship.Shape) def getMainWindow(self): - toplevel = QtGui.qApp.topLevelWidgets() + toplevel = QtGui.QApplication.topLevelWidgets() for i in toplevel: if i.metaObject().className() == "Gui::MainWindow": return i diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py index 56ba70885a..f8a9f0d8f9 100644 --- a/src/Mod/Start/StartPage/StartPage.py +++ b/src/Mod/Start/StartPage/StartPage.py @@ -207,7 +207,7 @@ def setColors(html): "#windowcolor":"#FFFFFF", "#windowtextcolor":"#000000"} try: - palette = QtGui.qApp.palette() + palette = QtGui.QApplication.palette() except: pass else: diff --git a/src/Mod/TemplatePyMod/Automation.py b/src/Mod/TemplatePyMod/Automation.py index 849247f105..0b70e50854 100644 --- a/src/Mod/TemplatePyMod/Automation.py +++ b/src/Mod/TemplatePyMod/Automation.py @@ -14,7 +14,7 @@ def makeSnapshotWithGui(): import FreeCADGui def getMainWindow(): - toplevel = QtGui.qApp.topLevelWidgets() + toplevel = QtGui.QApplication.topLevelWidgets() for i in toplevel: if i.metaObject().className() == "Gui::MainWindow": return i @@ -37,7 +37,7 @@ def makeSnapshotWithGui(): view.saveImage('crystal.png',800,600,'Current') FreeCAD.closeDocument(doc.Name) # close the application - QtGui.qApp.quit() + QtGui.QApplication.quit() def makeSnapshotWithoutGui(): from pivy import coin diff --git a/src/Mod/TemplatePyMod/TaskPanel.py b/src/Mod/TemplatePyMod/TaskPanel.py index 0902fd597b..04cb4c7d0f 100644 --- a/src/Mod/TemplatePyMod/TaskPanel.py +++ b/src/Mod/TemplatePyMod/TaskPanel.py @@ -77,10 +77,10 @@ class TaskPanel: 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