From aec4e05e9e8ad9109d7db15dd0fea477e4574c20 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sat, 25 Jan 2020 20:12:12 +0100 Subject: Doc/QtWidgets: replace some 0 with \nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace some 'is 0' or 'are 0' where 0 referes to a nullptr with 'is \nullptr' and 'are \nullptr' Change-Id: I5ff46185b570bdfc7d20d18a47fd9174771ad8e5 Reviewed-by: André Hartmann Reviewed-by: Sze Howe Koh --- src/widgets/styles/qdrawutil.cpp | 20 ++++++++++---------- src/widgets/styles/qproxystyle.cpp | 2 +- src/widgets/styles/qstyle.cpp | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/widgets/styles') diff --git a/src/widgets/styles/qdrawutil.cpp b/src/widgets/styles/qdrawutil.cpp index d30b43a679..66729e4dc7 100644 --- a/src/widgets/styles/qdrawutil.cpp +++ b/src/widgets/styles/qdrawutil.cpp @@ -214,7 +214,7 @@ void qDrawShadeLine(QPainter *p, int x1, int y1, int x2, int y2, specifies the line width for each of the lines; it is not the total line width. The \a midLineWidth specifies the width of a middle line drawn in the QPalette::mid() color. The rectangle's - interior is filled with the \a fill brush unless \a fill is 0. + interior is filled with the \a fill brush unless \a fill is \nullptr. The rectangle appears sunken if \a sunken is true, otherwise raised. @@ -331,7 +331,7 @@ void qDrawShadeRect(QPainter *p, int x, int y, int w, int h, The given \a palette specifies the shading colors (\l {QPalette::light()}{light}, \l {QPalette::dark()}{dark} and \l {QPalette::mid()}{middle} colors). The panel's interior is filled - with the \a fill brush unless \a fill is 0. + with the \a fill brush unless \a fill is \nullptr. The panel appears sunken if \a sunken is true, otherwise raised. @@ -490,7 +490,7 @@ static void qDrawWinShades(QPainter *p, Draws the Windows-style button specified by the given point (\a x, \a y}, \a width and \a height using the provided \a painter with a line width of 2 pixels. The button's interior is filled with the - \a{fill} brush unless \a fill is 0. + \a{fill} brush unless \a fill is \nullptr. The given \a palette specifies the shading colors (\l {QPalette::light()}{light}, \l {QPalette::dark()}{dark} and \l @@ -528,7 +528,7 @@ void qDrawWinButton(QPainter *p, int x, int y, int w, int h, Draws the Windows-style panel specified by the given point(\a x, \a y), \a width and \a height using the provided \a painter with a line width of 2 pixels. The button's interior is filled with the - \a fill brush unless \a fill is 0. + \a fill brush unless \a fill is \nullptr. The given \a palette specifies the shading colors. The panel appears sunken if \a sunken is true, otherwise raised. @@ -567,7 +567,7 @@ void qDrawWinPanel(QPainter *p, int x, int y, int w, int h, Draws the plain rectangle beginning at (\a x, \a y) with the given \a width and \a height, using the specified \a painter, \a lineColor and \a lineWidth. The rectangle's interior is filled with the \a - fill brush unless \a fill is 0. + fill brush unless \a fill is \nullptr. \warning This function does not look at QWidget::style() or QApplication::style(). Use the drawing functions in QStyle to make @@ -676,7 +676,7 @@ void qDrawShadeLine(QPainter *p, const QPoint &p1, const QPoint &p2, specifies the line width for each of the lines; it is not the total line width. The \a midLineWidth specifies the width of a middle line drawn in the QPalette::mid() color. The rectangle's - interior is filled with the \a fill brush unless \a fill is 0. + interior is filled with the \a fill brush unless \a fill is \nullptr. The rectangle appears sunken if \a sunken is true, otherwise raised. @@ -714,7 +714,7 @@ void qDrawShadeRect(QPainter *p, const QRect &r, The given \a palette specifies the shading colors (\l {QPalette::light()}{light}, \l {QPalette::dark()}{dark} and \l {QPalette::mid()}{middle} colors). The panel's interior is filled - with the \a fill brush unless \a fill is 0. + with the \a fill brush unless \a fill is \nullptr. The panel appears sunken if \a sunken is true, otherwise raised. @@ -746,7 +746,7 @@ void qDrawShadePanel(QPainter *p, const QRect &r, Draws the Windows-style button at the rectangle specified by \a rect using the given \a painter with a line width of 2 pixels. The button's interior - is filled with the \a{fill} brush unless \a fill is 0. + is filled with the \a{fill} brush unless \a fill is \nullptr. The given \a palette specifies the shading colors (\l {QPalette::light()}{light}, \l {QPalette::dark()}{dark} and \l @@ -774,7 +774,7 @@ void qDrawWinButton(QPainter *p, const QRect &r, Draws the Windows-style panel at the rectangle specified by \a rect using the given \a painter with a line width of 2 pixels. The button's interior - is filled with the \a fill brush unless \a fill is 0. + is filled with the \a fill brush unless \a fill is \nullptr. The given \a palette specifies the shading colors. The panel appears sunken if \a sunken is true, otherwise raised. @@ -804,7 +804,7 @@ void qDrawWinPanel(QPainter *p, const QRect &r, Draws the plain rectangle specified by \a rect using the given \a painter, \a lineColor and \a lineWidth. The rectangle's interior is filled with the - \a fill brush unless \a fill is 0. + \a fill brush unless \a fill is \nullptr. \warning This function does not look at QWidget::style() or QApplication::style(). Use the drawing functions in QStyle to make diff --git a/src/widgets/styles/qproxystyle.cpp b/src/widgets/styles/qproxystyle.cpp index cfaa5a2011..0cc235bc84 100644 --- a/src/widgets/styles/qproxystyle.cpp +++ b/src/widgets/styles/qproxystyle.cpp @@ -403,7 +403,7 @@ QIcon QProxyStyle::standardIcon(StandardPixmap standardIcon, orientation specifies whether the controls are laid out side by side or stacked vertically. The \a option parameter can be used to pass extra information about the parent widget. The \a widget parameter - is optional and can also be used if \a option is 0. + is optional and can also be used if \a option is \nullptr. The default implementation returns -1. diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index d2f5ac76f9..72e40d657d 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -2362,14 +2362,14 @@ QPalette QStyle::standardPalette() const \fn int QStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, - const QStyleOption *option = 0, const QWidget *widget = 0) const + const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const Returns the spacing that should be used between \a control1 and \a control2 in a layout. \a orientation specifies whether the controls are laid out side by side or stacked vertically. The \a option parameter can be used to pass extra information about the parent widget. The \a widget parameter is optional and can also - be used if \a option is 0. + be used if \a option is \nullptr. This function is called by the layout system. It is used only if PM_LayoutHorizontalSpacing or PM_LayoutVerticalSpacing returns a @@ -2386,7 +2386,7 @@ QPalette QStyle::standardPalette() const controls are laid out side by side or stacked vertically. The \a option parameter can be used to pass extra information about the parent widget. The \a widget parameter is optional and can also - be used if \a option is 0. + be used if \a option is \nullptr. \a controls1 and \a controls2 are OR-combination of zero or more \l{QSizePolicy::ControlTypes}{control types}. -- cgit v1.2.3