From 57e681930f6b4c7c311fc70a66317ef64dee4cb1 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Fri, 30 Apr 2021 17:49:36 +0200 Subject: examples: use exec() instead of exec_() Change-Id: I07dd4339093be8fcc80e63a2ff0448e998356203 Reviewed-by: Friedemann Kleint --- examples/3d/simple3d/simple3d.py | 2 +- examples/axcontainer/axviewer/axviewer.py | 4 ++-- examples/charts/audio/audio.py | 2 +- examples/charts/callout/callout.py | 2 +- examples/charts/chartthemes/main.py | 2 +- examples/charts/donutbreakdown/donutbreakdown.py | 2 +- examples/charts/legend/legend.py | 2 +- examples/charts/lineandbar/lineandbar.py | 2 +- examples/charts/linechart/linechart.py | 2 +- examples/charts/logvalueaxis/logvalueaxis.py | 2 +- examples/charts/memoryusage/memoryusage.py | 2 +- examples/charts/modeldata/modeldata.py | 2 +- examples/charts/nesteddonuts/nesteddonuts.py | 2 +- examples/charts/percentbarchart/percentbarchart.py | 2 +- examples/charts/piechart/piechart.py | 2 +- examples/charts/qmlpolarchart/qmlpolarchart.py | 2 +- examples/charts/temperaturerecords/temperaturerecords.py | 2 +- examples/corelib/settingseditor/settingseditor.py | 4 ++-- examples/corelib/threads/mandelbrot.py | 2 +- examples/datavisualization/bars3d/bars3d.py | 2 +- examples/declarative/extending/chapter1-basics/basics.py | 2 +- examples/declarative/extending/chapter2-methods/methods.py | 2 +- examples/declarative/extending/chapter3-bindings/bindings.py | 2 +- .../chapter4-customPropertyTypes/customPropertyTypes.py | 2 +- .../extending/chapter5-listproperties/listproperties.py | 2 +- examples/declarative/scrolling/scrolling.py | 2 +- examples/declarative/signals/pytoqml1/main.py | 2 +- examples/declarative/signals/pytoqml2/main.py | 2 +- examples/declarative/signals/qmltopy1/main.py | 2 +- examples/declarative/signals/qmltopy2/main.py | 2 +- examples/declarative/signals/qmltopy3/main.py | 2 +- examples/declarative/signals/qmltopy4/main.py | 2 +- examples/declarative/textproperties/main.py | 2 +- examples/declarative/usingmodel/usingmodel.py | 2 +- examples/designer/taskmenuextension/main.py | 2 +- examples/designer/taskmenuextension/tictactoetaskmenu.py | 2 +- examples/external/matplotlib/widget3d/widget3d.py | 2 +- .../external/matplotlib/widget_gaussian/widget_gaussian.py | 2 +- examples/external/opencv/webcam_pattern_detection.py | 2 +- examples/external/pandas/dataframe_model.py | 2 +- examples/external/scikit/staining_colors_separation.py | 2 +- examples/installer_test/hello.py | 2 +- examples/macextras/macpasteboardmime/macpasteboardmime.py | 4 ++-- examples/multimedia/audiooutput/audiooutput.py | 2 +- examples/multimedia/camera/camera.py | 2 +- examples/multimedia/player/player.py | 4 ++-- .../network/blockingfortuneclient/blockingfortuneclient.py | 2 +- examples/network/downloader/downloader.py | 2 +- examples/network/fortuneclient/fortuneclient.py | 2 +- examples/network/fortuneserver/fortuneserver.py | 2 +- .../network/threadedfortuneserver/threadedfortuneserver.py | 2 +- examples/opengl/contextinfo/contextinfo.py | 4 ++-- examples/opengl/hellogl2/hellogl2.py | 4 ++-- examples/opengl/textures/textures.py | 4 ++-- examples/quick/painteditem/painteditem.py | 2 +- examples/quickcontrols2/gallery/gallery.py | 2 +- examples/remoteobjects/modelview/modelviewclient.py | 2 +- examples/remoteobjects/modelview/modelviewserver.py | 2 +- examples/sql/books/createdb.py | 12 ++++++------ examples/sql/books/main.py | 2 +- examples/texttospeech/hello_speak/hello_speak.py | 2 +- examples/uitools/uiloader/uiloader.py | 2 +- examples/webchannel/standalone/main.py | 2 +- examples/webenginequick/nanobrowser/quicknanobrowser.py | 2 +- examples/webenginewidgets/simplebrowser/simplebrowser.py | 2 +- examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py | 2 +- examples/webenginewidgets/tabbedbrowser/browsertabwidget.py | 2 +- examples/webenginewidgets/tabbedbrowser/downloadwidget.py | 2 +- examples/webenginewidgets/tabbedbrowser/main.py | 2 +- examples/widgetbinding/main.py | 2 +- examples/widgets/animation/animatedtiles/animatedtiles.py | 2 +- examples/widgets/animation/appchooser/appchooser.py | 2 +- examples/widgets/animation/easing/easing.py | 2 +- examples/widgets/animation/states/states.py | 2 +- examples/widgets/codeeditor/main.py | 2 +- examples/widgets/dialogs/classwizard/classwizard.py | 2 +- examples/widgets/dialogs/classwizard/listchooser.py | 4 ++-- examples/widgets/dialogs/extension/extension.py | 2 +- examples/widgets/dialogs/findfiles/findfiles.py | 2 +- examples/widgets/dialogs/standarddialogs/standarddialogs.py | 4 ++-- examples/widgets/dialogs/trivialwizard/trivialwizard.py | 2 +- examples/widgets/draganddrop/draggabletext/draggabletext.py | 4 ++-- examples/widgets/effects/lighting.py | 2 +- examples/widgets/gallery/main.py | 2 +- examples/widgets/graphicsview/anchorlayout/anchorlayout.py | 2 +- examples/widgets/graphicsview/collidingmice/collidingmice.py | 2 +- examples/widgets/graphicsview/diagramscene/diagramscene.py | 4 ++-- examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py | 4 ++-- examples/widgets/graphicsview/elasticnodes/elasticnodes.py | 2 +- examples/widgets/imageviewer/imageviewer.py | 6 +++--- examples/widgets/imageviewer/main.py | 2 +- examples/widgets/itemviews/addressbook/adddialogwidget.py | 2 +- examples/widgets/itemviews/addressbook/addressbook.py | 2 +- examples/widgets/itemviews/addressbook/addresswidget.py | 6 +++--- examples/widgets/itemviews/addressbook/newaddresstab.py | 4 ++-- .../itemviews/basicfiltermodel/basicsortfiltermodel.py | 2 +- examples/widgets/itemviews/fetchmore/fetchmore.py | 2 +- examples/widgets/itemviews/jsonmodel/jsonmodel.py | 2 +- examples/widgets/itemviews/stardelegate/stardelegate.py | 2 +- examples/widgets/layouts/basiclayouts/basiclayouts.py | 2 +- examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py | 2 +- examples/widgets/layouts/flowlayout/flowlayout.py | 2 +- examples/widgets/mainwindows/application/application.py | 2 +- examples/widgets/mainwindows/dockwidgets/dockwidgets.py | 6 +++--- examples/widgets/mainwindows/mdi/mdi.py | 2 +- examples/widgets/painting/basicdrawing/basicdrawing.py | 2 +- .../widgets/painting/concentriccircles/concentriccircles.py | 2 +- examples/widgets/painting/painter/painter.py | 6 +++--- examples/widgets/richtext/orderform/orderform.py | 6 +++--- .../widgets/richtext/syntaxhighlighter/syntaxhighlighter.py | 2 +- examples/widgets/richtext/textobject/textobject.py | 2 +- examples/widgets/state-machine/eventtrans/eventtrans.py | 2 +- examples/widgets/state-machine/factstates/factstates.py | 2 +- examples/widgets/state-machine/pingpong/pingpong.py | 2 +- examples/widgets/state-machine/rogue/rogue.py | 2 +- examples/widgets/state-machine/trafficlight/trafficlight.py | 2 +- examples/widgets/state-machine/twowaybutton/twowaybutton.py | 2 +- examples/widgets/systray/main.py | 2 +- examples/widgets/tetrix/tetrix.py | 2 +- examples/widgets/threads/thread_signals.py | 2 +- examples/widgets/tutorials/addressbook/part1.py | 2 +- examples/widgets/tutorials/addressbook/part2.py | 2 +- examples/widgets/tutorials/addressbook/part3.py | 2 +- examples/widgets/tutorials/addressbook/part4.py | 2 +- examples/widgets/tutorials/addressbook/part5.py | 4 ++-- examples/widgets/tutorials/addressbook/part6.py | 4 ++-- examples/widgets/tutorials/addressbook/part7.py | 4 ++-- examples/widgets/tutorials/cannon/t1.py | 2 +- examples/widgets/tutorials/cannon/t10.py | 2 +- examples/widgets/tutorials/cannon/t11.py | 2 +- examples/widgets/tutorials/cannon/t12.py | 2 +- examples/widgets/tutorials/cannon/t13.py | 2 +- examples/widgets/tutorials/cannon/t14.py | 2 +- examples/widgets/tutorials/cannon/t2.py | 2 +- examples/widgets/tutorials/cannon/t3.py | 2 +- examples/widgets/tutorials/cannon/t4.py | 2 +- examples/widgets/tutorials/cannon/t5.py | 2 +- examples/widgets/tutorials/cannon/t6.py | 2 +- examples/widgets/tutorials/cannon/t7.py | 2 +- examples/widgets/tutorials/cannon/t8.py | 2 +- examples/widgets/tutorials/cannon/t9.py | 2 +- examples/xml/dombookmarks/dombookmarks.py | 2 +- 142 files changed, 173 insertions(+), 173 deletions(-) (limited to 'examples') diff --git a/examples/3d/simple3d/simple3d.py b/examples/3d/simple3d/simple3d.py index 15bd1600b..3b199c1b3 100644 --- a/examples/3d/simple3d/simple3d.py +++ b/examples/3d/simple3d/simple3d.py @@ -162,4 +162,4 @@ if __name__ == '__main__': app = QGuiApplication(sys.argv) view = Window() view.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/axcontainer/axviewer/axviewer.py b/examples/axcontainer/axviewer/axviewer.py index 50a2d3277..fd4972a34 100644 --- a/examples/axcontainer/axviewer/axviewer.py +++ b/examples/axcontainer/axviewer/axviewer.py @@ -70,7 +70,7 @@ class MainWindow(QMainWindow): def load(self): axSelect = QAxSelect(self) - if axSelect.exec_() == QDialog.Accepted: + if axSelect.exec() == QDialog.Accepted: clsid = axSelect.clsid() if not self.axWidget.setControl(clsid): QMessageBox.warning(self, "AxViewer", "Unable to load " + clsid + ".") @@ -82,4 +82,4 @@ if __name__ == '__main__': availableGeometry = mainWin.screen().availableGeometry() mainWin.resize(availableGeometry.width() / 3, availableGeometry.height() / 2) mainWin.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/audio/audio.py b/examples/charts/audio/audio.py index 13b616c65..0075139ba 100644 --- a/examples/charts/audio/audio.py +++ b/examples/charts/audio/audio.py @@ -125,4 +125,4 @@ if __name__ == '__main__': size = availableGeometry.height() * 3 / 4 mainWin.resize(size, size) mainWin.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/callout/callout.py b/examples/charts/callout/callout.py index e39ef2528..99982e690 100644 --- a/examples/charts/callout/callout.py +++ b/examples/charts/callout/callout.py @@ -255,4 +255,4 @@ if __name__ == "__main__": app = QApplication(sys.argv) v = View() v.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/chartthemes/main.py b/examples/charts/chartthemes/main.py index 58cec2d15..76c5956ab 100644 --- a/examples/charts/chartthemes/main.py +++ b/examples/charts/chartthemes/main.py @@ -394,4 +394,4 @@ if __name__ == "__main__": size = available_geometry.height() * 0.75 window.setFixedSize(size, size * 0.8) window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/donutbreakdown/donutbreakdown.py b/examples/charts/donutbreakdown/donutbreakdown.py index 27faa6e94..1fc7ff83d 100644 --- a/examples/charts/donutbreakdown/donutbreakdown.py +++ b/examples/charts/donutbreakdown/donutbreakdown.py @@ -181,4 +181,4 @@ if __name__ == "__main__": window.resize(size, size * 0.8) window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/legend/legend.py b/examples/charts/legend/legend.py index 79fabdc0c..2996904c8 100644 --- a/examples/charts/legend/legend.py +++ b/examples/charts/legend/legend.py @@ -251,4 +251,4 @@ if __name__ == "__main__": size = available_geometry.height() * 0.75 w.setFixedSize(size, size) w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/lineandbar/lineandbar.py b/examples/charts/lineandbar/lineandbar.py index 606e66415..826b62965 100644 --- a/examples/charts/lineandbar/lineandbar.py +++ b/examples/charts/lineandbar/lineandbar.py @@ -114,4 +114,4 @@ if __name__ == "__main__": window.show() window.resize(440, 300) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/linechart/linechart.py b/examples/charts/linechart/linechart.py index 0b46ff84d..b3ed655b1 100644 --- a/examples/charts/linechart/linechart.py +++ b/examples/charts/linechart/linechart.py @@ -81,4 +81,4 @@ if __name__ == "__main__": window = TestChart() window.show() window.resize(440, 300) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/logvalueaxis/logvalueaxis.py b/examples/charts/logvalueaxis/logvalueaxis.py index e13f4f8be..b84e409c4 100644 --- a/examples/charts/logvalueaxis/logvalueaxis.py +++ b/examples/charts/logvalueaxis/logvalueaxis.py @@ -91,4 +91,4 @@ if __name__ == "__main__": window.show() window.resize(800, 600) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/memoryusage/memoryusage.py b/examples/charts/memoryusage/memoryusage.py index 7ad6e3594..09655d6fa 100644 --- a/examples/charts/memoryusage/memoryusage.py +++ b/examples/charts/memoryusage/memoryusage.py @@ -127,4 +127,4 @@ if __name__ == '__main__': size = available_geometry.height() * 3 / 4 main_win.resize(size, size) main_win.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/modeldata/modeldata.py b/examples/charts/modeldata/modeldata.py index 3cfcfc329..ea2ab5afc 100644 --- a/examples/charts/modeldata/modeldata.py +++ b/examples/charts/modeldata/modeldata.py @@ -179,4 +179,4 @@ if __name__ == "__main__": app = QApplication(sys.argv) w = TableWidget() w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/nesteddonuts/nesteddonuts.py b/examples/charts/nesteddonuts/nesteddonuts.py index c42ceec14..406beb528 100644 --- a/examples/charts/nesteddonuts/nesteddonuts.py +++ b/examples/charts/nesteddonuts/nesteddonuts.py @@ -134,4 +134,4 @@ if __name__ == "__main__": app = QApplication(sys.argv) w = Widget() w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/percentbarchart/percentbarchart.py b/examples/charts/percentbarchart/percentbarchart.py index 0883a22d1..88a4e39e2 100644 --- a/examples/charts/percentbarchart/percentbarchart.py +++ b/examples/charts/percentbarchart/percentbarchart.py @@ -97,4 +97,4 @@ if __name__ == "__main__": w = MainWindow() w.resize(420, 300) w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/piechart/piechart.py b/examples/charts/piechart/piechart.py index 1980c0ba1..71c338820 100644 --- a/examples/charts/piechart/piechart.py +++ b/examples/charts/piechart/piechart.py @@ -84,4 +84,4 @@ if __name__ == "__main__": window.show() window.resize(440, 300) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/qmlpolarchart/qmlpolarchart.py b/examples/charts/qmlpolarchart/qmlpolarchart.py index ca24fdc7a..f205f8db1 100644 --- a/examples/charts/qmlpolarchart/qmlpolarchart.py +++ b/examples/charts/qmlpolarchart/qmlpolarchart.py @@ -62,4 +62,4 @@ if __name__ == '__main__': viewer.setResizeMode(QQuickView.SizeRootObjectToView) viewer.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/charts/temperaturerecords/temperaturerecords.py b/examples/charts/temperaturerecords/temperaturerecords.py index 3bb64a27f..fe4e948cc 100644 --- a/examples/charts/temperaturerecords/temperaturerecords.py +++ b/examples/charts/temperaturerecords/temperaturerecords.py @@ -94,4 +94,4 @@ if __name__ == "__main__": w = MainWindow() w.resize(600, 300) w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/corelib/settingseditor/settingseditor.py b/examples/corelib/settingseditor/settingseditor.py index 196bcc10c..2c6a0703b 100644 --- a/examples/corelib/settingseditor/settingseditor.py +++ b/examples/corelib/settingseditor/settingseditor.py @@ -187,7 +187,7 @@ class MainWindow(QMainWindow): if self.location_dialog is None: self.location_dialog = LocationDialog(self) - if self.location_dialog.exec_(): + if self.location_dialog.exec(): settings = QSettings(self.location_dialog.format(), self.location_dialog.scope(), self.location_dialog.organization(), @@ -784,4 +784,4 @@ if __name__ == '__main__': if len(sys.argv) > 1: main_win.load_ini_file(sys.argv[1]) main_win.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/corelib/threads/mandelbrot.py b/examples/corelib/threads/mandelbrot.py index e47a1f4eb..2e45afadc 100644 --- a/examples/corelib/threads/mandelbrot.py +++ b/examples/corelib/threads/mandelbrot.py @@ -384,6 +384,6 @@ if __name__ == '__main__': widget.move(geometry.topLeft() + QPoint(pos.width(), pos.height())) widget.show() - r = app.exec_() + r = app.exec() widget.thread.stop() sys.exit(r) diff --git a/examples/datavisualization/bars3d/bars3d.py b/examples/datavisualization/bars3d/bars3d.py index 0bf93940a..57e145fe8 100644 --- a/examples/datavisualization/bars3d/bars3d.py +++ b/examples/datavisualization/bars3d/bars3d.py @@ -115,4 +115,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) main_win = MainWindow() main_win.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/declarative/extending/chapter1-basics/basics.py b/examples/declarative/extending/chapter1-basics/basics.py index db508d297..f1492d959 100644 --- a/examples/declarative/extending/chapter1-basics/basics.py +++ b/examples/declarative/extending/chapter1-basics/basics.py @@ -95,7 +95,7 @@ if __name__ == '__main__': if view.status() == QQuickView.Error: sys.exit(-1) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/extending/chapter2-methods/methods.py b/examples/declarative/extending/chapter2-methods/methods.py index c0fd0050a..c9e7be8f3 100644 --- a/examples/declarative/extending/chapter2-methods/methods.py +++ b/examples/declarative/extending/chapter2-methods/methods.py @@ -102,7 +102,7 @@ if __name__ == '__main__': if view.status() == QQuickView.Error: sys.exit(-1) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/extending/chapter3-bindings/bindings.py b/examples/declarative/extending/chapter3-bindings/bindings.py index 3bb70dbab..cacac78da 100644 --- a/examples/declarative/extending/chapter3-bindings/bindings.py +++ b/examples/declarative/extending/chapter3-bindings/bindings.py @@ -106,7 +106,7 @@ if __name__ == '__main__': if view.status() == QQuickView.Error: sys.exit(-1) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/extending/chapter4-customPropertyTypes/customPropertyTypes.py b/examples/declarative/extending/chapter4-customPropertyTypes/customPropertyTypes.py index 0cd8feb61..a4a74fef4 100644 --- a/examples/declarative/extending/chapter4-customPropertyTypes/customPropertyTypes.py +++ b/examples/declarative/extending/chapter4-customPropertyTypes/customPropertyTypes.py @@ -109,7 +109,7 @@ if __name__ == '__main__': if view.status() == QQuickView.Error: sys.exit(-1) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/extending/chapter5-listproperties/listproperties.py b/examples/declarative/extending/chapter5-listproperties/listproperties.py index 4f24a3a87..eeaba0858 100644 --- a/examples/declarative/extending/chapter5-listproperties/listproperties.py +++ b/examples/declarative/extending/chapter5-listproperties/listproperties.py @@ -123,7 +123,7 @@ if __name__ == '__main__': if view.status() == QQuickView.Error: sys.exit(-1) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/scrolling/scrolling.py b/examples/declarative/scrolling/scrolling.py index be909e2d6..c585cc962 100644 --- a/examples/declarative/scrolling/scrolling.py +++ b/examples/declarative/scrolling/scrolling.py @@ -64,7 +64,7 @@ if __name__ == '__main__': sys.exit(-1) view.show() - app.exec_() + app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/signals/pytoqml1/main.py b/examples/declarative/signals/pytoqml1/main.py index fa31c50bb..3dc18adaf 100644 --- a/examples/declarative/signals/pytoqml1/main.py +++ b/examples/declarative/signals/pytoqml1/main.py @@ -62,7 +62,7 @@ if __name__ == '__main__': timer.timeout.connect(root.updateRotater) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/signals/pytoqml2/main.py b/examples/declarative/signals/pytoqml2/main.py index 97d4d96f8..30ec5a4f6 100644 --- a/examples/declarative/signals/pytoqml2/main.py +++ b/examples/declarative/signals/pytoqml2/main.py @@ -78,7 +78,7 @@ if __name__ == '__main__': timer.timeout.connect(rotatevalue.increment) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make # sure all child QML instances are destroyed in the correct order. del view diff --git a/examples/declarative/signals/qmltopy1/main.py b/examples/declarative/signals/qmltopy1/main.py index 3c0ebbeaa..d323d9a0f 100644 --- a/examples/declarative/signals/qmltopy1/main.py +++ b/examples/declarative/signals/qmltopy1/main.py @@ -80,7 +80,7 @@ if __name__ == '__main__': if view.status() == QQuickView.Error: sys.exit(-1) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/signals/qmltopy2/main.py b/examples/declarative/signals/qmltopy2/main.py index d5cb260a0..1bf22b2af 100644 --- a/examples/declarative/signals/qmltopy2/main.py +++ b/examples/declarative/signals/qmltopy2/main.py @@ -73,7 +73,7 @@ if __name__ == '__main__': if view.status() == QQuickView.Error: sys.exit(-1) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/signals/qmltopy3/main.py b/examples/declarative/signals/qmltopy3/main.py index e1a4672a8..0f6523125 100644 --- a/examples/declarative/signals/qmltopy3/main.py +++ b/examples/declarative/signals/qmltopy3/main.py @@ -64,7 +64,7 @@ if __name__ == '__main__': root.buttonClicked.connect(lambda: sayThis("clicked button (QML top-level signal)")) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/signals/qmltopy4/main.py b/examples/declarative/signals/qmltopy4/main.py index 4e58350fb..96183c02d 100644 --- a/examples/declarative/signals/qmltopy4/main.py +++ b/examples/declarative/signals/qmltopy4/main.py @@ -64,7 +64,7 @@ if __name__ == '__main__': button.clicked.connect(lambda: sayThis("clicked button (signal directly connected)")) view.show() - res = app.exec_() + res = app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/declarative/textproperties/main.py b/examples/declarative/textproperties/main.py index 3d9944bc8..48a3f1d91 100644 --- a/examples/declarative/textproperties/main.py +++ b/examples/declarative/textproperties/main.py @@ -110,4 +110,4 @@ if __name__ == '__main__': if not engine.rootObjects(): sys.exit(-1) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/declarative/usingmodel/usingmodel.py b/examples/declarative/usingmodel/usingmodel.py index 4dcb8279e..bd1fa2eba 100644 --- a/examples/declarative/usingmodel/usingmodel.py +++ b/examples/declarative/usingmodel/usingmodel.py @@ -95,7 +95,7 @@ if __name__ == '__main__': sys.exit(-1) view.show() - app.exec_() + app.exec() # Deleting the view before it goes out of scope is required to make sure all child QML instances # are destroyed in the correct order. del view diff --git a/examples/designer/taskmenuextension/main.py b/examples/designer/taskmenuextension/main.py index 883070f77..de6b772b0 100644 --- a/examples/designer/taskmenuextension/main.py +++ b/examples/designer/taskmenuextension/main.py @@ -50,4 +50,4 @@ if __name__ == '__main__': window = TicTacToe() window.state = "-X-XO----" window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.py b/examples/designer/taskmenuextension/tictactoetaskmenu.py index 6eeb8ae21..2b1db2baa 100644 --- a/examples/designer/taskmenuextension/tictactoetaskmenu.py +++ b/examples/designer/taskmenuextension/tictactoetaskmenu.py @@ -95,7 +95,7 @@ class TicTacToeTaskMenu(QPyDesignerTaskMenuExtension): def _edit_state(self): dialog = TicTacToeDialog(self._ticTacToe) dialog.set_state(self._ticTacToe.state) - if dialog.exec_() == QDialog.Accepted: + if dialog.exec() == QDialog.Accepted: self._ticTacToe.state = dialog.state() diff --git a/examples/external/matplotlib/widget3d/widget3d.py b/examples/external/matplotlib/widget3d/widget3d.py index 874e7e439..1996bf699 100644 --- a/examples/external/matplotlib/widget3d/widget3d.py +++ b/examples/external/matplotlib/widget3d/widget3d.py @@ -239,4 +239,4 @@ if __name__ == "__main__": w = ApplicationWindow() w.setFixedSize(1280, 720) w.show() - app.exec_() + app.exec() diff --git a/examples/external/matplotlib/widget_gaussian/widget_gaussian.py b/examples/external/matplotlib/widget_gaussian/widget_gaussian.py index ba790af4e..8edd902e5 100644 --- a/examples/external/matplotlib/widget_gaussian/widget_gaussian.py +++ b/examples/external/matplotlib/widget_gaussian/widget_gaussian.py @@ -109,4 +109,4 @@ if __name__ == "__main__": app = QApplication(sys.argv) w = PlotWidget() w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/external/opencv/webcam_pattern_detection.py b/examples/external/opencv/webcam_pattern_detection.py index 4f02f8d4f..a764e4c27 100644 --- a/examples/external/opencv/webcam_pattern_detection.py +++ b/examples/external/opencv/webcam_pattern_detection.py @@ -204,4 +204,4 @@ if __name__ == "__main__": app = QApplication() w = Window() w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/external/pandas/dataframe_model.py b/examples/external/pandas/dataframe_model.py index b3f92f562..f3f335764 100644 --- a/examples/external/pandas/dataframe_model.py +++ b/examples/external/pandas/dataframe_model.py @@ -116,4 +116,4 @@ if __name__ == "__main__": model = PandasModel(df) view.setModel(model) view.show() - app.exec_() + app.exec() diff --git a/examples/external/scikit/staining_colors_separation.py b/examples/external/scikit/staining_colors_separation.py index 4395aba13..250fb1716 100644 --- a/examples/external/scikit/staining_colors_separation.py +++ b/examples/external/scikit/staining_colors_separation.py @@ -181,4 +181,4 @@ if __name__ == "__main__": app = QApplication(sys.argv) w = ApplicationWindow() w.show() - app.exec_() + app.exec() diff --git a/examples/installer_test/hello.py b/examples/installer_test/hello.py index fc44277bf..b8e5df914 100644 --- a/examples/installer_test/hello.py +++ b/examples/installer_test/hello.py @@ -103,6 +103,6 @@ if __name__ == "__main__": if auto_quit: milliseconds = 2 * 1000 # run 2 second QTimer.singleShot(milliseconds, app.quit) - retcode = app.exec_() + retcode = app.exec() print("End of hello.py ", time.ctime()) sys.exit(retcode) diff --git a/examples/macextras/macpasteboardmime/macpasteboardmime.py b/examples/macextras/macpasteboardmime/macpasteboardmime.py index 35e5d6180..4a95ed83c 100644 --- a/examples/macextras/macpasteboardmime/macpasteboardmime.py +++ b/examples/macextras/macpasteboardmime/macpasteboardmime.py @@ -49,7 +49,7 @@ except ImportError: messageBox = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Critical, "QtMacExtras macpasteboardmime", "This exampe only runs on macOS and QtMacExtras must be installed to run this example.", QtWidgets.QMessageBox.Close) - messageBox.exec_() + messageBox.exec() sys.exit(1) @@ -125,4 +125,4 @@ if __name__ == '__main__': QtMacExtras.qRegisterDraggedTypes(["public.vcard"]) wid1 = TestWidget() wid1.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/multimedia/audiooutput/audiooutput.py b/examples/multimedia/audiooutput/audiooutput.py index 330c33fe3..322603c2b 100644 --- a/examples/multimedia/audiooutput/audiooutput.py +++ b/examples/multimedia/audiooutput/audiooutput.py @@ -297,4 +297,4 @@ if __name__ == '__main__': audio = AudioTest() audio.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/multimedia/camera/camera.py b/examples/multimedia/camera/camera.py index 12c8d2e97..0337ecc36 100644 --- a/examples/multimedia/camera/camera.py +++ b/examples/multimedia/camera/camera.py @@ -169,4 +169,4 @@ if __name__ == '__main__': availableGeometry = app.desktop().availableGeometry(mainWin) mainWin.resize(availableGeometry.width() / 3, availableGeometry.height() / 2) mainWin.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/multimedia/player/player.py b/examples/multimedia/player/player.py index ec8f73bc9..b2adebb5c 100644 --- a/examples/multimedia/player/player.py +++ b/examples/multimedia/player/player.py @@ -128,7 +128,7 @@ class MainWindow(QMainWindow): fileDialog.setMimeTypeFilters(supportedMimeTypes) moviesLocation = QStandardPaths.writableLocation(QStandardPaths.MoviesLocation) fileDialog.setDirectory(moviesLocation) - if fileDialog.exec_() == QDialog.Accepted: + if fileDialog.exec() == QDialog.Accepted: self.playlist.addMedia(fileDialog.selectedUrls()[0]) self.player.play() @@ -156,4 +156,4 @@ if __name__ == '__main__': availableGeometry = app.desktop().availableGeometry(mainWin) mainWin.resize(availableGeometry.width() / 3, availableGeometry.height() / 2) mainWin.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.py b/examples/network/blockingfortuneclient/blockingfortuneclient.py index 1c7e13386..50f4c1662 100644 --- a/examples/network/blockingfortuneclient/blockingfortuneclient.py +++ b/examples/network/blockingfortuneclient/blockingfortuneclient.py @@ -221,4 +221,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) client = BlockingClient() client.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/network/downloader/downloader.py b/examples/network/downloader/downloader.py index 538bb8866..a63c49be8 100644 --- a/examples/network/downloader/downloader.py +++ b/examples/network/downloader/downloader.py @@ -212,4 +212,4 @@ if __name__ == "__main__": w = DownloaderWidget() w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/network/fortuneclient/fortuneclient.py b/examples/network/fortuneclient/fortuneclient.py index 74a404d96..a94b62ec8 100644 --- a/examples/network/fortuneclient/fortuneclient.py +++ b/examples/network/fortuneclient/fortuneclient.py @@ -161,4 +161,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) client = Client() client.show() - sys.exit(client.exec_()) + sys.exit(client.exec()) diff --git a/examples/network/fortuneserver/fortuneserver.py b/examples/network/fortuneserver/fortuneserver.py index 831baaa37..d315dcf23 100644 --- a/examples/network/fortuneserver/fortuneserver.py +++ b/examples/network/fortuneserver/fortuneserver.py @@ -117,4 +117,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) server = Server() random.seed(None) - sys.exit(server.exec_()) + sys.exit(server.exec()) diff --git a/examples/network/threadedfortuneserver/threadedfortuneserver.py b/examples/network/threadedfortuneserver/threadedfortuneserver.py index f79573d69..0722d4739 100644 --- a/examples/network/threadedfortuneserver/threadedfortuneserver.py +++ b/examples/network/threadedfortuneserver/threadedfortuneserver.py @@ -151,4 +151,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) dialog = Dialog() dialog.show() - sys.exit(dialog.exec_()) + sys.exit(dialog.exec()) diff --git a/examples/opengl/contextinfo/contextinfo.py b/examples/opengl/contextinfo/contextinfo.py index ed7b8ca72..5a64f168e 100644 --- a/examples/opengl/contextinfo/contextinfo.py +++ b/examples/opengl/contextinfo/contextinfo.py @@ -62,7 +62,7 @@ except ImportError: "PyOpenGL must be installed to run this example.", QMessageBox.Close) message_box.setDetailedText("Run:\npip install PyOpenGL PyOpenGL_accelerate") - message_box.exec_() + message_box.exec() sys.exit(1) vertex_shader_source_110 = dedent(""" @@ -289,4 +289,4 @@ if __name__ == '__main__': main_window = MainWindow() main_window.show() main_window.update_description() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/opengl/hellogl2/hellogl2.py b/examples/opengl/hellogl2/hellogl2.py index a4ef3314e..6dfc032ad 100644 --- a/examples/opengl/hellogl2/hellogl2.py +++ b/examples/opengl/hellogl2/hellogl2.py @@ -66,7 +66,7 @@ except ImportError: "PyOpenGL must be installed to run this example.", QMessageBox.Close) message_box.setDetailedText("Run:\npip install PyOpenGL PyOpenGL_accelerate") - message_box.exec_() + message_box.exec() sys.exit(1) @@ -485,5 +485,5 @@ if __name__ == '__main__': main_window.resize(main_window.sizeHint()) main_window.show() - res = app.exec_() + res = app.exec() sys.exit(res) diff --git a/examples/opengl/textures/textures.py b/examples/opengl/textures/textures.py index e7362da1e..521c099b3 100644 --- a/examples/opengl/textures/textures.py +++ b/examples/opengl/textures/textures.py @@ -53,7 +53,7 @@ except ImportError: "PyOpenGL must be installed to run this example.", QtWidgets.QMessageBox.Close) messageBox.setDetailedText("Run:\npip install PyOpenGL PyOpenGL_accelerate") - messageBox.exec_() + messageBox.exec() sys.exit(1) import textures_rc @@ -228,4 +228,4 @@ if __name__ == "__main__": app = QtWidgets.QApplication(sys.argv) window = Window() window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/quick/painteditem/painteditem.py b/examples/quick/painteditem/painteditem.py index 5476bdbaf..ff744063a 100644 --- a/examples/quick/painteditem/painteditem.py +++ b/examples/quick/painteditem/painteditem.py @@ -103,4 +103,4 @@ if __name__ == "__main__": sys.exit(-1) view.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/quickcontrols2/gallery/gallery.py b/examples/quickcontrols2/gallery/gallery.py index 2b3453395..2c123fb7e 100644 --- a/examples/quickcontrols2/gallery/gallery.py +++ b/examples/quickcontrols2/gallery/gallery.py @@ -94,4 +94,4 @@ if __name__ == "__main__": window = rootObjects[0] window.setIcon(QIcon(':/qt-project.org/logos/pysidelogo.png')) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/remoteobjects/modelview/modelviewclient.py b/examples/remoteobjects/modelview/modelviewclient.py index 9142c2e9e..9025548b5 100644 --- a/examples/remoteobjects/modelview/modelviewclient.py +++ b/examples/remoteobjects/modelview/modelviewclient.py @@ -58,4 +58,4 @@ if __name__ == '__main__': view.setModel(model) view.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/remoteobjects/modelview/modelviewserver.py b/examples/remoteobjects/modelview/modelviewserver.py index 12eebb7cf..012fbf6ae 100644 --- a/examples/remoteobjects/modelview/modelviewserver.py +++ b/examples/remoteobjects/modelview/modelviewserver.py @@ -138,4 +138,4 @@ if __name__ == '__main__': QTimer.singleShot(12000, handler.remove_data) QTimer.singleShot(13000, handler.move_data) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/sql/books/createdb.py b/examples/sql/books/createdb.py index d1f624ae0..48784a88e 100644 --- a/examples/sql/books/createdb.py +++ b/examples/sql/books/createdb.py @@ -48,19 +48,19 @@ def add_book(q, title, year, authorId, genreId, rating): q.addBindValue(authorId) q.addBindValue(genreId) q.addBindValue(rating) - q.exec_() + q.exec() def add_genre(q, name): q.addBindValue(name) - q.exec_() + q.exec() return q.lastInsertId() def add_author(q, name, birthdate): q.addBindValue(name) q.addBindValue(str(birthdate)) - q.exec_() + q.exec() return q.lastInsertId() @@ -103,9 +103,9 @@ def init_db(): check(db.open) q = QSqlQuery() - check(q.exec_, BOOKS_SQL) - check(q.exec_, AUTHORS_SQL) - check(q.exec_, GENRES_SQL) + check(q.exec, BOOKS_SQL) + check(q.exec, AUTHORS_SQL) + check(q.exec, GENRES_SQL) check(q.prepare, INSERT_AUTHOR_SQL) asimovId = add_author(q, "Isaac Asimov", date(1920, 2, 1)) diff --git a/examples/sql/books/main.py b/examples/sql/books/main.py index e957869ac..3994a66b4 100644 --- a/examples/sql/books/main.py +++ b/examples/sql/books/main.py @@ -50,4 +50,4 @@ if __name__ == "__main__": window.resize(800, 600) window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/texttospeech/hello_speak/hello_speak.py b/examples/texttospeech/hello_speak/hello_speak.py index 741c7b9cb..970d58b57 100644 --- a/examples/texttospeech/hello_speak/hello_speak.py +++ b/examples/texttospeech/hello_speak/hello_speak.py @@ -106,4 +106,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) mainWin = MainWindow() mainWin.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/uitools/uiloader/uiloader.py b/examples/uitools/uiloader/uiloader.py index e214cf87d..bb48d2aa1 100644 --- a/examples/uitools/uiloader/uiloader.py +++ b/examples/uitools/uiloader/uiloader.py @@ -69,4 +69,4 @@ if __name__ == '__main__': print(loader.errorString()) sys.exit(-1) widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/webchannel/standalone/main.py b/examples/webchannel/standalone/main.py index b937b6025..0efe324eb 100644 --- a/examples/webchannel/standalone/main.py +++ b/examples/webchannel/standalone/main.py @@ -96,4 +96,4 @@ if __name__ == '__main__': dialog.displayMessage(message) dialog.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/webenginequick/nanobrowser/quicknanobrowser.py b/examples/webenginequick/nanobrowser/quicknanobrowser.py index 77af4707d..6e4d04ff3 100644 --- a/examples/webenginequick/nanobrowser/quicknanobrowser.py +++ b/examples/webenginequick/nanobrowser/quicknanobrowser.py @@ -54,7 +54,7 @@ def main(): qml_file_path = os.path.join(os.path.dirname(__file__), 'browser.qml') qml_url = QUrl.fromLocalFile(os.path.abspath(qml_file_path)) engine.load(qml_url) - app.exec_() + app.exec() if __name__ == '__main__': diff --git a/examples/webenginewidgets/simplebrowser/simplebrowser.py b/examples/webenginewidgets/simplebrowser/simplebrowser.py index 5b0d7c407..6bf487ebd 100644 --- a/examples/webenginewidgets/simplebrowser/simplebrowser.py +++ b/examples/webenginewidgets/simplebrowser/simplebrowser.py @@ -100,4 +100,4 @@ if __name__ == '__main__': availableGeometry = app.desktop().availableGeometry(mainWin) mainWin.resize(availableGeometry.width() * 2 / 3, availableGeometry.height() * 2 / 3) mainWin.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py index 4304c3899..8689c9d3f 100644 --- a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py @@ -228,7 +228,7 @@ class BookmarkWidget(QTreeView): current_item = self._current_item() open_in_new_tab_action.setEnabled(current_item is not None) remove_action.setEnabled(current_item is not None) - chosen_action = context_menu.exec_(event.globalPos()) + chosen_action = context_menu.exec(event.globalPos()) if chosen_action == open_in_new_tab_action: self.open_bookmarkInNewTab.emit(current_item.data(_url_role)) elif chosen_action == remove_action: diff --git a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py index 679c8e196..b95ccee45 100644 --- a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py @@ -204,7 +204,7 @@ class BrowserTabWidget(QTabWidget): close_tabs_to_the_right_action = context_menu.addAction("Close Tabs to the Right") close_tabs_to_the_right_action.setEnabled(index < tab_count - 1) close_tab_action = context_menu.addAction("&Close Tab") - chosen_action = context_menu.exec_(self.tabBar().mapToGlobal(point)) + chosen_action = context_menu.exec(self.tabBar().mapToGlobal(point)) if chosen_action == duplicate_tab_action: current_url = self.url() self.add_browser_tab().load(current_url) diff --git a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py index 392c6d5d6..5319d66fc 100644 --- a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py @@ -134,7 +134,7 @@ class DownloadWidget(QProgressBar): remove_action = context_menu.addAction("Remove") remove_action.setEnabled(state != QWebEngineDownloadItem.DownloadInProgress) - chosen_action = context_menu.exec_(event.globalPos()) + chosen_action = context_menu.exec(event.globalPos()) if chosen_action == launch_action: self._launch() elif chosen_action == show_in_folder_action: diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py index ee3516176..b1ca4983b 100644 --- a/examples/webenginewidgets/tabbedbrowser/main.py +++ b/examples/webenginewidgets/tabbedbrowser/main.py @@ -390,6 +390,6 @@ if __name__ == '__main__': initial_urls.append('http://qt.io') for url in initial_urls: main_win.load_url_in_new_tab(QUrl.fromUserInput(url)) - exit_code = app.exec_() + exit_code = app.exec() main_win.write_bookmarks() sys.exit(exit_code) diff --git a/examples/widgetbinding/main.py b/examples/widgetbinding/main.py index 0076e88aa..4524802f3 100644 --- a/examples/widgetbinding/main.py +++ b/examples/widgetbinding/main.py @@ -58,4 +58,4 @@ if __name__ == "__main__": app = QApplication() w = Dialog() w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/animation/animatedtiles/animatedtiles.py b/examples/widgets/animation/animatedtiles/animatedtiles.py index 5b93730fd..01828c9ec 100644 --- a/examples/widgets/animation/animatedtiles/animatedtiles.py +++ b/examples/widgets/animation/animatedtiles/animatedtiles.py @@ -265,4 +265,4 @@ if __name__ == '__main__': states.start() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/animation/appchooser/appchooser.py b/examples/widgets/animation/appchooser/appchooser.py index 046da7243..0782211d2 100644 --- a/examples/widgets/animation/appchooser/appchooser.py +++ b/examples/widgets/animation/appchooser/appchooser.py @@ -134,4 +134,4 @@ if __name__ == '__main__': window.resize(300, 300) window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/animation/easing/easing.py b/examples/widgets/animation/easing/easing.py index 6450730d0..24d37bd55 100644 --- a/examples/widgets/animation/easing/easing.py +++ b/examples/widgets/animation/easing/easing.py @@ -266,4 +266,4 @@ if __name__ == '__main__': w = Window() w.resize(600, 600) w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/animation/states/states.py b/examples/widgets/animation/states/states.py index 4e9343e13..d134f29b6 100644 --- a/examples/widgets/animation/states/states.py +++ b/examples/widgets/animation/states/states.py @@ -270,4 +270,4 @@ if __name__ == '__main__': view = QGraphicsView(scene) view.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/codeeditor/main.py b/examples/widgets/codeeditor/main.py index e3d2a9ee9..0a89160bf 100644 --- a/examples/widgets/codeeditor/main.py +++ b/examples/widgets/codeeditor/main.py @@ -49,4 +49,4 @@ if __name__ == "__main__": editor = CodeEditor() editor.setWindowTitle("Code Editor Example") editor.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/dialogs/classwizard/classwizard.py b/examples/widgets/dialogs/classwizard/classwizard.py index d6cd79884..7861bb999 100644 --- a/examples/widgets/dialogs/classwizard/classwizard.py +++ b/examples/widgets/dialogs/classwizard/classwizard.py @@ -416,4 +416,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) wizard = ClassWizard() wizard.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/dialogs/classwizard/listchooser.py b/examples/widgets/dialogs/classwizard/listchooser.py index baad72d5e..fbc29b40b 100644 --- a/examples/widgets/dialogs/classwizard/listchooser.py +++ b/examples/widgets/dialogs/classwizard/listchooser.py @@ -192,7 +192,7 @@ class SignalChooser(ListChooser): def _create_new_item(self): dialog = FunctionSignatureDialog('&Signal signature:', self) dialog.setWindowTitle('Enter Signal') - if dialog.exec_() != QDialog.Accepted: + if dialog.exec() != QDialog.Accepted: return '' return dialog.text @@ -204,7 +204,7 @@ class PropertyChooser(ListChooser): def _create_new_item(self): dialog = PropertyDialog(self) - if dialog.exec_() != QDialog.Accepted: + if dialog.exec() != QDialog.Accepted: return '' name = dialog.text property_type = dialog.property_type() diff --git a/examples/widgets/dialogs/extension/extension.py b/examples/widgets/dialogs/extension/extension.py index c053a7c8f..1ad4e08a7 100644 --- a/examples/widgets/dialogs/extension/extension.py +++ b/examples/widgets/dialogs/extension/extension.py @@ -112,4 +112,4 @@ class FindDialog(QDialog): if __name__ == '__main__': app = QApplication(sys.argv) dialog = FindDialog() - sys.exit(dialog.exec_()) + sys.exit(dialog.exec()) diff --git a/examples/widgets/dialogs/findfiles/findfiles.py b/examples/widgets/dialogs/findfiles/findfiles.py index d5746d1a4..d61fe2a4d 100644 --- a/examples/widgets/dialogs/findfiles/findfiles.py +++ b/examples/widgets/dialogs/findfiles/findfiles.py @@ -219,4 +219,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) window = Window() window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/dialogs/standarddialogs/standarddialogs.py b/examples/widgets/dialogs/standarddialogs/standarddialogs.py index 6177238e3..86397adc2 100644 --- a/examples/widgets/dialogs/standarddialogs/standarddialogs.py +++ b/examples/widgets/dialogs/standarddialogs/standarddialogs.py @@ -412,7 +412,7 @@ class Dialog(QDialog): QMessageBox.NoButton, self) msg_box.addButton("Save &Again", QMessageBox.AcceptRole) msg_box.addButton("&Continue", QMessageBox.RejectRole) - if msg_box.exec_() == QMessageBox.AcceptRole: + if msg_box.exec() == QMessageBox.AcceptRole: self._warning_label.setText("Save Again") else: self._warning_label.setText("Continue") @@ -434,4 +434,4 @@ if __name__ == '__main__': dialog.resize(availableGeometry.width() / 3, availableGeometry.height() * 2 / 3) dialog.move((availableGeometry.width() - dialog.width()) / 2, (availableGeometry.height() - dialog.height()) / 2) - sys.exit(dialog.exec_()) + sys.exit(dialog.exec()) diff --git a/examples/widgets/dialogs/trivialwizard/trivialwizard.py b/examples/widgets/dialogs/trivialwizard/trivialwizard.py index 32cc1aabe..9b5c07255 100644 --- a/examples/widgets/dialogs/trivialwizard/trivialwizard.py +++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.py @@ -98,4 +98,4 @@ if __name__ == '__main__': wizard.setWindowTitle("Trivial Wizard") wizard.show() - sys.exit(wizard.exec_()) + sys.exit(wizard.exec()) diff --git a/examples/widgets/draganddrop/draggabletext/draggabletext.py b/examples/widgets/draganddrop/draggabletext/draggabletext.py index 2c54fe97b..9595b0d2c 100644 --- a/examples/widgets/draganddrop/draggabletext/draggabletext.py +++ b/examples/widgets/draganddrop/draggabletext/draggabletext.py @@ -74,7 +74,7 @@ class DragLabel(QLabel): drag.setPixmap(pixmap) drag.setHotSpot(hot_spot) - drop_action = drag.exec_(Qt.CopyAction | Qt.MoveAction, Qt.CopyAction) + drop_action = drag.exec(Qt.CopyAction | Qt.MoveAction, Qt.CopyAction) if drop_action == Qt.MoveAction: self.close() @@ -153,4 +153,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) window = DragWidget() window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/effects/lighting.py b/examples/widgets/effects/lighting.py index 44856b20b..ec8f945e1 100644 --- a/examples/widgets/effects/lighting.py +++ b/examples/widgets/effects/lighting.py @@ -144,4 +144,4 @@ if __name__ == '__main__': lighting.resize(640, 480) lighting.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/gallery/main.py b/examples/widgets/gallery/main.py index cbc499244..c3602321b 100644 --- a/examples/widgets/gallery/main.py +++ b/examples/widgets/gallery/main.py @@ -53,4 +53,4 @@ if __name__ == '__main__': app = QApplication() gallery = WidgetGallery() gallery.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/graphicsview/anchorlayout/anchorlayout.py b/examples/widgets/graphicsview/anchorlayout/anchorlayout.py index 80a603e86..2c5e16347 100644 --- a/examples/widgets/graphicsview/anchorlayout/anchorlayout.py +++ b/examples/widgets/graphicsview/anchorlayout/anchorlayout.py @@ -125,4 +125,4 @@ if __name__ == '__main__': view = QGraphicsView(scene) view.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/graphicsview/collidingmice/collidingmice.py b/examples/widgets/graphicsview/collidingmice/collidingmice.py index 58cae55be..78fbe8041 100644 --- a/examples/widgets/graphicsview/collidingmice/collidingmice.py +++ b/examples/widgets/graphicsview/collidingmice/collidingmice.py @@ -215,4 +215,4 @@ if __name__ == '__main__': timer = QTimer() timer.timeout.connect(scene.advance) timer.start(1000 / 33) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.py b/examples/widgets/graphicsview/diagramscene/diagramscene.py index 92c75effc..bd3e4a4c3 100644 --- a/examples/widgets/graphicsview/diagramscene/diagramscene.py +++ b/examples/widgets/graphicsview/diagramscene/diagramscene.py @@ -247,7 +247,7 @@ class DiagramItem(QGraphicsPolygonItem): def contextMenuEvent(self, event): self.scene().clearSelection() self.setSelected(True) - self._my_context_menu.exec_(event.screenPos()) + self._my_context_menu.exec(event.screenPos()) def itemChange(self, change, value): if change == QGraphicsItem.ItemPositionChange: @@ -833,4 +833,4 @@ if __name__ == '__main__': main_window.setGeometry(100, 100, 800, 500) main_window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py index 77dd4d51f..8732c1c67 100644 --- a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py +++ b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py @@ -124,7 +124,7 @@ class ColorItem(QGraphicsItem): drag.setPixmap(pixmap) drag.setHotSpot(QPoint(15, 20)) - drag.exec_() + drag.exec() self.setCursor(Qt.OpenHandCursor) def mouseReleaseEvent(self, event): @@ -290,4 +290,4 @@ if __name__== '__main__': view.setWindowTitle("Drag and Drop Robot") view.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/graphicsview/elasticnodes/elasticnodes.py b/examples/widgets/graphicsview/elasticnodes/elasticnodes.py index b495a8f44..02a91a06d 100644 --- a/examples/widgets/graphicsview/elasticnodes/elasticnodes.py +++ b/examples/widgets/graphicsview/elasticnodes/elasticnodes.py @@ -428,4 +428,4 @@ if __name__ == "__main__": widget = GraphWidget() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/imageviewer/imageviewer.py b/examples/widgets/imageviewer/imageviewer.py index 3aacdb9fa..ebcae5fa4 100644 --- a/examples/widgets/imageviewer/imageviewer.py +++ b/examples/widgets/imageviewer/imageviewer.py @@ -138,7 +138,7 @@ class ImageViewer(QMainWindow): def _open(self): dialog = QFileDialog(self, "Open File") self._initialize_image_filedialog(dialog, QFileDialog.AcceptOpen) - while (dialog.exec_() == QDialog.Accepted + while (dialog.exec() == QDialog.Accepted and not self.load_file(dialog.selectedFiles()[0])): pass @@ -146,7 +146,7 @@ class ImageViewer(QMainWindow): def _save_as(self): dialog = QFileDialog(self, "Save File As") self._initialize_image_filedialog(dialog, QFileDialog.AcceptSave) - while (dialog.exec_() == QDialog.Accepted + while (dialog.exec() == QDialog.Accepted and not self._save_file(dialog.selectedFiles()[0])): pass @@ -154,7 +154,7 @@ class ImageViewer(QMainWindow): def _print_(self): printer = QPrinter() dialog = QPrintDialog(printer, self) - if dialog.exec_() == QDialog.Accepted: + if dialog.exec() == QDialog.Accepted: painter = QPainter(printer) pixmap = self._image_label.pixmap() rect = painter.viewport() diff --git a/examples/widgets/imageviewer/main.py b/examples/widgets/imageviewer/main.py index 3fc729ddb..39db14e69 100644 --- a/examples/widgets/imageviewer/main.py +++ b/examples/widgets/imageviewer/main.py @@ -61,4 +61,4 @@ if __name__ == '__main__': sys.exit(-1) image_viewer.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/itemviews/addressbook/adddialogwidget.py b/examples/widgets/itemviews/addressbook/adddialogwidget.py index 302275088..eb848c4d6 100644 --- a/examples/widgets/itemviews/addressbook/adddialogwidget.py +++ b/examples/widgets/itemviews/addressbook/adddialogwidget.py @@ -96,7 +96,7 @@ if __name__ == "__main__": app = QApplication(sys.argv) dialog = AddDialogWidget() - if (dialog.exec_()): + if (dialog.exec()): name = dialog.name address = dialog.address print("Name:" + name) diff --git a/examples/widgets/itemviews/addressbook/addressbook.py b/examples/widgets/itemviews/addressbook/addressbook.py index 1b689f2ee..89518f63e 100644 --- a/examples/widgets/itemviews/addressbook/addressbook.py +++ b/examples/widgets/itemviews/addressbook/addressbook.py @@ -128,4 +128,4 @@ if __name__ == "__main__": app = QApplication(sys.argv) mw = MainWindow() mw.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/itemviews/addressbook/addresswidget.py b/examples/widgets/itemviews/addressbook/addresswidget.py index 111e9d1cd..f0778d19f 100644 --- a/examples/widgets/itemviews/addressbook/addresswidget.py +++ b/examples/widgets/itemviews/addressbook/addresswidget.py @@ -78,7 +78,7 @@ class AddressWidget(QTabWidget): if name is None and address is None: add_dialog = AddDialogWidget() - if add_dialog.exec_(): + if add_dialog.exec(): name = add_dialog.name address = add_dialog.address @@ -147,7 +147,7 @@ class AddressWidget(QTabWidget): add_dialog._address_text.setText(address) # If the address is different, add it to the model. - if add_dialog.exec_(): + if add_dialog.exec(): new_address = add_dialog.address if new_address != address: ix = self._table_model.index(row, 1, QModelIndex()) @@ -246,4 +246,4 @@ if __name__ == "__main__": app = QApplication(sys.argv) address_widget = AddressWidget() address_widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/itemviews/addressbook/newaddresstab.py b/examples/widgets/itemviews/addressbook/newaddresstab.py index d4e981a01..63ccbcc30 100644 --- a/examples/widgets/itemviews/addressbook/newaddresstab.py +++ b/examples/widgets/itemviews/addressbook/newaddresstab.py @@ -72,7 +72,7 @@ class NewAddressTab(QWidget): def add_entry(self): add_dialog = AddDialogWidget() - if add_dialog.exec_(): + if add_dialog.exec(): name = add_dialog.name address = add_dialog.address self.send_details.emit(name, address) @@ -91,4 +91,4 @@ if __name__ == "__main__": new_address_tab = NewAddressTab() new_address_tab.send_details.connect(print_address) new_address_tab.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/itemviews/basicfiltermodel/basicsortfiltermodel.py b/examples/widgets/itemviews/basicfiltermodel/basicsortfiltermodel.py index 657b9637b..93f2fe8ce 100644 --- a/examples/widgets/itemviews/basicfiltermodel/basicsortfiltermodel.py +++ b/examples/widgets/itemviews/basicfiltermodel/basicsortfiltermodel.py @@ -210,4 +210,4 @@ if __name__ == '__main__': window = Window() window.set_source_model(create_mail_model(window)) window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/itemviews/fetchmore/fetchmore.py b/examples/widgets/itemviews/fetchmore/fetchmore.py index a090a8a89..e496b41f3 100644 --- a/examples/widgets/itemviews/fetchmore/fetchmore.py +++ b/examples/widgets/itemviews/fetchmore/fetchmore.py @@ -173,4 +173,4 @@ if __name__ == '__main__': window.resize(400, 500) window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/itemviews/jsonmodel/jsonmodel.py b/examples/widgets/itemviews/jsonmodel/jsonmodel.py index 16beb3253..5fa324a03 100644 --- a/examples/widgets/itemviews/jsonmodel/jsonmodel.py +++ b/examples/widgets/itemviews/jsonmodel/jsonmodel.py @@ -357,4 +357,4 @@ if __name__ == "__main__": view.header().setSectionResizeMode(0, QHeaderView.Stretch) view.setAlternatingRowColors(True) view.resize(500, 300) - app.exec_() + app.exec() diff --git a/examples/widgets/itemviews/stardelegate/stardelegate.py b/examples/widgets/itemviews/stardelegate/stardelegate.py index e8ae0e252..d283bc955 100644 --- a/examples/widgets/itemviews/stardelegate/stardelegate.py +++ b/examples/widgets/itemviews/stardelegate/stardelegate.py @@ -171,4 +171,4 @@ if __name__ == "__main__": table_widget.resize(500, 300) table_widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/layouts/basiclayouts/basiclayouts.py b/examples/widgets/layouts/basiclayouts/basiclayouts.py index 1a0288209..a115518f2 100644 --- a/examples/widgets/layouts/basiclayouts/basiclayouts.py +++ b/examples/widgets/layouts/basiclayouts/basiclayouts.py @@ -135,4 +135,4 @@ class Dialog(QDialog): if __name__ == '__main__': app = QApplication(sys.argv) dialog = Dialog() - sys.exit(dialog.exec_()) + sys.exit(dialog.exec()) diff --git a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py index 5c4abeb3e..994a6fb45 100644 --- a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py +++ b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py @@ -167,4 +167,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) dialog = Dialog() - dialog.exec_() + dialog.exec() diff --git a/examples/widgets/layouts/flowlayout/flowlayout.py b/examples/widgets/layouts/flowlayout/flowlayout.py index 959f80a0e..431515687 100644 --- a/examples/widgets/layouts/flowlayout/flowlayout.py +++ b/examples/widgets/layouts/flowlayout/flowlayout.py @@ -157,4 +157,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) main_win = Window() main_win.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/mainwindows/application/application.py b/examples/widgets/mainwindows/application/application.py index dc86b5dd4..36352cead 100644 --- a/examples/widgets/mainwindows/application/application.py +++ b/examples/widgets/mainwindows/application/application.py @@ -290,4 +290,4 @@ if __name__ == '__main__': if options.file: main_win.load_file(options.file) main_win.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/mainwindows/dockwidgets/dockwidgets.py b/examples/widgets/mainwindows/dockwidgets/dockwidgets.py index 0ef54f37b..61b1dd781 100644 --- a/examples/widgets/mainwindows/dockwidgets/dockwidgets.py +++ b/examples/widgets/mainwindows/dockwidgets/dockwidgets.py @@ -121,7 +121,7 @@ class MainWindow(QMainWindow): printer = QPrinter() dlg = QPrintDialog(printer, self) - if dlg.exec_() != QDialog.Accepted: + if dlg.exec() != QDialog.Accepted: return document.print_(printer) @@ -133,7 +133,7 @@ class MainWindow(QMainWindow): dialog.setMimeTypeFilters(['text/html']) dialog.setAcceptMode(QFileDialog.AcceptSave) dialog.setDefaultSuffix('html') - if dialog.exec_() != QDialog.Accepted: + if dialog.exec() != QDialog.Accepted: return filename = dialog.selectedFiles()[0] @@ -307,4 +307,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) main_win = MainWindow() main_win.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/mainwindows/mdi/mdi.py b/examples/widgets/mainwindows/mdi/mdi.py index a4846442e..29ee71204 100644 --- a/examples/widgets/mainwindows/mdi/mdi.py +++ b/examples/widgets/mainwindows/mdi/mdi.py @@ -465,4 +465,4 @@ if __name__ == '__main__': for f in options.files: main_win.load(f) main_win.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.py b/examples/widgets/painting/basicdrawing/basicdrawing.py index 998ccd9c1..941fe4256 100644 --- a/examples/widgets/painting/basicdrawing/basicdrawing.py +++ b/examples/widgets/painting/basicdrawing/basicdrawing.py @@ -348,4 +348,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) window = Window() window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/painting/concentriccircles/concentriccircles.py b/examples/widgets/painting/concentriccircles/concentriccircles.py index dbba93b58..d3df51099 100644 --- a/examples/widgets/painting/concentriccircles/concentriccircles.py +++ b/examples/widgets/painting/concentriccircles/concentriccircles.py @@ -143,4 +143,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) window = Window() window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/painting/painter/painter.py b/examples/widgets/painting/painter/painter.py index c9e2e4a10..3d5d95f10 100644 --- a/examples/widgets/painting/painter/painter.py +++ b/examples/widgets/painting/painter/painter.py @@ -191,7 +191,7 @@ class MainWindow(QMainWindow): QStandardPaths.writableLocation(QStandardPaths.PicturesLocation) ) - if dialog.exec_() == QFileDialog.Accepted: + if dialog.exec() == QFileDialog.Accepted: if dialog.selectedFiles(): self.painter_widget.save(dialog.selectedFiles()[0]) @@ -207,7 +207,7 @@ class MainWindow(QMainWindow): QStandardPaths.writableLocation(QStandardPaths.PicturesLocation) ) - if dialog.exec_() == QFileDialog.Accepted: + if dialog.exec() == QFileDialog.Accepted: if dialog.selectedFiles(): self.painter_widget.load(dialog.selectedFiles()[0]) @@ -235,4 +235,4 @@ if __name__ == "__main__": w = MainWindow() w.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/richtext/orderform/orderform.py b/examples/widgets/richtext/orderform/orderform.py index 323be365d..ce0569c47 100644 --- a/examples/widgets/richtext/orderform/orderform.py +++ b/examples/widgets/richtext/orderform/orderform.py @@ -197,7 +197,7 @@ class MainWindow(QMainWindow): def open_dialog(self): dialog = DetailsDialog("Enter Customer Details", self) - if dialog.exec_() == QDialog.Accepted: + if dialog.exec() == QDialog.Accepted: self.create_letter(dialog.sender_name(), dialog.sender_address(), dialog.order_items(), dialog.send_offers()) @@ -211,7 +211,7 @@ class MainWindow(QMainWindow): if editor.textCursor().hasSelection(): dialog.addEnabledOption(QAbstractPrintDialog.PrintSelection) - if dialog.exec_() != QDialog.Accepted: + if dialog.exec() != QDialog.Accepted: return editor.print_(printer) @@ -299,4 +299,4 @@ if __name__ == '__main__': window.resize(640, 480) window.show() window.create_sample() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py index 97373773e..de86e02f8 100644 --- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py +++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py @@ -144,4 +144,4 @@ if __name__ == '__main__': window.resize(640, 512) window.show() window.open_file(os.fspath(Path(__file__).resolve())) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/richtext/textobject/textobject.py b/examples/widgets/richtext/textobject/textobject.py index 3877ed4e8..bb0c0b168 100644 --- a/examples/widgets/richtext/textobject/textobject.py +++ b/examples/widgets/richtext/textobject/textobject.py @@ -139,4 +139,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) window = Window() window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/state-machine/eventtrans/eventtrans.py b/examples/widgets/state-machine/eventtrans/eventtrans.py index 8ed1ccc9c..44aca37f8 100644 --- a/examples/widgets/state-machine/eventtrans/eventtrans.py +++ b/examples/widgets/state-machine/eventtrans/eventtrans.py @@ -92,4 +92,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) main_win = MainWindow() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/state-machine/factstates/factstates.py b/examples/widgets/state-machine/factstates/factstates.py index 053e89908..e8ca0ef43 100644 --- a/examples/widgets/state-machine/factstates/factstates.py +++ b/examples/widgets/state-machine/factstates/factstates.py @@ -124,4 +124,4 @@ if __name__ == '__main__': machine.finished.connect(app.quit) machine.start() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/state-machine/pingpong/pingpong.py b/examples/widgets/state-machine/pingpong/pingpong.py index ec4d7cfec..cd047a29d 100644 --- a/examples/widgets/state-machine/pingpong/pingpong.py +++ b/examples/widgets/state-machine/pingpong/pingpong.py @@ -105,4 +105,4 @@ if __name__ == '__main__': machine.setInitialState(group) machine.start() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/state-machine/rogue/rogue.py b/examples/widgets/state-machine/rogue/rogue.py index 5bbc7dabc..acf213ae6 100644 --- a/examples/widgets/state-machine/rogue/rogue.py +++ b/examples/widgets/state-machine/rogue/rogue.py @@ -212,4 +212,4 @@ if __name__ == '__main__': import sys app = QApplication(sys.argv) main_win = MainWindow() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/state-machine/trafficlight/trafficlight.py b/examples/widgets/state-machine/trafficlight/trafficlight.py index 3964c4eb8..4bfced01f 100644 --- a/examples/widgets/state-machine/trafficlight/trafficlight.py +++ b/examples/widgets/state-machine/trafficlight/trafficlight.py @@ -147,4 +147,4 @@ if __name__ == '__main__': widget = TrafficLight() widget.resize(110, 300) widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/state-machine/twowaybutton/twowaybutton.py b/examples/widgets/state-machine/twowaybutton/twowaybutton.py index 6b3c58359..d519c4f2a 100644 --- a/examples/widgets/state-machine/twowaybutton/twowaybutton.py +++ b/examples/widgets/state-machine/twowaybutton/twowaybutton.py @@ -69,4 +69,4 @@ if __name__ == '__main__': machine.start() button.resize(100, 50) button.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/systray/main.py b/examples/widgets/systray/main.py index 58acbb93b..7c9b3eee4 100644 --- a/examples/widgets/systray/main.py +++ b/examples/widgets/systray/main.py @@ -55,4 +55,4 @@ if __name__ == "__main__": window = Window() window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tetrix/tetrix.py b/examples/widgets/tetrix/tetrix.py index 37b0ad36a..1427c9770 100644 --- a/examples/widgets/tetrix/tetrix.py +++ b/examples/widgets/tetrix/tetrix.py @@ -504,4 +504,4 @@ if __name__ == '__main__': window = TetrixWindow() window.show() random.seed(None) - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/threads/thread_signals.py b/examples/widgets/threads/thread_signals.py index 60daac198..43c79f4b7 100644 --- a/examples/widgets/threads/thread_signals.py +++ b/examples/widgets/threads/thread_signals.py @@ -97,4 +97,4 @@ if __name__ == "__main__": app = QApplication(sys.argv) window = MainForm() window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/addressbook/part1.py b/examples/widgets/tutorials/addressbook/part1.py index 1970b31a7..23d438416 100644 --- a/examples/widgets/tutorials/addressbook/part1.py +++ b/examples/widgets/tutorials/addressbook/part1.py @@ -74,4 +74,4 @@ if __name__ == '__main__': address_book = AddressBook() address_book.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/addressbook/part2.py b/examples/widgets/tutorials/addressbook/part2.py index fe823742f..a5f91a5e7 100644 --- a/examples/widgets/tutorials/addressbook/part2.py +++ b/examples/widgets/tutorials/addressbook/part2.py @@ -181,4 +181,4 @@ if __name__ == '__main__': address_book = AddressBook() address_book.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/addressbook/part3.py b/examples/widgets/tutorials/addressbook/part3.py index c5ff6e732..3053dd468 100644 --- a/examples/widgets/tutorials/addressbook/part3.py +++ b/examples/widgets/tutorials/addressbook/part3.py @@ -246,4 +246,4 @@ if __name__ == '__main__': address_book = AddressBook() address_book.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/addressbook/part4.py b/examples/widgets/tutorials/addressbook/part4.py index 013f5610d..87f196436 100644 --- a/examples/widgets/tutorials/addressbook/part4.py +++ b/examples/widgets/tutorials/addressbook/part4.py @@ -300,4 +300,4 @@ if __name__ == '__main__': address_book = AddressBook() address_book.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/addressbook/part5.py b/examples/widgets/tutorials/addressbook/part5.py index d43c2fd27..c8081ddab 100644 --- a/examples/widgets/tutorials/addressbook/part5.py +++ b/examples/widgets/tutorials/addressbook/part5.py @@ -267,7 +267,7 @@ class AddressBook(QWidget): def find_contact(self): self.dialog.show() - if self.dialog.exec_() == QDialog.Accepted: + if self.dialog.exec() == QDialog.Accepted: contact_name = self.dialog.get_find_text() if contact_name in self.contacts: @@ -361,4 +361,4 @@ if __name__ == '__main__': address_book = AddressBook() address_book.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/addressbook/part6.py b/examples/widgets/tutorials/addressbook/part6.py index f96a55e17..1d43805e7 100644 --- a/examples/widgets/tutorials/addressbook/part6.py +++ b/examples/widgets/tutorials/addressbook/part6.py @@ -277,7 +277,7 @@ class AddressBook(QWidget): def find_contact(self): self.dialog.show() - if self.dialog.exec_() == QDialog.Accepted: + if self.dialog.exec() == QDialog.Accepted: contact_name = self.dialog.get_find_text() if contact_name in self.contacts: @@ -424,4 +424,4 @@ if __name__ == '__main__': address_book = AddressBook() address_book.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/addressbook/part7.py b/examples/widgets/tutorials/addressbook/part7.py index a926d62eb..26688c428 100644 --- a/examples/widgets/tutorials/addressbook/part7.py +++ b/examples/widgets/tutorials/addressbook/part7.py @@ -283,7 +283,7 @@ class AddressBook(QWidget): def find_contact(self): self.dialog.show() - if self.dialog.exec_() == QDialog.Accepted: + if self.dialog.exec() == QDialog.Accepted: contact_name = self.dialog.get_find_text() if contact_name in self.contacts: @@ -476,4 +476,4 @@ if __name__ == '__main__': address_book = AddressBook() address_book.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t1.py b/examples/widgets/tutorials/cannon/t1.py index f3b4f9112..2da78ccf1 100644 --- a/examples/widgets/tutorials/cannon/t1.py +++ b/examples/widgets/tutorials/cannon/t1.py @@ -55,4 +55,4 @@ if __name__ == '__main__': hello.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t10.py b/examples/widgets/tutorials/cannon/t10.py index 524f44fc9..ed3d9fce3 100644 --- a/examples/widgets/tutorials/cannon/t10.py +++ b/examples/widgets/tutorials/cannon/t10.py @@ -188,4 +188,4 @@ if __name__ == '__main__': widget = MyWidget() widget.setGeometry(100, 100, 500, 355) widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t11.py b/examples/widgets/tutorials/cannon/t11.py index ce4e4470b..f297a14b4 100644 --- a/examples/widgets/tutorials/cannon/t11.py +++ b/examples/widgets/tutorials/cannon/t11.py @@ -260,4 +260,4 @@ if __name__ == '__main__': widget = MyWidget() widget.setGeometry(100, 100, 500, 355) widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t12.py b/examples/widgets/tutorials/cannon/t12.py index 6e7d42218..f2c6ea08c 100644 --- a/examples/widgets/tutorials/cannon/t12.py +++ b/examples/widgets/tutorials/cannon/t12.py @@ -311,4 +311,4 @@ if __name__ == '__main__': widget = MyWidget() widget.setGeometry(100, 100, 500, 355) widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t13.py b/examples/widgets/tutorials/cannon/t13.py index 9214611bd..aa00825aa 100644 --- a/examples/widgets/tutorials/cannon/t13.py +++ b/examples/widgets/tutorials/cannon/t13.py @@ -392,4 +392,4 @@ if __name__ == '__main__': board = GameBoard() board.setGeometry(100, 100, 500, 355) board.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t14.py b/examples/widgets/tutorials/cannon/t14.py index 3fd298e4d..0e8318ebe 100644 --- a/examples/widgets/tutorials/cannon/t14.py +++ b/examples/widgets/tutorials/cannon/t14.py @@ -445,4 +445,4 @@ if __name__ == '__main__': board = GameBoard() board.setGeometry(100, 100, 500, 355) board.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t2.py b/examples/widgets/tutorials/cannon/t2.py index a912db39b..1205a1328 100644 --- a/examples/widgets/tutorials/cannon/t2.py +++ b/examples/widgets/tutorials/cannon/t2.py @@ -59,4 +59,4 @@ if __name__ == '__main__': quit.clicked.connect(app.quit) quit.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t3.py b/examples/widgets/tutorials/cannon/t3.py index cc551beda..fbbb9b71e 100644 --- a/examples/widgets/tutorials/cannon/t3.py +++ b/examples/widgets/tutorials/cannon/t3.py @@ -60,4 +60,4 @@ if __name__ == '__main__': quit.clicked.connect(app.quit) window.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t4.py b/examples/widgets/tutorials/cannon/t4.py index 686358e36..b309c7bff 100644 --- a/examples/widgets/tutorials/cannon/t4.py +++ b/examples/widgets/tutorials/cannon/t4.py @@ -65,4 +65,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) widget = MyWidget() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t5.py b/examples/widgets/tutorials/cannon/t5.py index 352d334f9..a4324a633 100644 --- a/examples/widgets/tutorials/cannon/t5.py +++ b/examples/widgets/tutorials/cannon/t5.py @@ -76,4 +76,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) widget = MyWidget() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t6.py b/examples/widgets/tutorials/cannon/t6.py index e9be01413..c30fbfc6d 100644 --- a/examples/widgets/tutorials/cannon/t6.py +++ b/examples/widgets/tutorials/cannon/t6.py @@ -86,4 +86,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) widget = MyWidget() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t7.py b/examples/widgets/tutorials/cannon/t7.py index 700185f41..f1c6798bb 100644 --- a/examples/widgets/tutorials/cannon/t7.py +++ b/examples/widgets/tutorials/cannon/t7.py @@ -108,4 +108,4 @@ if __name__ == '__main__': app = QApplication(sys.argv) widget = MyWidget() widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t8.py b/examples/widgets/tutorials/cannon/t8.py index 20763741f..cc54194cf 100644 --- a/examples/widgets/tutorials/cannon/t8.py +++ b/examples/widgets/tutorials/cannon/t8.py @@ -151,4 +151,4 @@ if __name__ == '__main__': widget = MyWidget() widget.setGeometry(100, 100, 500, 355) widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/widgets/tutorials/cannon/t9.py b/examples/widgets/tutorials/cannon/t9.py index ce36a8b89..36dcf8fb1 100644 --- a/examples/widgets/tutorials/cannon/t9.py +++ b/examples/widgets/tutorials/cannon/t9.py @@ -158,4 +158,4 @@ if __name__ == '__main__': widget = MyWidget() widget.setGeometry(100, 100, 500, 355) widget.show() - sys.exit(app.exec_()) + sys.exit(app.exec()) diff --git a/examples/xml/dombookmarks/dombookmarks.py b/examples/xml/dombookmarks/dombookmarks.py index af9c00959..6a97c8cc6 100644 --- a/examples/xml/dombookmarks/dombookmarks.py +++ b/examples/xml/dombookmarks/dombookmarks.py @@ -263,4 +263,4 @@ if __name__ == '__main__': main_win = MainWindow() main_win.show() main_win.open() - sys.exit(app.exec_()) + sys.exit(app.exec()) -- cgit v1.2.3