diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 13:05:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-07 23:02:47 +0200 |
commit | 564b59d903683b14c75b72a3e93367717f201def (patch) | |
tree | 03ffe749d83dce84429a7db484bf92795047036f /tests/auto/widgets/kernel | |
parent | b5fc1e4e2643e73d3b44c483d159529f8deb8af1 (diff) |
Another round of replacing 0 with nullptr
This time based on grepping to also include documentation, tests and
examples previously missed by the automatic tool.
Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/widgets/kernel')
7 files changed, 26 insertions, 26 deletions
diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp index 00e82248d4..c63a3c6a52 100644 --- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp @@ -70,15 +70,15 @@ public: vspacing = 10; } - virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const override; + virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = nullptr, + const QWidget * widget = nullptr ) const override; int hspacing; int vspacing; }; -int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0*/, - const QWidget * widget /*= 0*/ ) const +int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= nullptr*/, + const QWidget * widget /*= nullptr*/ ) const { switch (metric) { case PM_LayoutLeftMargin: diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp index 06e82ecac8..d718a6c7d7 100644 --- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp +++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp @@ -297,15 +297,15 @@ public: vspacing = 10; } - virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const override; + virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = nullptr, + const QWidget * widget = nullptr) const override; int hspacing; int vspacing; }; -int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0*/, - const QWidget * widget /*= 0*/ ) const +int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= nullptr*/, + const QWidget * widget /*= nullptr*/ ) const { switch (metric) { case PM_LayoutHorizontalSpacing: @@ -391,7 +391,7 @@ void tst_QFormLayout::contentsRect() class DummyMacStyle : public QCommonStyle { public: - virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const override + virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = nullptr, QStyleHintReturn * returnData = 0 ) const override { switch(hint) { case SH_FormLayoutFormAlignment: @@ -411,7 +411,7 @@ public: class DummyQtopiaStyle : public QCommonStyle { public: - virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const override + virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = nullptr, QStyleHintReturn * returnData = 0 ) const override { switch(hint) { case SH_FormLayoutFormAlignment: diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 69d85df597..411ca7120e 100644 --- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -381,9 +381,9 @@ void tst_QGridLayout::setMinAndMaxSize() class SizeHinter : public QWidget { public: - SizeHinter(const QSize &s, QWidget *parent = 0) + SizeHinter(const QSize &s, QWidget *parent = nullptr) : QWidget(parent), sh(s) { } - SizeHinter(int w, int h, QWidget *parent = 0) + SizeHinter(int w, int h, QWidget *parent = nullptr) : QWidget(parent), sh(QSize(w,h)) {} void setSizeHint(QSize s) { sh = s; } QSize sizeHint() const override { return sh; } @@ -489,7 +489,7 @@ typedef QList<QPoint> PointList; class SizeHinterFrame : public QLabel { public: - SizeHinterFrame(QWidget *parent = 0) + SizeHinterFrame(QWidget *parent = nullptr) : QLabel(parent) { init(-1); @@ -900,8 +900,8 @@ public: reimplementSubelementRect = false; } - virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, - const QWidget * widget = 0 ) const override; + virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = nullptr, + const QWidget * widget = nullptr ) const override; virtual QRect subElementRect(SubElement sr, const QStyleOption *opt, const QWidget *widget) const override; @@ -912,8 +912,8 @@ public: int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, - const QStyleOption *option = 0, - const QWidget *widget = 0) const override; + const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const override; }; @@ -945,8 +945,8 @@ QRect CustomLayoutStyle::subElementRect(SubElement sr, const QStyleOption *opt, int CustomLayoutStyle::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 { if (orientation == Qt::Horizontal) { switch (CT2(control1, control2)) { @@ -966,8 +966,8 @@ int CustomLayoutStyle::layoutSpacing(QSizePolicy::ControlType control1, } } -int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0*/, - const QWidget * widget /*= 0*/ ) const +int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= nullptr*/, + const QWidget * widget /*= nullptr*/ ) const { switch (metric) { case PM_LayoutLeftMargin: diff --git a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp index 053f4948a7..1b492d9a0f 100644 --- a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp +++ b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp @@ -64,7 +64,7 @@ class Widget_task183679 : public QWidget { Q_OBJECT public: - Widget_task183679(QWidget *parent = 0) : QWidget(parent) {} + Widget_task183679(QWidget *parent = nullptr) : QWidget(parent) {} void showDelayedToolTip(int msecs) { diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index 17b119410f..72e6c2ce32 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -966,7 +966,7 @@ class ResizeWidget : public QWidget { Q_OBJECT public: - ResizeWidget(QWidget *parent = 0) + ResizeWidget(QWidget *parent = nullptr) : QWidget(parent) , resizeCount(0) { } @@ -1110,7 +1110,7 @@ class MoveWidget : public QWidget { Q_OBJECT public: - MoveWidget(QWidget *parent = 0) + MoveWidget(QWidget *parent = nullptr) : QWidget(parent) , moveCount(0) { } diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp b/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp index 300320ca5d..1a6eb435a7 100644 --- a/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp +++ b/tests/auto/widgets/kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp @@ -49,7 +49,7 @@ class CustomWidget : public QWidget { Q_OBJECT public: - CustomWidget(QWidget *parent = 0) + CustomWidget(QWidget *parent = nullptr) : QWidget(parent) { diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp index 95bad0e903..18f07bbc42 100644 --- a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp +++ b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp @@ -149,7 +149,7 @@ void tst_QWidgetsVariant::writeToReadFromDataStream() class CustomQWidget : public QWidget { Q_OBJECT public: - CustomQWidget(QWidget *parent = 0) : QWidget(parent) {} + CustomQWidget(QWidget *parent = nullptr) : QWidget(parent) {} }; void tst_QWidgetsVariant::qvariant_cast_QObject_data() |