aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-02-24 16:32:14 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-02-25 13:05:42 +0100
commit5d34d60418b15d4d6837d0a1333f2b57631309eb (patch)
tree07bbd5759cb1c4e212d51ffbe994365788623bd3
parentae5d4c59b54de4523f49f00ca8166785ab22fbd8 (diff)
Examples: Adapt to new qApp variable
Amends d579912b31d7cfa7b0b216916fbbf3eb632a9d9d. Task-number: PYSIDE-571 Change-Id: Ide49ef2c9f99335b5019daea7d27cd1d86e896a4 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--examples/corelib/tools/codecs/codecs.py2
-rw-r--r--examples/corelib/tools/settingseditor/settingseditor.py2
-rw-r--r--examples/opengl/grabber.py2
-rw-r--r--examples/opengl/textures/textures.py2
-rw-r--r--examples/tutorial/t10.py2
-rw-r--r--examples/tutorial/t11.py2
-rw-r--r--examples/tutorial/t12.py2
-rw-r--r--examples/tutorial/t13.py2
-rw-r--r--examples/tutorial/t14.py2
-rw-r--r--examples/tutorial/t4.py2
-rw-r--r--examples/tutorial/t5.py2
-rw-r--r--examples/tutorial/t6.py2
-rw-r--r--examples/tutorial/t7.py2
-rw-r--r--examples/tutorial/t8.py2
-rw-r--r--examples/tutorial/t9.py2
-rw-r--r--examples/widgets/dialogs/findfiles.py2
-rw-r--r--examples/widgets/itemviews/fetchmore.py4
-rw-r--r--examples/widgets/mainwindows/application/application.py2
-rw-r--r--examples/widgets/richtext/syntaxhighlighter.py4
-rw-r--r--examples/widgets/widgets/tetrix.py2
-rw-r--r--examples/xml/dombookmarks/dombookmarks.py2
21 files changed, 23 insertions, 23 deletions
diff --git a/examples/corelib/tools/codecs/codecs.py b/examples/corelib/tools/codecs/codecs.py
index c90096ef0..a3c063c04 100644
--- a/examples/corelib/tools/codecs/codecs.py
+++ b/examples/corelib/tools/codecs/codecs.py
@@ -164,7 +164,7 @@ class MainWindow(QtWidgets.QMainWindow):
self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about)
self.aboutQtAct = QtWidgets.QAction("About &Qt", self,
- triggered=QtWidgets.qApp.aboutQt)
+ triggered=qApp.aboutQt)
def createMenus(self):
self.saveAsMenu = QtWidgets.QMenu("&Save As", self)
diff --git a/examples/corelib/tools/settingseditor/settingseditor.py b/examples/corelib/tools/settingseditor/settingseditor.py
index 9d691046f..4cd262568 100644
--- a/examples/corelib/tools/settingseditor/settingseditor.py
+++ b/examples/corelib/tools/settingseditor/settingseditor.py
@@ -146,7 +146,7 @@ class MainWindow(QtWidgets.QMainWindow):
self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about)
self.aboutQtAct = QtWidgets.QAction("About &Qt", self,
- triggered=QtWidgets.qApp.aboutQt)
+ triggered=qApp.aboutQt)
def createMenus(self):
self.fileMenu = self.menuBar().addMenu("&File")
diff --git a/examples/opengl/grabber.py b/examples/opengl/grabber.py
index c376ab7ae..d4b625718 100644
--- a/examples/opengl/grabber.py
+++ b/examples/opengl/grabber.py
@@ -370,7 +370,7 @@ class MainWindow(QtWidgets.QMainWindow):
self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about)
self.aboutQtAct = QtWidgets.QAction("About &Qt", self,
- triggered=QtWidgets.qApp.aboutQt)
+ triggered=qApp.aboutQt)
def createMenus(self):
self.fileMenu = self.menuBar().addMenu("&File")
diff --git a/examples/opengl/textures/textures.py b/examples/opengl/textures/textures.py
index c8b421749..9730cf078 100644
--- a/examples/opengl/textures/textures.py
+++ b/examples/opengl/textures/textures.py
@@ -204,7 +204,7 @@ class Window(QtWidgets.QWidget):
mainLayout.addWidget(self.glWidgets[i][j], i, j)
self.glWidgets[i][j].clicked.connect(self.setCurrentGlWidget)
- QtWidgets.qApp.lastWindowClosed.connect(self.glWidgets[i][j].freeGLResources)
+ qApp.lastWindowClosed.connect(self.glWidgets[i][j].freeGLResources)
self.setLayout(mainLayout)
diff --git a/examples/tutorial/t10.py b/examples/tutorial/t10.py
index 00ab1f889..12847a002 100644
--- a/examples/tutorial/t10.py
+++ b/examples/tutorial/t10.py
@@ -148,7 +148,7 @@ class MyWidget(QtWidgets.QWidget):
quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
angle = LCDRange()
angle.setRange(5, 70)
diff --git a/examples/tutorial/t11.py b/examples/tutorial/t11.py
index 801a2c0a0..cc391201b 100644
--- a/examples/tutorial/t11.py
+++ b/examples/tutorial/t11.py
@@ -210,7 +210,7 @@ class MyWidget(QtWidgets.QWidget):
quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
angle = LCDRange()
angle.setRange(5, 70)
diff --git a/examples/tutorial/t12.py b/examples/tutorial/t12.py
index ecafe23da..40945290a 100644
--- a/examples/tutorial/t12.py
+++ b/examples/tutorial/t12.py
@@ -259,7 +259,7 @@ class MyWidget(QtWidgets.QWidget):
quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
angle = LCDRange("ANGLE")
angle.setRange(5, 70)
diff --git a/examples/tutorial/t13.py b/examples/tutorial/t13.py
index 8cf5af33c..5198bb459 100644
--- a/examples/tutorial/t13.py
+++ b/examples/tutorial/t13.py
@@ -293,7 +293,7 @@ class GameBoard(QtWidgets.QWidget):
quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
angle = LCDRange("ANGLE")
angle.setRange(5, 70)
diff --git a/examples/tutorial/t14.py b/examples/tutorial/t14.py
index 4bb971f1d..0fcfa74c4 100644
--- a/examples/tutorial/t14.py
+++ b/examples/tutorial/t14.py
@@ -334,7 +334,7 @@ class GameBoard(QtWidgets.QWidget):
quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
angle = LCDRange("ANGLE")
angle.setRange(5, 70)
diff --git a/examples/tutorial/t4.py b/examples/tutorial/t4.py
index 353e59e4b..c88943c98 100644
--- a/examples/tutorial/t4.py
+++ b/examples/tutorial/t4.py
@@ -57,7 +57,7 @@ class MyWidget(QtWidgets.QWidget):
self.quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(self.quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
app = QtWidgets.QApplication(sys.argv)
diff --git a/examples/tutorial/t5.py b/examples/tutorial/t5.py
index eda1d98aa..4077c0eb2 100644
--- a/examples/tutorial/t5.py
+++ b/examples/tutorial/t5.py
@@ -60,7 +60,7 @@ class MyWidget(QtWidgets.QWidget):
slider.setValue(0)
self.connect(quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
self.connect(slider, QtCore.SIGNAL("valueChanged(int)"),
lcd, QtCore.SLOT("display(int)"))
diff --git a/examples/tutorial/t6.py b/examples/tutorial/t6.py
index 6353af1c2..21c4ff311 100644
--- a/examples/tutorial/t6.py
+++ b/examples/tutorial/t6.py
@@ -70,7 +70,7 @@ class MyWidget(QtWidgets.QWidget):
quit = QtWidgets.QPushButton("Quit")
quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
grid = QtWidgets.QGridLayout()
layout = QtWidgets.QVBoxLayout()
diff --git a/examples/tutorial/t7.py b/examples/tutorial/t7.py
index 97ed27f10..0e01a75cd 100644
--- a/examples/tutorial/t7.py
+++ b/examples/tutorial/t7.py
@@ -83,7 +83,7 @@ class MyWidget(QtWidgets.QWidget):
quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
grid = QtWidgets.QGridLayout()
previousRange = None
diff --git a/examples/tutorial/t8.py b/examples/tutorial/t8.py
index 944c9f75b..e67268989 100644
--- a/examples/tutorial/t8.py
+++ b/examples/tutorial/t8.py
@@ -122,7 +122,7 @@ class MyWidget(QtWidgets.QWidget):
quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
angle = LCDRange()
angle.setRange(5, 70)
diff --git a/examples/tutorial/t9.py b/examples/tutorial/t9.py
index 9a6462dda..ab37f8eb7 100644
--- a/examples/tutorial/t9.py
+++ b/examples/tutorial/t9.py
@@ -129,7 +129,7 @@ class MyWidget(QtWidgets.QWidget):
quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold))
self.connect(quit, QtCore.SIGNAL("clicked()"),
- QtWidgets.qApp, QtCore.SLOT("quit()"))
+ qApp, QtCore.SLOT("quit()"))
angle = LCDRange()
angle.setRange(5, 70)
diff --git a/examples/widgets/dialogs/findfiles.py b/examples/widgets/dialogs/findfiles.py
index 9d18324ad..cf2be86db 100644
--- a/examples/widgets/dialogs/findfiles.py
+++ b/examples/widgets/dialogs/findfiles.py
@@ -131,7 +131,7 @@ class Window(QtWidgets.QDialog):
for i in range(len(files)):
progressDialog.setValue(i)
progressDialog.setLabelText("Searching file number %d of %d..." % (i, len(files)))
- QtCore.qApp.processEvents()
+ QtCore.QCoreApplication.processEvents()
if progressDialog.wasCanceled():
break
diff --git a/examples/widgets/itemviews/fetchmore.py b/examples/widgets/itemviews/fetchmore.py
index 3219109c3..2b0d8c104 100644
--- a/examples/widgets/itemviews/fetchmore.py
+++ b/examples/widgets/itemviews/fetchmore.py
@@ -70,9 +70,9 @@ class FileListModel(QtCore.QAbstractListModel):
batch = (index.row() // 100) % 2
# FIXME: QGuiApplication::palette() required
if batch == 0:
- return QtWidgets.qApp.palette().base()
+ return qApp.palette().base()
- return QtWidgets.qApp.palette().alternateBase()
+ return qApp.palette().alternateBase()
return None
diff --git a/examples/widgets/mainwindows/application/application.py b/examples/widgets/mainwindows/application/application.py
index 624fb47d5..8c4626f9b 100644
--- a/examples/widgets/mainwindows/application/application.py
+++ b/examples/widgets/mainwindows/application/application.py
@@ -147,7 +147,7 @@ class MainWindow(QtWidgets.QMainWindow):
self.aboutQtAct = QtWidgets.QAction("About &Qt", self,
statusTip="Show the Qt library's About box",
- triggered=QtWidgets.qApp.aboutQt)
+ triggered=qApp.aboutQt)
self.cutAct.setEnabled(False)
self.copyAct.setEnabled(False)
diff --git a/examples/widgets/richtext/syntaxhighlighter.py b/examples/widgets/richtext/syntaxhighlighter.py
index 5a5d7c8e0..82e4c79a1 100644
--- a/examples/widgets/richtext/syntaxhighlighter.py
+++ b/examples/widgets/richtext/syntaxhighlighter.py
@@ -102,14 +102,14 @@ class MainWindow(QtWidgets.QMainWindow):
fileMenu.addAction("&New...", self.newFile, "Ctrl+N")
fileMenu.addAction("&Open...", self.openFile, "Ctrl+O")
- fileMenu.addAction("E&xit", QtWidgets.qApp.quit, "Ctrl+Q")
+ fileMenu.addAction("E&xit", qApp.quit, "Ctrl+Q")
def setupHelpMenu(self):
helpMenu = QtWidgets.QMenu("&Help", self)
self.menuBar().addMenu(helpMenu)
helpMenu.addAction("&About", self.about)
- helpMenu.addAction("About &Qt", QtWidgets.qApp.aboutQt)
+ helpMenu.addAction("About &Qt", qApp.aboutQt)
class Highlighter(QtGui.QSyntaxHighlighter):
diff --git a/examples/widgets/widgets/tetrix.py b/examples/widgets/widgets/tetrix.py
index f90793ca9..134eec4e4 100644
--- a/examples/widgets/widgets/tetrix.py
+++ b/examples/widgets/widgets/tetrix.py
@@ -77,7 +77,7 @@ class TetrixWindow(QtWidgets.QWidget):
startButton.clicked.connect(self.board.start)
pauseButton.clicked.connect(self.board.pause)
- quitButton.clicked.connect(QtWidgets.qApp.quit)
+ quitButton.clicked.connect(qApp.quit)
self.board.scoreChanged.connect(scoreLcd.display)
self.board.levelChanged.connect(levelLcd.display)
self.board.linesRemovedChanged.connect(linesLcd.display)
diff --git a/examples/xml/dombookmarks/dombookmarks.py b/examples/xml/dombookmarks/dombookmarks.py
index 9a0168fde..20ec09e2d 100644
--- a/examples/xml/dombookmarks/dombookmarks.py
+++ b/examples/xml/dombookmarks/dombookmarks.py
@@ -112,7 +112,7 @@ class MainWindow(QtWidgets.QMainWindow):
self.aboutAct = QtWidgets.QAction("&About", self, triggered=self.about)
self.aboutQtAct = QtWidgets.QAction("About &Qt", self,
- triggered=QtWidgets.qApp.aboutQt)
+ triggered=qApp.aboutQt)
def createMenus(self):
self.fileMenu = self.menuBar().addMenu("&File")