summaryrefslogtreecommitdiffstats log msg author committer range
diff options
 context: 12345678910152025303540 space: includeignore mode: unifiedssdiffstat only
-rw-r--r--src/corelib/codecs/qtextcodec.cpp4
-rw-r--r--src/corelib/kernel/qobject.cpp16
-rw-r--r--src/corelib/plugin/qlibrary.cpp4
-rw-r--r--src/gui/itemmodels/qstandarditemmodel.cpp8
-rw-r--r--src/gui/kernel/qplatformcursor.cpp2
-rw-r--r--src/gui/kernel/qwindow.cpp3
-rw-r--r--src/widgets/graphicsview/qgraphicsscene.cpp4
-rw-r--r--src/widgets/kernel/qtooltip.cpp4
-rw-r--r--src/widgets/kernel/qwidget.cpp8
-rw-r--r--src/widgets/widgets/qabstractspinbox.cpp2
-rw-r--r--src/widgets/widgets/qcombobox.cpp2
11 files changed, 29 insertions, 28 deletions
 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cppindex 804e0b2935..e2598b7858 100644--- a/src/corelib/codecs/qtextcodec.cpp+++ b/src/corelib/codecs/qtextcodec.cpp@@ -764,7 +764,7 @@ QList QTextCodec::aliases() const encoding of the subclass to Unicode, and returns the result in a QString. - \a state can be 0, in which case the conversion is stateless and+ \a state can be \nullptr, in which case the conversion is stateless and default conversion rules should be used. If state is not 0, the codec should save the state after the conversion in \a state, and adjust the \c remainingChars and \c invalidChars members of the struct.@@ -780,7 +780,7 @@ QList QTextCodec::aliases() const from Unicode to the encoding of the subclass, and returns the result in a QByteArray. - \a state can be 0 in which case the conversion is stateless and+ \a state can be \nullptr in which case the conversion is stateless and default conversion rules should be used. If state is not 0, the codec should save the state after the conversion in \a state, and adjust the \c remainingChars and \c invalidChars members of the struct.diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cppindex 3a3eb726fa..15955e1665 100644--- a/src/corelib/kernel/qobject.cpp+++ b/src/corelib/kernel/qobject.cpp@@ -2934,8 +2934,8 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMetho 0 may be used as a wildcard, meaning "any signal", "any receiving object", or "any slot in the receiving object", respectively. - The \a sender may never be 0. (You cannot disconnect signals from- more than one object in a single call.)+ The \a sender may never be \nullptr. (You cannot disconnect signals+ from more than one object in a single call.) If \a signal is 0, it disconnects \a receiver and \a method from any signal. If not, only the specified signal is disconnected.@@ -2946,8 +2946,8 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMetho If \a method is 0, it disconnects anything that is connected to \a receiver. If not, only slots named \a method will be disconnected,- and all other slots are left alone. The \a method must be 0 if \a- receiver is left out, so you cannot disconnect a+ and all other slots are left alone. The \a method must be \nullptr+ if \a receiver is left out, so you cannot disconnect a specifically-named slot on all objects. \sa connect()@@ -4991,8 +4991,8 @@ bool QObject::disconnect(const QMetaObject::Connection &connection) 0 may be used as a wildcard, meaning "any signal", "any receiving object", or "any slot in the receiving object", respectively. - The \a sender may never be 0. (You cannot disconnect signals from- more than one object in a single call.)+ The \a sender may never be \nullptr. (You cannot disconnect signals+ from more than one object in a single call.) If \a signal is 0, it disconnects \a receiver and \a method from any signal. If not, only the specified signal is disconnected.@@ -5003,8 +5003,8 @@ bool QObject::disconnect(const QMetaObject::Connection &connection) If \a method is 0, it disconnects anything that is connected to \a receiver. If not, only slots named \a method will be disconnected,- and all other slots are left alone. The \a method must be 0 if \a- receiver is left out, so you cannot disconnect a+ and all other slots are left alone. The \a method must be \nullptr+ if \a receiver is left out, so you cannot disconnect a specifically-named slot on all objects. \note It is not possible to use this overload to diconnect signalsdiff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cppindex aa63ed1a6b..6635286f76 100644--- a/src/corelib/plugin/qlibrary.cpp+++ b/src/corelib/plugin/qlibrary.cpp@@ -133,8 +133,8 @@ QT_BEGIN_NAMESPACE The following code snippet loads a library, resolves the symbol "mysymbol", and calls the function if everything succeeded. If something goes wrong, e.g. the library file does not exist or the- symbol is not defined, the function pointer will be 0 and won't be- called.+ symbol is not defined, the function pointer will be \nullptr and+ won't be called. \snippet code/src_corelib_plugin_qlibrary.cpp 0 diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cppindex 97cbf5f9d3..3e3c7a6211 100644--- a/src/gui/itemmodels/qstandarditemmodel.cpp+++ b/src/gui/itemmodels/qstandarditemmodel.cpp@@ -1905,7 +1905,7 @@ QStandardItem *QStandardItem::takeChild(int row, int column) /*! Removes \a row without deleting the row items, and returns a list of pointers to the removed items. For items in the row that have not been- set, the corresponding pointers in the list will be 0.+ set, the corresponding pointers in the list will be \nullptr. \sa removeRow(), insertRow(), takeColumn() */@@ -1939,7 +1939,7 @@ QList QStandardItem::takeRow(int row) /*! Removes \a column without deleting the column items, and returns a list of pointers to the removed items. For items in the column that have not been- set, the corresponding pointers in the list will be 0.+ set, the corresponding pointers in the list will be \nullptr. \sa removeColumn(), insertColumn(), takeRow() */@@ -2718,7 +2718,7 @@ QStandardItem *QStandardItemModel::takeItem(int row, int column) Removes the given \a row without deleting the row items, and returns a list of pointers to the removed items. The model releases ownership of the items. For items in the row that have not been set, the corresponding- pointers in the list will be 0.+ pointers in the list will be \nullptr. \sa takeColumn() */@@ -2734,7 +2734,7 @@ QList QStandardItemModel::takeRow(int row) Removes the given \a column without deleting the column items, and returns a list of pointers to the removed items. The model releases ownership of the items. For items in the column that have not been set, the- corresponding pointers in the list will be 0.+ corresponding pointers in the list will be \nullptr. \sa takeRow() */diff --git a/src/gui/kernel/qplatformcursor.cpp b/src/gui/kernel/qplatformcursor.cppindex 76e38ab12d..49eff2ad23 100644--- a/src/gui/kernel/qplatformcursor.cpp+++ b/src/gui/kernel/qplatformcursor.cpp@@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE set or the system default cursor should take effect. \a window is a pointer to the window currently displayed at QCursor::pos(). Note- that this may be 0 if the current position is not occupied by a displayed widget.+ that this may be \nullptr if the current position is not occupied by a displayed widget. \sa QCursor::pos() */diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cppindex 3040a20308..1cc2435239 100644--- a/src/gui/kernel/qwindow.cpp+++ b/src/gui/kernel/qwindow.cpp@@ -688,7 +688,8 @@ QWindow *QWindow::parent() const Sets the \a parent Window. This will lead to the windowing system managing the clip of the window, so it will be clipped to the \a parent window. - Setting \a parent to be 0 will make the window become a top level window.+ Setting \a parent to be \nullptr will make the window become a top level+ window. If \a parent is a window created by fromWinId(), then the current window will be embedded inside \a parent, if the platform supports it.diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cppindex c517198a23..8bdce4af8b 100644--- a/src/widgets/graphicsview/qgraphicsscene.cpp+++ b/src/widgets/graphicsview/qgraphicsscene.cpp@@ -5552,8 +5552,8 @@ bool QGraphicsScene::focusNextPrevChild(bool next) is a pointer to the item that gained input focus, or \nullptr if focus was lost. \a reason is the reason for the focus change (e.g., if the scene was deactivated while an input field had focus, \a oldFocusItem would point- to the input field item, \a newFocusItem would be 0, and \a reason would be- Qt::ActiveWindowFocusReason.+ to the input field item, \a newFocusItem would be \nullptr, and \a reason+ would be Qt::ActiveWindowFocusReason. */ /*!diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cppindex cf0f3f153b..f81cb471fa 100644--- a/src/widgets/kernel/qtooltip.cpp+++ b/src/widgets/kernel/qtooltip.cpp@@ -482,8 +482,8 @@ bool QTipLabel::tipChanged(const QPoint &pos, const QString &text, QObject *o) The \a rect is in the coordinates of the widget you specify with \a w. If the \a rect is not empty you must specify a widget.- Otherwise this argument can be 0 but it is used to determine the- appropriate screen on multi-head systems.+ Otherwise this argument can be \nullptr but it is used to+ determine the appropriate screen on multi-head systems. If \a text is empty the tool tip is hidden. If the text is the same as the currently shown tooltip, the tip will \e not move.diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cppindex 6a5f80f1ff..b71a0ed052 100644--- a/src/widgets/kernel/qwidget.cpp+++ b/src/widgets/kernel/qwidget.cpp@@ -1009,8 +1009,8 @@ struct QWidgetExceptionCleaner deleted. The widget flags argument, \a f, is normally 0, but it can be set- to customize the frame of a window (i.e. \a- parent must be 0). To customize the frame, use a value composed+ to customize the frame of a window (i.e. \a parent must be+ \nullptr). To customize the frame, use a value composed from the bitwise OR of any of the \l{Qt::WindowFlags}{window flags}. If you add a child widget to an already visible widget you must@@ -4232,7 +4232,7 @@ void QWidget::setFixedHeight(int h) /*! Translates the widget coordinate \a pos to the coordinate system- of \a parent. The \a parent must not be 0 and must be a parent+ of \a parent. The \a parent must not be \nullptr and must be a parent of the calling widget. \sa mapFrom(), mapToParent(), mapToGlobal(), underMouse()@@ -4257,7 +4257,7 @@ QPoint QWidget::mapTo(const QWidget * parent, const QPoint & pos) const /*! Translates the widget coordinate \a pos from the coordinate system of \a parent to this widget's coordinate system. The \a parent- must not be 0 and must be a parent of the calling widget.+ must not be \nullptr and must be a parent of the calling widget. \sa mapTo(), mapFromParent(), mapFromGlobal(), underMouse() */diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cppindex 6a35dbe274..6edefaa311 100644--- a/src/widgets/widgets/qabstractspinbox.cpp+++ b/src/widgets/widgets/qabstractspinbox.cpp@@ -688,7 +688,7 @@ QLineEdit *QAbstractSpinBox::lineEdit() const \fn void QAbstractSpinBox::setLineEdit(QLineEdit *lineEdit) Sets the line edit of the spinbox to be \a lineEdit instead of the- current line edit widget. \a lineEdit cannot be 0.+ current line edit widget. \a lineEdit cannot be \nullptr. QAbstractSpinBox takes ownership of the new lineEdit diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cppindex a24c9d350f..e38e1d7750 100644--- a/src/widgets/widgets/qcombobox.cpp+++ b/src/widgets/widgets/qcombobox.cpp@@ -2034,7 +2034,7 @@ QAbstractItemModel *QComboBox::model() const } /*!- Sets the model to be \a model. \a model must not be 0.+ Sets the model to be \a model. \a model must not be \nullptr. If you want to clear the contents of a model, call clear(). \sa clear()