diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-10 08:46:52 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-10 22:16:07 +0000 |
| commit | 3eac688ec005833509bffc7097c378af9c5b515f (patch) | |
| tree | e8c169654e6bb08f6094d35deb5d887a9be51bf3 /src/widgets/dialogs | |
| parent | 574b56913f3d1ca6ad05617c32bd275807613c6b (diff) | |
Documentation: Add \nullptr macro and use where applicable
Qt for Python users reading the documentation assume that int(0) can
be passed for pointer parameters. Use the newly introduced \nullptr to
disambiguate this.
In a follow-up step, the \nullptr macro can be defined as None
when generating the Qt for Python documentation.
Task-number: PYSIDE-903
Change-Id: I3a45f87175a0668ab5f3f95f0aff409f7e3ef027
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/dialogs/qprogressdialog.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 1fb5e61301..c9093095a7 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -969,7 +969,7 @@ Qt::Orientation QDialog::orientation() const Sets the widget, \a extension, to be the dialog's extension, deleting any previous extension. The dialog takes ownership of the - extension. Note that if 0 is passed any existing extension will be + extension. Note that if \nullptr is passed, any existing extension will be deleted. This function must only be called while the dialog is hidden. Instead of using this functionality, we recommend that you simply call diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp index 4bf78e2115..e1fb1055ae 100644 --- a/src/widgets/dialogs/qprogressdialog.cpp +++ b/src/widgets/dialogs/qprogressdialog.cpp @@ -397,7 +397,7 @@ void QProgressDialog::setLabelText(const QString &text) Sets the cancel button to the push button, \a cancelButton. The progress dialog takes ownership of this button which will be deleted when necessary, so do not pass the address of an object that is on - the stack, i.e. use new() to create the button. If 0 is passed then + the stack, i.e. use new() to create the button. If \nullptr is passed, no cancel button will be shown. \sa setCancelButtonText() |