summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/styles
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-07 13:05:48 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-07 23:02:47 +0200
commit564b59d903683b14c75b72a3e93367717f201def (patch)
tree03ffe749d83dce84429a7db484bf92795047036f /tests/auto/widgets/styles
parentb5fc1e4e2643e73d3b44c483d159529f8deb8af1 (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/styles')
-rw-r--r--tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp2
-rw-r--r--tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp18
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
index 4a5702b709..16fe57f330 100644
--- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
@@ -75,7 +75,7 @@ private:
static int vgap(QWidget *widget1, QWidget *widget2) { return gap(widget1, widget2).height(); }
static void setSize(QWidget *widget, QStyleHelper::WidgetSizePolicy size);
static int spacing(ControlType control1, ControlType control2, Qt::Orientation orientation,
- QStyleOption *option = 0, QWidget *widget = 0);
+ QStyleOption *option = nullptr, QWidget *widget = nullptr);
static int hspacing(ControlType control1, ControlType control2, QStyleHelper::WidgetSizePolicy size = QStyleHelper::SizeLarge);
static int vspacing(ControlType control1, ControlType control2, QStyleHelper::WidgetSizePolicy size = QStyleHelper::SizeLarge);
};
diff --git a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
index 1d46886d1c..0bf7b73906 100644
--- a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
+++ b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
@@ -45,16 +45,16 @@ struct StyleOptionPointerBase
{
QStyleOption *pointer;
- StyleOptionPointerBase(QStyleOption *p = 0) : pointer(p) { }
+ StyleOptionPointerBase(QStyleOption *p = nullptr) : pointer(p) { }
- virtual ~StyleOptionPointerBase() { pointer = 0; }
+ virtual ~StyleOptionPointerBase() { pointer = nullptr; }
};
template <typename T>
struct StyleOptionPointer: public StyleOptionPointerBase
{
- StyleOptionPointer(T *p = 0): StyleOptionPointerBase(p) {}
- ~StyleOptionPointer() { delete static_cast<T *>(pointer); pointer = 0; }
+ StyleOptionPointer(T *p = nullptr): StyleOptionPointerBase(p) {}
+ ~StyleOptionPointer() { delete static_cast<T *>(pointer); pointer = nullptr; }
};
Q_DECLARE_METATYPE(StyleOptionPointerBase*)
@@ -94,25 +94,25 @@ void tst_QStyleOption::qstyleoptioncast()
QFETCH(bool, canCastToComplex);
QFETCH(int, type);
- QVERIFY(testOption->pointer != 0);
+ QVERIFY(testOption->pointer != nullptr);
QCOMPARE(testOption->pointer->type, type);
// Cast to common base class
QStyleOption *castOption = qstyleoption_cast<QStyleOption*>(testOption->pointer);
- QVERIFY(castOption != 0);
+ QVERIFY(castOption != nullptr);
// Cast to complex base class
castOption = qstyleoption_cast<QStyleOptionComplex*>(testOption->pointer);
- QCOMPARE(canCastToComplex, (castOption != 0));
+ QCOMPARE(canCastToComplex, (castOption != nullptr));
// Cast to combo box
castOption = qstyleoption_cast<QStyleOptionComboBox*>(testOption->pointer);
- QCOMPARE((castOption != 0),(testOption->pointer->type == QStyleOption::SO_ComboBox));
+ QCOMPARE((castOption != nullptr),(testOption->pointer->type == QStyleOption::SO_ComboBox));
// Cast to button
castOption = qstyleoption_cast<QStyleOptionButton*>(testOption->pointer);
- QCOMPARE((castOption != 0),(testOption->pointer->type == QStyleOption::SO_Button));
+ QCOMPARE((castOption != nullptr),(testOption->pointer->type == QStyleOption::SO_Button));
// Cast to lower version
testOption->pointer->version += 1;