From 564b59d903683b14c75b72a3e93367717f201def Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 7 Oct 2020 13:05:48 +0200 Subject: 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 Reviewed-by: Friedemann Kleint --- .../dialogs/qcolordialog/tst_qcolordialog.cpp | 2 +- tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp | 2 +- .../dialogs/qerrormessage/tst_qerrormessage.cpp | 4 ++-- .../dialogs/qfiledialog/tst_qfiledialog.cpp | 2 +- .../dialogs/qfiledialog2/tst_qfiledialog2.cpp | 4 ++-- tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp | 18 +++++++++--------- .../auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp | 6 +++--- .../qgraphicseffect/tst_qgraphicseffect.cpp | 19 ++++++++++--------- .../tst_qgraphicsanchorlayout.cpp | 18 +++++++++--------- .../tst_qgraphicsanchorlayout1.cpp | 2 +- .../tst_qgraphicsgridlayout.cpp | 2 +- .../qgraphicslayout/tst_qgraphicslayout.cpp | 4 ++-- .../tst_qgraphicslinearlayout.cpp | 10 +++++----- .../qgraphicsobject/tst_qgraphicsobject.cpp | 4 ++-- .../tst_qgraphicspixmapitem.cpp | 4 ++-- .../tst_qgraphicspolygonitem.cpp | 4 ++-- .../tst_qgraphicsproxywidget.cpp | 12 ++++++------ .../tst_qgraphicssceneindex.cpp | 6 +++--- .../qgraphicsview/tst_qgraphicsview.cpp | 10 +++++----- .../qgraphicswidget/tst_qgraphicswidget.cpp | 17 ++++++++--------- .../itemviews/qitemdelegate/tst_qitemdelegate.cpp | 4 ++-- .../widgets/kernel/qboxlayout/tst_qboxlayout.cpp | 8 ++++---- .../widgets/kernel/qformlayout/tst_qformlayout.cpp | 12 ++++++------ .../widgets/kernel/qgridlayout/tst_qgridlayout.cpp | 22 +++++++++++----------- .../auto/widgets/kernel/qtooltip/tst_qtooltip.cpp | 2 +- .../kernel/qwidget_window/tst_qwidget_window.cpp | 4 ++-- .../kernel/qwidgetmetatype/tst_qwidgetmetatype.cpp | 2 +- .../kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp | 2 +- .../widgets/styles/qmacstyle/tst_qmacstyle.cpp | 2 +- .../styles/qstyleoption/tst_qstyleoption.cpp | 18 +++++++++--------- .../qabstractbutton/tst_qabstractbutton.cpp | 2 +- .../widgets/widgets/qcombobox/tst_qcombobox.cpp | 4 ++-- .../widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 2 +- .../widgets/qdoublespinbox/tst_qdoublespinbox.cpp | 4 ++-- .../widgets/widgets/qlineedit/tst_qlineedit.cpp | 8 ++++---- .../widgets/qmainwindow/tst_qmainwindow.cpp | 8 ++++---- .../auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 4 ++-- tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 4 ++-- .../widgets/qscrollarea/tst_qscrollarea.cpp | 2 +- .../widgets/widgets/qscrollbar/tst_qscrollbar.cpp | 4 ++-- .../auto/widgets/widgets/qspinbox/tst_qspinbox.cpp | 4 ++-- .../widgets/widgets/qsplitter/tst_qsplitter.cpp | 6 +++--- tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp | 2 +- .../widgets/widgets/qtextedit/tst_qtextedit.cpp | 2 +- 44 files changed, 141 insertions(+), 141 deletions(-) (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp index 413b865f04..c329ca9f3e 100644 --- a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp +++ b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp @@ -58,7 +58,7 @@ class TestNativeDialog : public QColorDialog public: QWidget *m_activeModalWidget; - TestNativeDialog(QWidget *parent = 0) + TestNativeDialog(QWidget *parent = nullptr) : QColorDialog(parent), m_activeModalWidget(0) { QTimer::singleShot(1, this, SLOT(test_activeModalWidgetSignal())); diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 266ed0de05..cc613b8218 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -98,7 +98,7 @@ void tst_QDialog::getSetCheck() class ToolDialog : public QDialog { public: - ToolDialog(QWidget *parent = 0) + ToolDialog(QWidget *parent = nullptr) : QDialog(parent, Qt::Tool), mWasActive(false), mWasModalWindow(false), tId(-1) {} bool wasActive() const { return mWasActive; } diff --git a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp index a4204da20e..49ecc7305d 100644 --- a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp +++ b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp @@ -44,7 +44,7 @@ void tst_QErrorMessage::dontShowAgain() { QString plainString = QLatin1String("foo"); QString htmlString = QLatin1String("foo
bar"); - QCheckBox *checkBox = 0; + QCheckBox *checkBox = nullptr; QErrorMessage errorMessageDialog(0); @@ -92,7 +92,7 @@ void tst_QErrorMessage::dontShowCategoryAgain() { QString htmlString = QLatin1String("foo
bar"); QString htmlString2 = QLatin1String("foo2
bar2"); - QCheckBox *checkBox = 0; + QCheckBox *checkBox = nullptr; QErrorMessage errorMessageDialog(0); diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 4b9466d3b6..e070f74ae5 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -365,7 +365,7 @@ void tst_QFiledialog::filterSelectedSignal() void tst_QFiledialog::args() { - QWidget *parent = 0; + QWidget *parent = nullptr; QString caption = "caption"; QString directory = QDir::tempPath(); QString filter = "*.mp3"; diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 45ed5d7d21..92ca7f005c 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -918,7 +918,7 @@ void tst_QFileDialog2::task239706_editableFilterCombo() QVERIFY(QTest::qWaitForWindowExposed(&d)); QList comboList = d.findChildren(); - QComboBox *filterCombo = 0; + QComboBox *filterCombo = nullptr; foreach (QComboBox *combo, comboList) { if (combo->objectName() == QString("fileTypeCombo")) { filterCombo = combo; @@ -991,7 +991,7 @@ void tst_QFileDialog2::task251321_sideBarHiddenEntries() class MyQSideBar : public QSidebar { public : - MyQSideBar(QWidget *parent = 0) : QSidebar(parent) + MyQSideBar(QWidget *parent = nullptr) : QSidebar(parent) {} void removeSelection() { diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 3e8a81c33c..b8d2a4617c 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -372,11 +372,11 @@ void tst_QWizard::setButton() QVERIFY(qobject_cast(wizard.button(QWizard::CustomButton2))); QVERIFY(qobject_cast(wizard.button(QWizard::CustomButton1))); - QVERIFY(toolButton != 0); + QVERIFY(toolButton != nullptr); // resetting the same button does nothing wizard.setButton(QWizard::NextButton, toolButton); - QVERIFY(toolButton != 0); + QVERIFY(toolButton != nullptr); // revert to default button wizard.setButton(QWizard::NextButton, 0); @@ -470,8 +470,8 @@ public: } void registerField(const QString &name, QWidget *widget, - const char *property = 0, - const char *changedSignal = 0) + const char *property = nullptr, + const char *changedSignal = nullptr) { QWizardPage::registerField(name, widget, property, changedSignal); } QLineEdit *edit1; @@ -2409,7 +2409,7 @@ void tst_QWizard::sideWidget() { QWizard wizard; - wizard.setSideWidget(0); + wizard.setSideWidget(nullptr); QVERIFY(!wizard.sideWidget()); QScopedPointer w1(new QWidget(&wizard)); wizard.setSideWidget(w1.data()); @@ -2417,11 +2417,11 @@ void tst_QWizard::sideWidget() QWidget *w2 = new QWidget(&wizard); wizard.setSideWidget(w2); QCOMPARE(wizard.sideWidget(), w2); - QVERIFY(w1->parent() != 0); + QVERIFY(w1->parent() != nullptr); QCOMPARE(w1->window(), static_cast(&wizard)); QCOMPARE(w2->window(), static_cast(&wizard)); - w1->setParent(0); - wizard.setSideWidget(0); + w1->setParent(nullptr); + wizard.setSideWidget(nullptr); QVERIFY(!wizard.sideWidget()); } @@ -2498,7 +2498,7 @@ void tst_QWizard::task177716_disableCommitButton() class WizardPage_task183550 : public QWizardPage { public: - WizardPage_task183550(QWidget *parent = 0) + WizardPage_task183550(QWidget *parent = nullptr) : QWizardPage(parent) , treeWidget(new QTreeWidget) , verticalPolicy(QSizePolicy::MinimumExpanding) {} diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp index cc48543a76..e090c0d851 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard_2.cpp @@ -41,7 +41,7 @@ class taskQTBUG_25691 : public QWizard { Q_OBJECT public: - taskQTBUG_25691( QWidget * parent = 0 ); + taskQTBUG_25691( QWidget * parent = nullptr ); ~taskQTBUG_25691(void); }; @@ -50,7 +50,7 @@ class taskQTBUG_25691Page1 : public QWizardPage { Q_OBJECT public: - taskQTBUG_25691Page1( QWidget * parent = 0 ); + taskQTBUG_25691Page1( QWidget * parent = nullptr ); ~taskQTBUG_25691Page1(void); }; @@ -59,7 +59,7 @@ class taskQTBUG_25691Page2 : public QWizardPage { Q_OBJECT public: - taskQTBUG_25691Page2( QWidget * parent = 0 ); + taskQTBUG_25691Page2( QWidget * parent = nullptr ); virtual void initializePage(void) override; diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp index bd1b56ebc1..0aead57d11 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp @@ -68,9 +68,9 @@ void tst_QGraphicsEffect::initTestCase() class CustomItem : public QGraphicsRectItem { public: - CustomItem(qreal x, qreal y, qreal width, qreal height, QGraphicsItem *parent = 0) + CustomItem(qreal x, qreal y, qreal width, qreal height, QGraphicsItem *parent = nullptr) : QGraphicsRectItem(x, y, width, height, parent), numRepaints(0), - m_painter(0), m_styleOption(0) + m_painter(nullptr), m_styleOption(nullptr) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override @@ -84,8 +84,8 @@ public: void reset() { numRepaints = 0; - m_painter = 0; - m_styleOption = 0; + m_painter = nullptr; + m_styleOption = nullptr; } int numRepaints; @@ -98,7 +98,8 @@ class CustomEffect : public QGraphicsEffect public: CustomEffect() : QGraphicsEffect(), numRepaints(0), m_margin(10), - doNothingInDraw(false), m_painter(0), m_styleOption(0), m_source(0), m_opacity(1.0) + doNothingInDraw(false), m_painter(nullptr), m_styleOption(nullptr), + m_source(nullptr), m_opacity(1.0) {} QRectF boundingRectFor(const QRectF &rect) const override @@ -108,9 +109,9 @@ public: { numRepaints = 0; m_sourceChangedFlags = QGraphicsEffect::ChangeFlags(); - m_painter = 0; - m_styleOption = 0; - m_source = 0; + m_painter = nullptr; + m_styleOption = nullptr; + m_source = nullptr; m_opacity = 1.0; } @@ -645,7 +646,7 @@ void tst_QGraphicsEffect::dropShadowClipping() class MyGraphicsItem : public QGraphicsWidget { public: - MyGraphicsItem(QGraphicsItem *parent = 0) : + MyGraphicsItem(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent), nbPaint(0) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index 934505034e..f755b4eb76 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -85,7 +85,7 @@ private slots: class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){} + RectWidget(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent){} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override { @@ -1112,8 +1112,8 @@ 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; @@ -1121,8 +1121,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; }; @@ -1132,8 +1132,8 @@ public: 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)) { @@ -1153,8 +1153,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/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp index d1f8954ab9..840db1c364 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp @@ -149,7 +149,7 @@ Q_DECLARE_METATYPE(AnchorItemSizeHintList) class TestWidget : public QGraphicsWidget { public: - inline TestWidget(QGraphicsItem *parent = 0, const QString &name = QString()) + inline TestWidget(QGraphicsItem *parent = nullptr, const QString &name = QString()) : QGraphicsWidget(parent) { setContentsMargins( 0,0,0,0 ); diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 7e7536a94c..986ef2a126 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -119,7 +119,7 @@ private slots: class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), m_fnConstraint(0) {} + RectWidget(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent), m_fnConstraint(0) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override { diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp index cc416f76b2..7143dec0a1 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp @@ -90,7 +90,7 @@ enum FunctionType { class TestGraphicsWidget : public QGraphicsWidget { public: - TestGraphicsWidget(QGraphicsWidget *parent = 0) : QGraphicsWidget(parent) + TestGraphicsWidget(QGraphicsWidget *parent = nullptr) : QGraphicsWidget(parent) { } bool event(QEvent *e) override @@ -229,7 +229,7 @@ void tst_QGraphicsLayout::automaticReparenting() class TestLayout : public QGraphicsLinearLayout { public: - TestLayout(QGraphicsLayoutItem *parent = 0) + TestLayout(QGraphicsLayoutItem *parent = nullptr) : QGraphicsLinearLayout(parent) { setContentsMargins(0,0,0,0); diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 0851b20927..4371347475 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -143,7 +143,7 @@ void tst_QGraphicsLinearLayout::initTestCase() class RectWidget : public QGraphicsWidget { public: - RectWidget(QGraphicsItem *parent = 0, const QBrush &brush = QBrush()) : QGraphicsWidget(parent){ m_brush = brush;} + RectWidget(QGraphicsItem *parent = nullptr, const QBrush &brush = QBrush()) : QGraphicsWidget(parent){ m_brush = brush;} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override { @@ -514,7 +514,7 @@ void tst_QGraphicsLinearLayout::insertItem() for (int i = 0; i < layoutCount; ++i) layout.addItem(new SubQGraphicsLinearLayout); - QGraphicsLayoutItem *item = 0; + QGraphicsLayoutItem *item = nullptr; if (isWidget) item = new QGraphicsWidget; else @@ -571,7 +571,7 @@ void tst_QGraphicsLinearLayout::insertStretch() scene.addItem(widget); QListitems; - QGraphicsWidget *item = 0; + QGraphicsWidget *item = nullptr; for (int i = 0; i < itemCount; ++i) { item = new RectWidget; item->setMinimumSize(10, 10); @@ -792,7 +792,7 @@ void tst_QGraphicsLinearLayout::removeAt() layout.addItem(new SubQGraphicsLinearLayout); QSizeF oldSizeHint = layout.sizeHint(Qt::PreferredSize, QSizeF()); - QGraphicsLayoutItem *w = 0; + QGraphicsLayoutItem *w = nullptr; if (removeItemAt >= 0 && removeItemAt < layout.count()) w = layout.itemAt(removeItemAt); if (w) { @@ -842,7 +842,7 @@ void tst_QGraphicsLinearLayout::removeItem() for (int i = 0; i < layoutCount; ++i) layout.addItem(new SubQGraphicsLinearLayout); - QGraphicsLayoutItem *w = 0; + QGraphicsLayoutItem *w = nullptr; if (removeItemAt >= 0 && removeItemAt < layout.count()) w = layout.itemAt(removeItemAt); QSizeF oldSizeHint = layout.sizeHint(Qt::PreferredSize, QSizeF()); diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp index ddcdc809d9..482ce7d244 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp @@ -210,7 +210,7 @@ void tst_QGraphicsObject::visible() class DeleteTester : public QGraphicsObject { public: - DeleteTester(bool *w, bool *pw, QGraphicsItem *parent = 0) + DeleteTester(bool *w, bool *pw, QGraphicsItem *parent = nullptr) : QGraphicsObject(parent), wasDeleted(w), parentWasDeleted(pw) { } @@ -223,7 +223,7 @@ public: } } - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0) override + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override { } QRectF boundingRect() const override { return QRectF(); } diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp index e7bba010d9..a8f5e396e8 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp @@ -74,11 +74,11 @@ public: enum Extension { UserExtension = QGraphicsItem::UserExtension }; - SubQGraphicsPixmapItem(QGraphicsItem *parent = 0) : QGraphicsPixmapItem(parent) + SubQGraphicsPixmapItem(QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(parent) { } - SubQGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = 0) : QGraphicsPixmapItem(pixmap, parent) + SubQGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent = nullptr) : QGraphicsPixmapItem(pixmap, parent) { } diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp index 5380dd0daf..9f0d47223b 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp @@ -70,11 +70,11 @@ public: UserExtension = QGraphicsItem::UserExtension }; - SubQGraphicsPolygonItem(QGraphicsItem *parent = 0) : QGraphicsPolygonItem(parent) + SubQGraphicsPolygonItem(QGraphicsItem *parent = nullptr) : QGraphicsPolygonItem(parent) { } - SubQGraphicsPolygonItem(const QPolygonF &polygon, QGraphicsItem *parent = 0) : QGraphicsPolygonItem(polygon, parent) + SubQGraphicsPolygonItem(const QPolygonF &polygon, QGraphicsItem *parent = nullptr) : QGraphicsPolygonItem(polygon, parent) { } diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 34f27dbfcf..7cb441a925 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -170,7 +170,7 @@ class SubQGraphicsProxyWidget : public QGraphicsProxyWidget { public: - SubQGraphicsProxyWidget(QGraphicsItem *parent = 0) : QGraphicsProxyWidget(parent), + SubQGraphicsProxyWidget(QGraphicsItem *parent = nullptr) : QGraphicsProxyWidget(parent), paintCount(0), keyPress(0), focusOut(0) {} @@ -225,7 +225,7 @@ public: void call_showEvent(QShowEvent* event) { return SubQGraphicsProxyWidget::showEvent(event); } - void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) { + void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) { paintCount++; QGraphicsProxyWidget::paint(painter, option, widget); } @@ -1482,7 +1482,7 @@ void tst_QGraphicsProxyWidget::maximumSize() class View : public QGraphicsView { public: - View(QGraphicsScene *scene, QWidget *parent = 0) + View(QGraphicsScene *scene, QWidget *parent = nullptr) : QGraphicsView(scene, parent), npaints(0) { } QRegion paintEventRegion; @@ -2758,7 +2758,7 @@ void tst_QGraphicsProxyWidget::childPos() QApplication::processEvents(); QApplication::processEvents(); - QWidget *menu = 0; + QWidget *menu = nullptr; foreach (QObject *child, box->children()) { if ((menu = qobject_cast(child))) break; @@ -3670,7 +3670,7 @@ void tst_QGraphicsProxyWidget::windowFrameMargins() class HoverButton : public QPushButton { public: - HoverButton(QWidget *parent = 0) : QPushButton(parent), hoverLeaveReceived(false) + HoverButton(QWidget *parent = nullptr) : QPushButton(parent), hoverLeaveReceived(false) {} bool hoverLeaveReceived; @@ -3830,7 +3830,7 @@ void tst_QGraphicsProxyWidget::QTBUG_43780_visibility() class TouchWidget : public QWidget { public: - TouchWidget(QWidget *parent = 0) : QWidget(parent) {} + TouchWidget(QWidget *parent = nullptr) : QWidget(parent) {} bool event(QEvent *event) { diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp index d875eb1db4..640e0418e5 100644 --- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp @@ -73,7 +73,7 @@ void tst_QGraphicsSceneIndex::common_data() QGraphicsSceneIndex *tst_QGraphicsSceneIndex::createIndex(const QString &indexMethod) { - QGraphicsSceneIndex *index = 0; + QGraphicsSceneIndex *index = nullptr; QGraphicsScene *scene = new QGraphicsScene(); if (indexMethod == "bsp") index = new QGraphicsSceneBspTreeIndex(scene); @@ -277,7 +277,7 @@ class RectWidget : public QGraphicsWidget { Q_OBJECT public: - RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent) + RectWidget(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent) { } @@ -333,7 +333,7 @@ void tst_QGraphicsSceneIndex::clear() class MyItem : public QGraphicsItem { public: - MyItem(QGraphicsItem *parent = 0) : QGraphicsItem(parent), numPaints(0) {} + MyItem(QGraphicsItem *parent = nullptr) : QGraphicsItem(parent), numPaints(0) {} int numPaints; protected: QRectF boundingRect() const override { return QRectF(0, 0, 10, 10); } diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 42a16dc1f4..41d29e9b7b 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -1593,7 +1593,7 @@ public: : QGraphicsRectItem(rect), numPaints(0) { } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override { ++numPaints; QGraphicsRectItem::paint(painter, option, widget); @@ -2422,7 +2422,7 @@ class CustomView : public QGraphicsView { Q_OBJECT public: - CustomView(QGraphicsScene *s = 0) : QGraphicsView(s) {} + CustomView(QGraphicsScene *s = nullptr) : QGraphicsView(s) {} CustomView(QGraphicsScene *s, QWidget *parent) : QGraphicsView(s, parent) {} QList lastUpdateRegions; @@ -3152,7 +3152,7 @@ void tst_QGraphicsView::itemsUnderMouse() class QGraphicsTextItem_task172231 : public QGraphicsTextItem { public: - QGraphicsTextItem_task172231(const QString & text, QGraphicsItem * parent = 0) + QGraphicsTextItem_task172231(const QString & text, QGraphicsItem * parent = nullptr) : QGraphicsTextItem(text, parent) {} QRectF exposedRect; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override @@ -3397,7 +3397,7 @@ void tst_QGraphicsView::task239729_noViewUpdate() // The scene's changed signal is connected to something that isn't a view. QGraphicsScene scene; ChangedListener cl; - QGraphicsView *view = 0; + QGraphicsView *view = nullptr; if (a) { view = new QGraphicsView(&scene); @@ -4835,7 +4835,7 @@ void tst_QGraphicsView::hoverLeave() class IMItem : public QGraphicsRectItem { public: - IMItem(QGraphicsItem *parent = 0): + IMItem(QGraphicsItem *parent = nullptr): QGraphicsRectItem(QRectF(0, 0, 20, 20), parent) { setFlag(QGraphicsItem::ItemIsFocusable, true); diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 4298cc3da7..f31b82b2bb 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -174,7 +174,7 @@ private slots: // Subclass that exposes the protected functions. class SubQGraphicsWidget : public QGraphicsWidget { public: - SubQGraphicsWidget(QGraphicsItem *parent = 0, Qt::WindowFlags windowFlags = { }) + SubQGraphicsWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags windowFlags = { }) : QGraphicsWidget(parent, windowFlags), eventCount(0) { } @@ -254,7 +254,7 @@ protected: class SizeHinter : public QGraphicsWidget { public: - SizeHinter(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = { }, + SizeHinter(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = { }, const QSizeF &min = QSizeF(5,5), const QSizeF &pref = QSizeF(50, 50), const QSizeF &max = QSizeF(500, 500)) @@ -382,7 +382,7 @@ void tst_QGraphicsWidget::dumpFocusChain() // ### this test is very strange... QFETCH(bool, scene); SubQGraphicsWidget *parent = new SubQGraphicsWidget; - QGraphicsScene *theScene = 0; + QGraphicsScene *theScene = nullptr; if (scene) { theScene = new QGraphicsScene(this); theScene->addItem(parent); @@ -518,7 +518,7 @@ void tst_QGraphicsWidget::focusWidget2() class FocusWatchWidget : public QGraphicsWidget { public: - FocusWatchWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent) { gotFocusInCount = 0; gotFocusOutCount = 0; } + FocusWatchWidget(QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent) { gotFocusInCount = 0; gotFocusOutCount = 0; } int gotFocusInCount, gotFocusOutCount; protected: void focusInEvent(QFocusEvent *fe) { gotFocusInCount++; QGraphicsWidget::focusInEvent(fe); } @@ -1396,7 +1396,7 @@ void tst_QGraphicsWidget::setTabOrder() QApplication::setActiveWindow(&view); QVERIFY(QTest::qWaitForWindowActive(&view)); - QGraphicsWidget *lastItem = 0; + QGraphicsWidget *lastItem = nullptr; QTest::ignoreMessage(QtWarningMsg, "QGraphicsWidget::setTabOrder(0, 0) is undefined"); QGraphicsWidget::setTabOrder(0, 0); @@ -2587,7 +2587,7 @@ void tst_QGraphicsWidget::shortcutsDeletion() class MessUpPainterWidget : public QGraphicsWidget { public: - MessUpPainterWidget(QGraphicsItem * parent = 0, Qt::WindowFlags wFlags = { }) + MessUpPainterWidget(QGraphicsItem * parent = nullptr, Qt::WindowFlags wFlags = { }) : QGraphicsWidget(parent, wFlags) {} @@ -3278,8 +3278,7 @@ void tst_QGraphicsWidget::itemSendGeometryPosChangesDeactivated() item->setGeometry(QRectF(0, 0, 60, 60)); QCOMPARE(item->geometry(), QRectF(0, 0, 60, 60)); QCOMPARE(item->pos(), QPointF(0, 0)); - item->setPos(QPointF(10, 10)); - QCOMPARE(item->pos(), QPointF(10, 10)); + item->setPos(QPointF(10, 10)); QCOMPARE(item->pos(), QPointF(10, 10)); QCOMPARE(item->geometry(), QRectF(10, 10, 60, 60)); } @@ -3287,7 +3286,7 @@ class TabFocusWidget : public QGraphicsWidget { Q_OBJECT public: - TabFocusWidget(const QString &name, QGraphicsItem *parent = 0) + TabFocusWidget(const QString &name, QGraphicsItem *parent = nullptr) : QGraphicsWidget(parent) { setFocusPolicy(Qt::TabFocus); setData(0, name); } }; diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index 16f8b97d49..a8a39b7113 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -72,7 +72,7 @@ Q_DECLARE_METATYPE(QAbstractItemDelegate::EndEditHint) class TestItemDelegate : public QItemDelegate { public: - TestItemDelegate(QObject *parent = 0) : QItemDelegate(parent) {} + TestItemDelegate(QObject *parent = nullptr) : QItemDelegate(parent) {} ~TestItemDelegate() {} void drawDisplay(QPainter *painter, @@ -829,7 +829,7 @@ public: m_editor = 0; // but clear the variable } - ChooseEditorDelegate(QObject *parent = 0) : QItemDelegate(parent) { } + ChooseEditorDelegate(QObject *parent = nullptr) : QItemDelegate(parent) { } void setNextOpenEditor(QWidget *w) { m_editor = w; } QWidget* currentEditor() const { return m_editor; } private: 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 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() 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 struct StyleOptionPointer: public StyleOptionPointerBase { - StyleOptionPointer(T *p = 0): StyleOptionPointerBase(p) {} - ~StyleOptionPointer() { delete static_cast(pointer); pointer = 0; } + StyleOptionPointer(T *p = nullptr): StyleOptionPointerBase(p) {} + ~StyleOptionPointer() { delete static_cast(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(testOption->pointer); - QVERIFY(castOption != 0); + QVERIFY(castOption != nullptr); // Cast to complex base class castOption = qstyleoption_cast(testOption->pointer); - QCOMPARE(canCastToComplex, (castOption != 0)); + QCOMPARE(canCastToComplex, (castOption != nullptr)); // Cast to combo box castOption = qstyleoption_cast(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(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; diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp index 3b2bc1d126..26198c9aff 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp +++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp @@ -102,7 +102,7 @@ private: class MyButton : public QAbstractButton { public: - MyButton(QWidget *p = 0) : QAbstractButton(p) {} + MyButton(QWidget *p = nullptr) : QAbstractButton(p) {} void paintEvent(QPaintEvent *) override { QPainter p(this); diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index c7d918fa6a..30f51e1d42 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -1822,7 +1822,7 @@ class ReturnClass : public QWidget { Q_OBJECT public: - ReturnClass(QWidget *parent = 0) + ReturnClass(QWidget *parent = nullptr) : QWidget(parent), received(false) { QComboBox *box = new QComboBox(this); @@ -2303,7 +2303,7 @@ class task166349_ComboBox : public QComboBox { Q_OBJECT public: - task166349_ComboBox(QWidget *parent = 0) : QComboBox(parent) + task166349_ComboBox(QWidget *parent = nullptr) : QComboBox(parent) { QStringList list; list << "one" << "two"; diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index ef813c3021..e8aafa9c03 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -89,7 +89,7 @@ class EditorDateEdit : public QDateTimeEdit { Q_OBJECT public: - EditorDateEdit(QWidget *parent = 0) : QDateTimeEdit(parent) {} + EditorDateEdit(QWidget *parent = nullptr) : QDateTimeEdit(parent) {} QLineEdit *lineEdit() { return QDateTimeEdit::lineEdit(); } friend class tst_QDateTimeEdit; }; diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp index 04a68dd80f..66a4dff584 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp @@ -49,7 +49,7 @@ class DoubleSpinBox : public QDoubleSpinBox { Q_OBJECT public: - DoubleSpinBox(QWidget *parent = 0) + DoubleSpinBox(QWidget *parent = nullptr) : QDoubleSpinBox(parent) { /*connect(this, SIGNAL(valueChanged(double)), this, SLOT(foo(double)));*/ } QString textFromValue(double v) const override @@ -1081,7 +1081,7 @@ void tst_QDoubleSpinBox::undoRedo() struct task199226_DoubleSpinBox : public QDoubleSpinBox { - task199226_DoubleSpinBox(QWidget *parent = 0) : QDoubleSpinBox(parent) {} + task199226_DoubleSpinBox(QWidget *parent = nullptr) : QDoubleSpinBox(parent) {} QLineEdit *lineEdit() { return QAbstractSpinBox::lineEdit(); } }; diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 9851e9edbd..e4bf36efaa 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -904,7 +904,7 @@ static const int chars = 8; class ValidatorWithFixup : public QValidator { public: - ValidatorWithFixup(QWidget *parent = 0) + ValidatorWithFixup(QWidget *parent = nullptr) : QValidator(parent) {} @@ -3151,7 +3151,7 @@ void tst_QLineEdit::cutWithoutSelection() class InputMaskValidator : public QValidator { public: - InputMaskValidator(QObject *parent, const char *name = 0) : QValidator(parent) { setObjectName(name); } + InputMaskValidator(QObject *parent, const char *name = nullptr) : QValidator(parent) { setObjectName(name); } State validate(QString &text, int &pos) const override { InputMaskValidator *that = (InputMaskValidator *)this; @@ -3671,7 +3671,7 @@ void tst_QLineEdit::cursor() class task180999_Widget : public QWidget { public: - task180999_Widget(QWidget *parent = 0) : QWidget(parent) + task180999_Widget(QWidget *parent = nullptr) : QWidget(parent) { QHBoxLayout *layout = new QHBoxLayout(this); lineEdit1.setText("some text 1 ..."); @@ -3776,7 +3776,7 @@ class task198789_Widget : public QWidget { Q_OBJECT public: - task198789_Widget(QWidget *parent = 0) : QWidget(parent) + task198789_Widget(QWidget *parent = nullptr) : QWidget(parent) { QStringList wordList; wordList << "alpha" << "omega" << "omicron" << "zeta"; diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index b0fc8a3bfa..75721bf7a7 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -1456,7 +1456,7 @@ void tst_QMainWindow::createPopupMenu() class MyDockWidget : public QDockWidget { public: - MyDockWidget(QWidget * = 0) { + MyDockWidget(QWidget * = nullptr) { create(); // otherwise hide() doesn't result in a hide event } }; @@ -1464,7 +1464,7 @@ public: class MyWidget : public QWidget { public: - MyWidget(QWidget *parent = 0) : QWidget(parent) + MyWidget(QWidget *parent = nullptr) : QWidget(parent) { } @@ -1522,10 +1522,10 @@ void AddDockWidget::apply(QMainWindow *mw) const dw->setObjectName(name); dw->setWindowTitle(name); - QDockWidget *other = 0; + QDockWidget *other = nullptr; if (mode == SplitMode || mode == TabMode) { other = mw->findChild(this->other); - QVERIFY(other != 0); + QVERIFY(other != nullptr); } switch (mode) { diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 53dbf2012f..12593298e8 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -791,7 +791,7 @@ void tst_QMdiArea::changeModified() class MyChild : public QWidget { public: - MyChild(QWidget *parent = 0) : QWidget(parent) {} + MyChild(QWidget *parent = nullptr) : QWidget(parent) {} QSize sizeHint() const override { return QSize(234, 123); } }; @@ -865,7 +865,7 @@ void tst_QMdiArea::fixedSize() class LargeWidget : public QWidget { public: - LargeWidget(QWidget *parent = 0) : QWidget(parent) {} + LargeWidget(QWidget *parent = nullptr) : QWidget(parent) {} QSize sizeHint() const override { return QSize(1280, 1024); } QSize minimumSizeHint() const override { return QSize(300, 300); } }; diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 9a6cf3bfcf..e0f3381b8d 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -534,7 +534,7 @@ void tst_QMenu::statusTip() QRect rect1 = tb.actionGeometry(&a); QToolButton *btn = qobject_cast(tb.childAt(rect1.center())); - QVERIFY(btn != NULL); + QVERIFY(btn != nullptr); //because showMenu calls QMenu::exec, we need to use a singleshot //to continue the test @@ -1035,7 +1035,7 @@ void tst_QMenu::deleteActionInTriggered() class PopulateOnAboutToShowTestMenu : public QMenu { Q_OBJECT public: - explicit PopulateOnAboutToShowTestMenu(QWidget *parent = 0); + explicit PopulateOnAboutToShowTestMenu(QWidget *parent = nullptr); public slots: void populateMenu(); diff --git a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp index c14b3aa9d8..668d301205 100644 --- a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp +++ b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp @@ -80,7 +80,7 @@ void tst_QScrollArea::getSetCheck() class WidgetWithMicroFocus : public QWidget { public: - WidgetWithMicroFocus(QWidget *parent = 0) : QWidget(parent) + WidgetWithMicroFocus(QWidget *parent = nullptr) : QWidget(parent) { setBackgroundRole(QPalette::Dark); } diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp index 92771db764..a40ce538b2 100644 --- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp +++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp @@ -52,7 +52,7 @@ private slots: class SingleStepTestScrollBar : public QScrollBar { Q_OBJECT public: - explicit SingleStepTestScrollBar(Qt::Orientation o, QWidget *parent = 0) : QScrollBar(o, parent) {} + explicit SingleStepTestScrollBar(Qt::Orientation o, QWidget *parent = nullptr) : QScrollBar(o, parent) {} public slots: void hideAndShow() @@ -99,7 +99,7 @@ void tst_QScrollBar::task_209492() { public: int scrollCount; - MyScrollArea(QWidget *parent = 0) : QScrollArea(parent), scrollCount(0) {} + MyScrollArea(QWidget *parent = nullptr) : QScrollArea(parent), scrollCount(0) {} protected: void paintEvent(QPaintEvent *) override { QTest::qSleep(600); } void scrollContentsBy(int, int) override { ++scrollCount; viewport()->update(); } diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index 35f796a37f..832635cc32 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -61,7 +61,7 @@ class SpinBox : public QSpinBox { public: - SpinBox(QWidget *parent = 0) + SpinBox(QWidget *parent = nullptr) : QSpinBox(parent) {} QString textFromValue(int v) const override @@ -508,7 +508,7 @@ void tst_QSpinBox::valueChangedHelper(int value) class ReadOnlyChangeTracker: public QSpinBox { public: - ReadOnlyChangeTracker(QWidget *parent = 0) : QSpinBox(parent) {} + ReadOnlyChangeTracker(QWidget *parent = nullptr) : QSpinBox(parent) {} void changeEvent(QEvent *ev) override { diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index b63e917e5c..36cb15fa1f 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -147,7 +147,7 @@ void tst_QSplitter::init() void tst_QSplitter::removeThirdWidget() { delete w3; - w3 = 0; + w3 = nullptr; int handleWidth = splitter->style()->pixelMetric(QStyle::PM_SplitterWidth); splitter->setFixedSize(400 + handleWidth, 400); } @@ -302,7 +302,7 @@ class TestSplitterStyle : public QProxyStyle { public: TestSplitterStyle() : handleWidth(5) {} - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override + int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, const QWidget *widget = nullptr) const override { if (metric == QStyle::PM_SplitterWidth) return handleWidth; @@ -652,7 +652,7 @@ void tst_QSplitter::testRemoval() class MyFriendlySplitter : public QSplitter { public: - MyFriendlySplitter(QWidget *parent = 0) : QSplitter(parent) {} + MyFriendlySplitter(QWidget *parent = nullptr) : QSplitter(parent) {} void setRubberBand(int pos) { QSplitter::setRubberBand(pos); } void moveSplitter(int pos, int index) { QSplitter::moveSplitter(pos, index); } diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp index 2afbd44c03..c8e399f0f8 100644 --- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp +++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp @@ -671,7 +671,7 @@ class TitleChangeTabBar : public QTabBar int count; public: - TitleChangeTabBar(QWidget * parent = 0) : QTabBar(parent), count(0) + TitleChangeTabBar(QWidget * parent = nullptr) : QTabBar(parent), count(0) { setMovable(true); addTab("0"); diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index 4054e35e8d..a90ae9a55b 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -2642,7 +2642,7 @@ void tst_QTextEdit::findWithRegularExpressionReturnsFalseIfNoMoreResults() class TextEdit : public QTextEdit { public: - TextEdit(QWidget *parent = 0) + TextEdit(QWidget *parent = nullptr) : QTextEdit(parent) {} void wheelEvent(QWheelEvent *event) override -- cgit v1.2.3