summaryrefslogtreecommitdiffstats
path: root/tests/auto/cmake
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/cmake
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/cmake')
-rw-r--r--tests/auto/cmake/test(needsquoting)dirname/mywidget.h2
-rw-r--r--tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp2
-rw-r--r--tests/auto/cmake/test_add_big_resource/myobject.h2
-rw-r--r--tests/auto/cmake/test_add_resource_options/myobject.h2
-rw-r--r--tests/auto/cmake/test_dbus_module/mydbusobject.h2
-rw-r--r--tests/auto/cmake/test_dependent_modules/mywidget.h2
-rw-r--r--tests/auto/cmake/test_interface/mainwindow.h2
-rw-r--r--tests/auto/cmake/test_interface_link_libraries/somelib.h2
-rw-r--r--tests/auto/cmake/test_json_plugin_includes/plugin.h2
-rw-r--r--tests/auto/cmake/test_moc_macro_target/main_gen_test.cpp2
-rw-r--r--tests/auto/cmake/test_moc_macro_target/mywrapobject.h2
-rw-r--r--tests/auto/cmake/test_qtmainwin_library/myobject.h2
-rw-r--r--tests/auto/cmake/test_testlib_definitions/main.cpp2
-rw-r--r--tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h2
-rw-r--r--tests/auto/cmake/test_wrap_cpp_options/myobject.h2
15 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/cmake/test(needsquoting)dirname/mywidget.h b/tests/auto/cmake/test(needsquoting)dirname/mywidget.h
index 5f3d59b7c0..dfa65a8503 100644
--- a/tests/auto/cmake/test(needsquoting)dirname/mywidget.h
+++ b/tests/auto/cmake/test(needsquoting)dirname/mywidget.h
@@ -40,7 +40,7 @@ class MyWidget : public QWidget
{
Q_OBJECT
public:
- MyWidget(QWidget *parent = 0);
+ MyWidget(QWidget *parent = nullptr);
signals:
void someSignal();
diff --git a/tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp b/tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp
index 4e73598200..56996814c2 100644
--- a/tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp
+++ b/tests/auto/cmake/test_QFINDTESTDATA/tests/main.cpp
@@ -33,7 +33,7 @@ class TestClass : public QObject
{
Q_OBJECT
public:
- TestClass(QObject* parent = 0) {}
+ TestClass(QObject* parent = nullptr) {}
private slots:
void doTest();
diff --git a/tests/auto/cmake/test_add_big_resource/myobject.h b/tests/auto/cmake/test_add_big_resource/myobject.h
index b6fbce32cd..c5b32c680d 100644
--- a/tests/auto/cmake/test_add_big_resource/myobject.h
+++ b/tests/auto/cmake/test_add_big_resource/myobject.h
@@ -35,7 +35,7 @@ class MyObject : public QObject
{
Q_OBJECT
public:
- MyObject(QObject *parent = 0);
+ MyObject(QObject *parent = nullptr);
signals:
void someSignal();
diff --git a/tests/auto/cmake/test_add_resource_options/myobject.h b/tests/auto/cmake/test_add_resource_options/myobject.h
index b6fbce32cd..c5b32c680d 100644
--- a/tests/auto/cmake/test_add_resource_options/myobject.h
+++ b/tests/auto/cmake/test_add_resource_options/myobject.h
@@ -35,7 +35,7 @@ class MyObject : public QObject
{
Q_OBJECT
public:
- MyObject(QObject *parent = 0);
+ MyObject(QObject *parent = nullptr);
signals:
void someSignal();
diff --git a/tests/auto/cmake/test_dbus_module/mydbusobject.h b/tests/auto/cmake/test_dbus_module/mydbusobject.h
index cc6b5626de..5a2c69cdae 100644
--- a/tests/auto/cmake/test_dbus_module/mydbusobject.h
+++ b/tests/auto/cmake/test_dbus_module/mydbusobject.h
@@ -36,7 +36,7 @@ class MyDBusObject : public QObject
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.qtProject.Tests.MyDBusObject")
public:
- MyDBusObject(QObject *parent = 0);
+ MyDBusObject(QObject *parent = nullptr);
signals:
void someSignal();
diff --git a/tests/auto/cmake/test_dependent_modules/mywidget.h b/tests/auto/cmake/test_dependent_modules/mywidget.h
index 5f3d59b7c0..dfa65a8503 100644
--- a/tests/auto/cmake/test_dependent_modules/mywidget.h
+++ b/tests/auto/cmake/test_dependent_modules/mywidget.h
@@ -40,7 +40,7 @@ class MyWidget : public QWidget
{
Q_OBJECT
public:
- MyWidget(QWidget *parent = 0);
+ MyWidget(QWidget *parent = nullptr);
signals:
void someSignal();
diff --git a/tests/auto/cmake/test_interface/mainwindow.h b/tests/auto/cmake/test_interface/mainwindow.h
index 246ab47d16..2dd52efd01 100644
--- a/tests/auto/cmake/test_interface/mainwindow.h
+++ b/tests/auto/cmake/test_interface/mainwindow.h
@@ -35,7 +35,7 @@ class MainWindow : public QWidget
{
Q_OBJECT
public:
- MainWindow(QWidget *parent = 0);
+ MainWindow(QWidget *parent = nullptr);
signals:
void somethingHappened();
diff --git a/tests/auto/cmake/test_interface_link_libraries/somelib.h b/tests/auto/cmake/test_interface_link_libraries/somelib.h
index 0a9d6a8394..9cad2931af 100644
--- a/tests/auto/cmake/test_interface_link_libraries/somelib.h
+++ b/tests/auto/cmake/test_interface_link_libraries/somelib.h
@@ -37,7 +37,7 @@ class SOMELIB_EXPORT SomeObject : QTextDocument
{
Q_OBJECT
public:
- explicit SomeObject(QObject *parent = 0);
+ explicit SomeObject(QObject *parent = nullptr);
int value();
};
diff --git a/tests/auto/cmake/test_json_plugin_includes/plugin.h b/tests/auto/cmake/test_json_plugin_includes/plugin.h
index 3fdb5aeb64..79ec252734 100644
--- a/tests/auto/cmake/test_json_plugin_includes/plugin.h
+++ b/tests/auto/cmake/test_json_plugin_includes/plugin.h
@@ -36,7 +36,7 @@ class JsonTestPlugin : public QObject
Q_OBJECT
Q_PLUGIN_METADATA(IID "JsonTestPlugin" FILE "jsontestplugin.json")
public:
- JsonTestPlugin(QObject *parent = 0);
+ JsonTestPlugin(QObject *parent = nullptr);
};
#endif
diff --git a/tests/auto/cmake/test_moc_macro_target/main_gen_test.cpp b/tests/auto/cmake/test_moc_macro_target/main_gen_test.cpp
index ca4134608a..3e6c4acd4e 100644
--- a/tests/auto/cmake/test_moc_macro_target/main_gen_test.cpp
+++ b/tests/auto/cmake/test_moc_macro_target/main_gen_test.cpp
@@ -35,7 +35,7 @@ class MyObject : public QObject, MyInterface
Q_OBJECT
Q_INTERFACES(MyInterface)
public:
- explicit MyObject(QObject *parent = 0) : QObject(parent) { }
+ explicit MyObject(QObject *parent = nullptr) : QObject(parent) { }
};
int main(int argc, char **argv)
diff --git a/tests/auto/cmake/test_moc_macro_target/mywrapobject.h b/tests/auto/cmake/test_moc_macro_target/mywrapobject.h
index adc7551120..a4be007110 100644
--- a/tests/auto/cmake/test_moc_macro_target/mywrapobject.h
+++ b/tests/auto/cmake/test_moc_macro_target/mywrapobject.h
@@ -38,7 +38,7 @@ class MyWrapObject : public QObject, MyInterface
Q_OBJECT
Q_INTERFACES(MyInterface)
public:
- explicit MyWrapObject(QObject *parent = 0) : QObject(parent) { }
+ explicit MyWrapObject(QObject *parent = nullptr) : QObject(parent) { }
};
#endif
diff --git a/tests/auto/cmake/test_qtmainwin_library/myobject.h b/tests/auto/cmake/test_qtmainwin_library/myobject.h
index f916675817..df0e377a60 100644
--- a/tests/auto/cmake/test_qtmainwin_library/myobject.h
+++ b/tests/auto/cmake/test_qtmainwin_library/myobject.h
@@ -35,7 +35,7 @@ class MyObject : public QObject
{
Q_OBJECT
public:
- MyObject(QObject *parent = 0);
+ MyObject(QObject *parent = nullptr);
signals:
void someSignal();
diff --git a/tests/auto/cmake/test_testlib_definitions/main.cpp b/tests/auto/cmake/test_testlib_definitions/main.cpp
index 1ba9f2fc3b..45dd97f3c5 100644
--- a/tests/auto/cmake/test_testlib_definitions/main.cpp
+++ b/tests/auto/cmake/test_testlib_definitions/main.cpp
@@ -33,7 +33,7 @@ class TestObject : public QObject
{
Q_OBJECT
public:
- TestObject(QObject *parent = 0)
+ TestObject(QObject *parent = nullptr)
: QObject(parent)
{
diff --git a/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h b/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h
index b6fbce32cd..c5b32c680d 100644
--- a/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h
+++ b/tests/auto/cmake/test_wrap_cpp_and_resources/myobject.h
@@ -35,7 +35,7 @@ class MyObject : public QObject
{
Q_OBJECT
public:
- MyObject(QObject *parent = 0);
+ MyObject(QObject *parent = nullptr);
signals:
void someSignal();
diff --git a/tests/auto/cmake/test_wrap_cpp_options/myobject.h b/tests/auto/cmake/test_wrap_cpp_options/myobject.h
index b6fbce32cd..c5b32c680d 100644
--- a/tests/auto/cmake/test_wrap_cpp_options/myobject.h
+++ b/tests/auto/cmake/test_wrap_cpp_options/myobject.h
@@ -35,7 +35,7 @@ class MyObject : public QObject
{
Q_OBJECT
public:
- MyObject(QObject *parent = 0);
+ MyObject(QObject *parent = nullptr);
signals:
void someSignal();