aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/corelib/threads/mandelbrot.py4
-rw-r--r--examples/network/fortuneclient.py2
-rw-r--r--examples/widgets/animation/easing/easing.py2
-rw-r--r--examples/widgets/codeeditor/codeeditor.py2
-rw-r--r--examples/widgets/dialogs/standarddialogs.py2
-rw-r--r--examples/widgets/gallery/widgetgallery.py4
-rw-r--r--examples/widgets/graphicsview/diagramscene/diagramscene.py6
-rw-r--r--examples/widgets/mainwindows/dockwidgets/dockwidgets.py2
-rw-r--r--examples/widgets/mainwindows/mdi/mdi.py2
-rw-r--r--examples/widgets/state-machine/rogue.py5
10 files changed, 16 insertions, 15 deletions
diff --git a/examples/corelib/threads/mandelbrot.py b/examples/corelib/threads/mandelbrot.py
index f0d13dbf5..c0ca70d68 100644
--- a/examples/corelib/threads/mandelbrot.py
+++ b/examples/corelib/threads/mandelbrot.py
@@ -251,7 +251,7 @@ class MandelbrotWidget(QWidget):
painter.save()
painter.translate(newX, newY)
painter.scale(scaleFactor, scaleFactor)
- exposed, _ = painter.matrix().inverted()
+ exposed, _ = painter.transform().inverted()
exposed = exposed.mapRect(self.rect()).adjusted(-1, -1, 1, 1)
painter.drawPixmap(exposed, self.pixmap, exposed)
painter.restore()
@@ -259,7 +259,7 @@ class MandelbrotWidget(QWidget):
text = "Use mouse wheel or the '+' and '-' keys to zoom. Press and " \
"hold left mouse button to scroll."
metrics = painter.fontMetrics()
- textWidth = metrics.width(text)
+ textWidth = metrics.horizontalAdvance(text)
painter.setPen(Qt.NoPen)
painter.setBrush(QColor(0, 0, 0, 127))
diff --git a/examples/network/fortuneclient.py b/examples/network/fortuneclient.py
index c774973c0..00247eee0 100644
--- a/examples/network/fortuneclient.py
+++ b/examples/network/fortuneclient.py
@@ -83,7 +83,7 @@ class Client(QtWidgets.QDialog):
self.getFortuneButton.clicked.connect(self.requestNewFortune)
quitButton.clicked.connect(self.close)
self.tcpSocket.readyRead.connect(self.readFortune)
- self.tcpSocket.error.connect(self.displayError)
+ self.tcpSocket.errorOccurred.connect(self.displayError)
mainLayout = QtWidgets.QGridLayout()
mainLayout.addWidget(hostLabel, 0, 0)
diff --git a/examples/widgets/animation/easing/easing.py b/examples/widgets/animation/easing/easing.py
index 18b5c09de..d5c733863 100644
--- a/examples/widgets/animation/easing/easing.py
+++ b/examples/widgets/animation/easing/easing.py
@@ -121,7 +121,7 @@ class Window(QtWidgets.QWidget):
m_ui.overshootSpinBox.setValue(dummy.overshoot())
m_ui.easingCurvePicker.currentRowChanged.connect(self.curveChanged)
- m_ui.buttonGroup.buttonClicked[int].connect(self.pathChanged)
+ m_ui.buttonGroup.idClicked.connect(self.pathChanged)
m_ui.periodSpinBox.valueChanged.connect(self.periodChanged)
m_ui.amplitudeSpinBox.valueChanged.connect(self.amplitudeChanged)
m_ui.overshootSpinBox.valueChanged.connect(self.overshootChanged)
diff --git a/examples/widgets/codeeditor/codeeditor.py b/examples/widgets/codeeditor/codeeditor.py
index 331069f4a..d83d010d4 100644
--- a/examples/widgets/codeeditor/codeeditor.py
+++ b/examples/widgets/codeeditor/codeeditor.py
@@ -74,7 +74,7 @@ class CodeEditor(QPlainTextEdit):
max_num *= 0.1
digits += 1
- space = 3 + self.fontMetrics().width('9') * digits
+ space = 3 + self.fontMetrics().horizontalAdvance('9') * digits
return space
def resizeEvent(self, e):
diff --git a/examples/widgets/dialogs/standarddialogs.py b/examples/widgets/dialogs/standarddialogs.py
index f61157e75..ea1afa4ce 100644
--- a/examples/widgets/dialogs/standarddialogs.py
+++ b/examples/widgets/dialogs/standarddialogs.py
@@ -119,7 +119,7 @@ class Dialog(QtWidgets.QDialog):
self.errorLabel = QtWidgets.QLabel()
self.errorLabel.setFrameStyle(frameStyle)
- self.errorButton = QtWidgets.QPushButton("QErrorMessage.show&M&essage()")
+ self.errorButton = QtWidgets.QPushButton("QErrorMessage.showM&essage()")
self.integerButton.clicked.connect(self.setInteger)
self.doubleButton.clicked.connect(self.setDouble)
diff --git a/examples/widgets/gallery/widgetgallery.py b/examples/widgets/gallery/widgetgallery.py
index a06ac2e20..9d3faeeff 100644
--- a/examples/widgets/gallery/widgetgallery.py
+++ b/examples/widgets/gallery/widgetgallery.py
@@ -42,8 +42,8 @@ import sys
from PySide2.QtWidgets import *
from PySide2.QtGui import (QCursor, QDesktopServices, QGuiApplication, QIcon,
- QKeySequence, QStandardItem, QStandardItemModel,
- QScreen, QWindow)
+ QKeySequence, QShortcut, QStandardItem,
+ QStandardItemModel, QScreen, QWindow)
from PySide2.QtCore import (QDateTime, QDir, QLibraryInfo, QMetaObject,
QSysInfo, QTextStream, QTimer, Qt, qVersion)
diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.py b/examples/widgets/graphicsview/diagramscene/diagramscene.py
index 048681bdb..079ae4021 100644
--- a/examples/widgets/graphicsview/diagramscene/diagramscene.py
+++ b/examples/widgets/graphicsview/diagramscene/diagramscene.py
@@ -550,7 +550,7 @@ class MainWindow(QtWidgets.QMainWindow):
def createToolBox(self):
self.buttonGroup = QtWidgets.QButtonGroup()
self.buttonGroup.setExclusive(False)
- self.buttonGroup.buttonClicked[int].connect(self.buttonGroupClicked)
+ self.buttonGroup.idClicked.connect(self.buttonGroupClicked)
layout = QtWidgets.QGridLayout()
layout.addWidget(self.createCellWidget("Conditional", DiagramItem.Conditional),
@@ -726,12 +726,12 @@ class MainWindow(QtWidgets.QMainWindow):
self.pointerTypeGroup.addButton(pointerButton, DiagramScene.MoveItem)
self.pointerTypeGroup.addButton(linePointerButton,
DiagramScene.InsertLine)
- self.pointerTypeGroup.buttonClicked[int].connect(self.pointerGroupClicked)
+ self.pointerTypeGroup.idClicked.connect(self.pointerGroupClicked)
self.sceneScaleCombo = QtWidgets.QComboBox()
self.sceneScaleCombo.addItems(["50%", "75%", "100%", "125%", "150%"])
self.sceneScaleCombo.setCurrentIndex(2)
- self.sceneScaleCombo.currentIndexChanged[str].connect(self.sceneScaleChanged)
+ self.sceneScaleCombo.currentTextChanged.connect(self.sceneScaleChanged)
self.pointerToolbar = self.addToolBar("Pointer type")
self.pointerToolbar.addWidget(pointerButton)
diff --git a/examples/widgets/mainwindows/dockwidgets/dockwidgets.py b/examples/widgets/mainwindows/dockwidgets/dockwidgets.py
index 3f8e7dbf7..87a818c05 100644
--- a/examples/widgets/mainwindows/dockwidgets/dockwidgets.py
+++ b/examples/widgets/mainwindows/dockwidgets/dockwidgets.py
@@ -44,7 +44,7 @@
from PySide2.QtCore import QDate, QFile, Qt, QTextStream
from PySide2.QtGui import (QAction, QFont, QIcon, QKeySequence,
- QTextCharFormat, QTextTableFormat)
+ QTextCharFormat, QTextCursor, QTextTableFormat)
from PySide2.QtPrintSupport import QPrintDialog, QPrinter
from PySide2.QtWidgets import (QApplication, QDialog, QDockWidget,
QFileDialog, QListWidget, QMainWindow, QMessageBox, QTextEdit)
diff --git a/examples/widgets/mainwindows/mdi/mdi.py b/examples/widgets/mainwindows/mdi/mdi.py
index f9d90767e..18bbfa5fb 100644
--- a/examples/widgets/mainwindows/mdi/mdi.py
+++ b/examples/widgets/mainwindows/mdi/mdi.py
@@ -171,7 +171,7 @@ class MainWindow(QMainWindow):
self.mdiArea.subWindowActivated.connect(self.updateMenus)
self.windowMapper = QSignalMapper(self)
- self.windowMapper.mapped[QWidget].connect(self.setActiveSubWindow)
+ self.windowMapper.mappedObject.connect(self.setActiveSubWindow)
self.createActions()
self.createMenus()
diff --git a/examples/widgets/state-machine/rogue.py b/examples/widgets/state-machine/rogue.py
index 755b847ac..ce5b80596 100644
--- a/examples/widgets/state-machine/rogue.py
+++ b/examples/widgets/state-machine/rogue.py
@@ -146,12 +146,13 @@ class MainWindow(QMainWindow):
def sizeHint(self):
metrics = QFontMetrics(self.font())
- return QSize(metrics.width('X') * self.width, metrics.height() * (self.height + 1))
+ return QSize(metrics.horizontalAdvance('X') * self.width,
+ metrics.height() * (self.height + 1))
def paintEvent(self, event):
metrics = QFontMetrics(self.font())
painter = QPainter(self)
fontHeight = metrics.height()
- fontWidth = metrics.width('X')
+ fontWidth = metrics.horizontalAdvance('X')
painter.fillRect(self.rect(), Qt.black)
painter.setPen(Qt.white)