summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
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/tools
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/tools')
-rw-r--r--tests/auto/tools/moc/cxx11-explicit-override-control.h18
-rw-r--r--tests/auto/tools/moc/cxx11-final-classes.h18
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp20
-rw-r--r--tests/auto/tools/qdbuscpp2xml/test1.h2
4 files changed, 29 insertions, 29 deletions
diff --git a/tests/auto/tools/moc/cxx11-explicit-override-control.h b/tests/auto/tools/moc/cxx11-explicit-override-control.h
index 2211112717..961d7c47c2 100644
--- a/tests/auto/tools/moc/cxx11-explicit-override-control.h
+++ b/tests/auto/tools/moc/cxx11-explicit-override-control.h
@@ -40,7 +40,7 @@ class ExplicitOverrideControlBase : public QObject
{
Q_OBJECT
public:
- explicit ExplicitOverrideControlBase(QObject *parent = 0)
+ explicit ExplicitOverrideControlBase(QObject *parent = nullptr)
: QObject(parent) {}
private Q_SLOTS:
@@ -62,7 +62,7 @@ class ExplicitOverrideControlFinalQt : public ExplicitOverrideControlBase
{
Q_OBJECT
public:
- explicit ExplicitOverrideControlFinalQt(QObject *parent = 0)
+ explicit ExplicitOverrideControlFinalQt(QObject *parent = nullptr)
: ExplicitOverrideControlBase(parent) {}
private Q_SLOTS:
@@ -84,7 +84,7 @@ class ExplicitOverrideControlFinalCxx11 : public ExplicitOverrideControlBase
{
Q_OBJECT
public:
- explicit ExplicitOverrideControlFinalCxx11(QObject *parent = 0)
+ explicit ExplicitOverrideControlFinalCxx11(QObject *parent = nullptr)
: ExplicitOverrideControlBase(parent) {}
private Q_SLOTS:
@@ -106,7 +106,7 @@ class ExplicitOverrideControlSealed : public ExplicitOverrideControlBase
{
Q_OBJECT
public:
- explicit ExplicitOverrideControlSealed(QObject *parent = 0)
+ explicit ExplicitOverrideControlSealed(QObject *parent = nullptr)
: ExplicitOverrideControlBase(parent) {}
private Q_SLOTS:
@@ -128,7 +128,7 @@ class ExplicitOverrideControlOverrideQt : public ExplicitOverrideControlBase
{
Q_OBJECT
public:
- explicit ExplicitOverrideControlOverrideQt(QObject *parent = 0)
+ explicit ExplicitOverrideControlOverrideQt(QObject *parent = nullptr)
: ExplicitOverrideControlBase(parent) {}
private Q_SLOTS:
@@ -150,7 +150,7 @@ class ExplicitOverrideControlOverrideCxx11 : public ExplicitOverrideControlBase
{
Q_OBJECT
public:
- explicit ExplicitOverrideControlOverrideCxx11(QObject *parent = 0)
+ explicit ExplicitOverrideControlOverrideCxx11(QObject *parent = nullptr)
: ExplicitOverrideControlBase(parent) {}
private Q_SLOTS:
@@ -172,7 +172,7 @@ class ExplicitOverrideControlFinalQtOverrideQt : public ExplicitOverrideControlB
{
Q_OBJECT
public:
- explicit ExplicitOverrideControlFinalQtOverrideQt(QObject *parent = 0)
+ explicit ExplicitOverrideControlFinalQtOverrideQt(QObject *parent = nullptr)
: ExplicitOverrideControlBase(parent) {}
private Q_SLOTS:
@@ -194,7 +194,7 @@ class ExplicitOverrideControlFinalCxx11OverrideCxx11 : public ExplicitOverrideCo
{
Q_OBJECT
public:
- explicit ExplicitOverrideControlFinalCxx11OverrideCxx11(QObject *parent = 0)
+ explicit ExplicitOverrideControlFinalCxx11OverrideCxx11(QObject *parent = nullptr)
: ExplicitOverrideControlBase(parent) {}
private Q_SLOTS:
@@ -216,7 +216,7 @@ class ExplicitOverrideControlSealedOverride : public ExplicitOverrideControlBase
{
Q_OBJECT
public:
- explicit ExplicitOverrideControlSealedOverride(QObject *parent = 0)
+ explicit ExplicitOverrideControlSealedOverride(QObject *parent = nullptr)
: ExplicitOverrideControlBase(parent) {}
private Q_SLOTS:
diff --git a/tests/auto/tools/moc/cxx11-final-classes.h b/tests/auto/tools/moc/cxx11-final-classes.h
index 0e1d8a7787..4bb5181eae 100644
--- a/tests/auto/tools/moc/cxx11-final-classes.h
+++ b/tests/auto/tools/moc/cxx11-final-classes.h
@@ -41,7 +41,7 @@ class FinalTestClassQt Q_DECL_FINAL : public QObject
{
Q_OBJECT
public:
- explicit FinalTestClassQt(QObject *parent = 0)
+ explicit FinalTestClassQt(QObject *parent = nullptr)
: QObject(parent) {}
};
@@ -50,7 +50,7 @@ class EXPORT_MACRO ExportedFinalTestClassQt Q_DECL_FINAL : public QObject
{
Q_OBJECT
public:
- explicit ExportedFinalTestClassQt(QObject *parent = 0)
+ explicit ExportedFinalTestClassQt(QObject *parent = nullptr)
: QObject(parent) {}
};
@@ -58,7 +58,7 @@ class EXPORT_MACRO2(X,Y,Z) ExportedFinalTestClassQtX Q_DECL_FINAL : public QObje
{
Q_OBJECT
public:
- explicit ExportedFinalTestClassQtX(QObject *parent = 0)
+ explicit ExportedFinalTestClassQtX(QObject *parent = nullptr)
: QObject(parent) {}
};
@@ -66,7 +66,7 @@ class FinalTestClassCpp11 final : public QObject
{
Q_OBJECT
public:
- explicit FinalTestClassCpp11(QObject *parent = 0)
+ explicit FinalTestClassCpp11(QObject *parent = nullptr)
: QObject(parent) {}
};
@@ -74,7 +74,7 @@ class EXPORT_MACRO ExportedFinalTestClassCpp11 final : public QObject
{
Q_OBJECT
public:
- explicit ExportedFinalTestClassCpp11(QObject *parent = 0)
+ explicit ExportedFinalTestClassCpp11(QObject *parent = nullptr)
: QObject(parent) {}
};
@@ -82,7 +82,7 @@ class EXPORT_MACRO2(X,Y,Z) ExportedFinalTestClassCpp11X final : public QObject
{
Q_OBJECT
public:
- explicit ExportedFinalTestClassCpp11X(QObject *parent = 0)
+ explicit ExportedFinalTestClassCpp11X(QObject *parent = nullptr)
: QObject(parent) {}
};
@@ -90,7 +90,7 @@ class SealedTestClass sealed : public QObject
{
Q_OBJECT
public:
- explicit SealedTestClass(QObject *parent = 0)
+ explicit SealedTestClass(QObject *parent = nullptr)
: QObject(parent) {}
};
@@ -98,7 +98,7 @@ class EXPORT_MACRO ExportedSealedTestClass sealed : public QObject
{
Q_OBJECT
public:
- explicit ExportedSealedTestClass(QObject *parent = 0)
+ explicit ExportedSealedTestClass(QObject *parent = nullptr)
: QObject(parent) {}
};
@@ -106,7 +106,7 @@ class EXPORT_MACRO2(X,Y,Z) ExportedSealedTestClassX sealed : public QObject
{
Q_OBJECT
public:
- explicit ExportedSealedTestClassX(QObject *parent = 0)
+ explicit ExportedSealedTestClassX(QObject *parent = nullptr)
: QObject(parent) {}
};
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 39712c6d22..d3af266e74 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -598,7 +598,7 @@ class CtorTestClass : public QObject
{
Q_OBJECT
public:
- Q_INVOKABLE CtorTestClass(QObject *parent = 0);
+ Q_INVOKABLE CtorTestClass(QObject *parent = nullptr);
CtorTestClass(int foo);
@@ -1562,7 +1562,7 @@ class PrivatePropertyTest : public QObject
int mBaz;
};
public:
- PrivatePropertyTest(QObject *parent = 0) : QObject(parent), mFoo(0), d (new MyDPointer) {}
+ PrivatePropertyTest(QObject *parent = nullptr) : QObject(parent), mFoo(0), d (new MyDPointer) {}
int foo() { return mFoo ; }
void setFoo(int value) { mFoo = value; }
MyDPointer *d_func() {return d.data();}
@@ -2466,7 +2466,7 @@ class SignalConnectionTester : public QObject
{
Q_OBJECT
public:
- SignalConnectionTester(QObject *parent = 0)
+ SignalConnectionTester(QObject *parent = nullptr)
: QObject(parent), testPassed(false)
{
@@ -2494,7 +2494,7 @@ class ClassWithPrivateSignals : public QObject
{
Q_OBJECT
public:
- ClassWithPrivateSignals(QObject *parent = 0)
+ ClassWithPrivateSignals(QObject *parent = nullptr)
: QObject(parent)
{
@@ -2530,7 +2530,7 @@ class SubClassFromPrivateSignals : public ClassWithPrivateSignals
{
Q_OBJECT
public:
- SubClassFromPrivateSignals(QObject *parent = 0)
+ SubClassFromPrivateSignals(QObject *parent = nullptr)
: ClassWithPrivateSignals(parent)
{
@@ -3031,7 +3031,7 @@ public:
One,
Two
};
- explicit CustomQObject(QObject *parent = 0)
+ explicit CustomQObject(QObject *parent = nullptr)
: QObject(parent)
{
}
@@ -3048,7 +3048,7 @@ class NamespacedQObject : public QObject
{
Q_OBJECT
public:
- explicit NamespacedQObject(QObject *parent = 0)
+ explicit NamespacedQObject(QObject *parent = nullptr)
: QObject(parent)
{
@@ -3072,7 +3072,7 @@ public:
One,
Two
};
- explicit CustomQObject2(QObject *parent = 0)
+ explicit CustomQObject2(QObject *parent = nullptr)
: QObject(parent)
{
}
@@ -3089,7 +3089,7 @@ class NamespacedQObject2 : public QObject
{
Q_OBJECT
public:
- explicit NamespacedQObject2(QObject *parent = 0)
+ explicit NamespacedQObject2(QObject *parent = nullptr)
: QObject(parent)
{
@@ -3141,7 +3141,7 @@ class AutoRegistrationObject : public QObject
Q_PROPERTY(SomeNamespace::NamespacedQObject* customObjectNamespaced READ customObjectNamespaced CONSTANT)
Q_PROPERTY(SomeNamespace::NamespacedNonQObject customNonQObjectNamespaced READ customNonQObjectNamespaced CONSTANT)
public:
- AutoRegistrationObject(QObject *parent = 0)
+ AutoRegistrationObject(QObject *parent = nullptr)
: QObject(parent)
{
}
diff --git a/tests/auto/tools/qdbuscpp2xml/test1.h b/tests/auto/tools/qdbuscpp2xml/test1.h
index 337fada86d..69f3a2cadc 100644
--- a/tests/auto/tools/qdbuscpp2xml/test1.h
+++ b/tests/auto/tools/qdbuscpp2xml/test1.h
@@ -54,7 +54,7 @@ public:
#endif
};
- Test1(QObject *parent = 0) : QObject(parent) {}
+ Test1(QObject *parent = nullptr) : QObject(parent) {}
int numProperty1() { return 42; }