summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets
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/widgets
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/widgets')
-rw-r--r--tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp2
-rw-r--r--tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp4
-rw-r--r--tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp2
-rw-r--r--tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp4
-rw-r--r--tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp8
-rw-r--r--tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp8
-rw-r--r--tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp4
-rw-r--r--tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp4
-rw-r--r--tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp2
-rw-r--r--tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp4
-rw-r--r--tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp4
-rw-r--r--tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp6
-rw-r--r--tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp2
-rw-r--r--tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp2
14 files changed, 28 insertions, 28 deletions
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<QDockWidget*>(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<QToolButton*>(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