diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2017-11-18 19:07:25 +0300 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-20 21:03:07 +0000 |
commit | 7494bf59c28570dcc6ed6019f979e5625956c8af (patch) | |
tree | 3fb1e7fab1d064ebda1e78ffb21b06bd83e5107f /tests/auto/api | |
parent | 95c1e81382246f5235322eeb6876f77f65b22c19 (diff) |
Use nullptr to initialize the pointers
Change-Id: I59d743f585410cb5c00d36a7b6f9a3e9d696d19e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/api')
-rw-r--r-- | tests/auto/api/testdata/generated-files-list/mainwindow.h | 2 | ||||
-rw-r--r-- | tests/auto/api/testdata/lots-of-dots/object.narf.h | 2 | ||||
-rw-r--r-- | tests/auto/api/testdata/moc-hpp-included/object.h | 2 | ||||
-rw-r--r-- | tests/auto/api/testdata/moc-hpp-included/object2.h | 2 | ||||
-rw-r--r-- | tests/auto/api/testdata/moc-hpp/object.h | 2 | ||||
-rw-r--r-- | tests/auto/api/tst_api.cpp | 8 |
6 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/api/testdata/generated-files-list/mainwindow.h b/tests/auto/api/testdata/generated-files-list/mainwindow.h index 5460460eb..76f9c80ce 100644 --- a/tests/auto/api/testdata/generated-files-list/mainwindow.h +++ b/tests/auto/api/testdata/generated-files-list/mainwindow.h @@ -40,7 +40,7 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); private: diff --git a/tests/auto/api/testdata/lots-of-dots/object.narf.h b/tests/auto/api/testdata/lots-of-dots/object.narf.h index 2fdebcd39..76147bf4d 100644 --- a/tests/auto/api/testdata/lots-of-dots/object.narf.h +++ b/tests/auto/api/testdata/lots-of-dots/object.narf.h @@ -34,7 +34,7 @@ class ObjectNarf : public QObject { Q_OBJECT public: - ObjectNarf(QObject *parent = 0); + ObjectNarf(QObject *parent = nullptr); }; #endif diff --git a/tests/auto/api/testdata/moc-hpp-included/object.h b/tests/auto/api/testdata/moc-hpp-included/object.h index 95292c113..3a0a5581d 100644 --- a/tests/auto/api/testdata/moc-hpp-included/object.h +++ b/tests/auto/api/testdata/moc-hpp-included/object.h @@ -34,7 +34,7 @@ class Object : public QObject { Q_OBJECT public: - Object(QObject *parent = 0); + Object(QObject *parent = nullptr); }; #endif diff --git a/tests/auto/api/testdata/moc-hpp-included/object2.h b/tests/auto/api/testdata/moc-hpp-included/object2.h index e0fca9663..b73f4b0d8 100644 --- a/tests/auto/api/testdata/moc-hpp-included/object2.h +++ b/tests/auto/api/testdata/moc-hpp-included/object2.h @@ -34,7 +34,7 @@ class Object2 : public QObject { Q_OBJECT public: - Object2(QObject *parent = 0); + Object2(QObject *parent = nullptr); }; #endif diff --git a/tests/auto/api/testdata/moc-hpp/object.h b/tests/auto/api/testdata/moc-hpp/object.h index 95292c113..3a0a5581d 100644 --- a/tests/auto/api/testdata/moc-hpp/object.h +++ b/tests/auto/api/testdata/moc-hpp/object.h @@ -34,7 +34,7 @@ class Object : public QObject { Q_OBJECT public: - Object(QObject *parent = 0); + Object(QObject *parent = nullptr); }; #endif diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index cc2e11096..72bc11114 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -221,7 +221,7 @@ void TestApi::addedFilePersistent() 0)); waitForFinished(setupJob.get()); QVERIFY2(!setupJob->error().hasError(), qPrintable(setupJob->error().toString())); - setupJob.reset(0); + setupJob.reset(nullptr); // Remove the file again. qbs must unschedule the rule application again. // Consequently, the linking step must fail as in the initial run. @@ -241,7 +241,7 @@ void TestApi::addedFilePersistent() setupJob.reset(qbs::Project().setupProject(params, m_logSink, 0)); waitForFinished(setupJob.get()); QVERIFY2(!setupJob->error().hasError(), qPrintable(setupJob->error().toString())); - setupJob.reset(0); + setupJob.reset(nullptr); // qbs must remember that a file was scheduled for rule application. The build must then // succeed, as now all necessary symbols are linked in. @@ -892,8 +892,8 @@ void TestApi::changeContent() VERIFY_NO_ERROR(errorInfo); project = qbs::Project(); - job.reset(0); - buildJob.reset(0); + job.reset(nullptr); + buildJob.reset(nullptr); removeBuildDir(setupParams); // Add a file to the top level of a product that does not have a "files" binding yet. setupParams.setProjectFilePath(QDir::cleanPath(m_workingDataDir + |