diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-10-24 22:18:53 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-10-26 09:56:18 +0000 |
| commit | f4d1c96b9aa73a5c215c7f76551df1ae4e7d9d54 (patch) | |
| tree | 3f0b88f31c0cd073ebe6dd6e6fbf84884ffba16b /src | |
| parent | d91045953cda7aeb655e501561d78c7ad14038fa (diff) | |
clang-tidy: Apply modernize-use-nullptr fix-it
Change-Id: I404ac10a14517763daf656dd38dd560534cbf1fa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/scanner/cpp/cppscanner.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/scanner/qt/qtscanner.cpp | 4 | ||||
| -rw-r--r-- | src/shared/json/json.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp index 0acb25172..6800ce608 100644 --- a/src/plugins/scanner/cpp/cppscanner.cpp +++ b/src/plugins/scanner/cpp/cppscanner.cpp @@ -233,7 +233,7 @@ static void *openScanner(const unsigned short *filePath, const char *fileTags, i mapl = s.st_size; opaque->mapl = mapl; - void *vmap = mmap(0, s.st_size, PROT_READ, MAP_PRIVATE, opaque->fd, 0); + void *vmap = mmap(nullptr, s.st_size, PROT_READ, MAP_PRIVATE, opaque->fd, 0); if (vmap == MAP_FAILED) // NOLINT(cppcoreguidelines-pro-type-cstyle-cast) return nullptr; #else @@ -319,7 +319,7 @@ ScannerPlugin includeScanner = ScannerUsesCppIncludePaths | ScannerRecursiveDependencies }; -ScannerPlugin *cppScanners[] = { &includeScanner, NULL }; +ScannerPlugin *cppScanners[] = { &includeScanner, nullptr }; static void QbsCppScannerPluginLoad() { diff --git a/src/plugins/scanner/qt/qtscanner.cpp b/src/plugins/scanner/qt/qtscanner.cpp index 22ef294d0..73f1e7816 100644 --- a/src/plugins/scanner/qt/qtscanner.cpp +++ b/src/plugins/scanner/qt/qtscanner.cpp @@ -114,7 +114,7 @@ static void *openScannerQrc(const unsigned short *filePath, const char *fileTags const int fileSize = static_cast<int>(s.st_size); opaque->mapl = fileSize; - void *map = mmap(0, s.st_size, PROT_READ, MAP_PRIVATE, opaque->fd, 0); + void *map = mmap(nullptr, s.st_size, PROT_READ, MAP_PRIVATE, opaque->fd, 0); if (map == nullptr) return nullptr; #else @@ -180,7 +180,7 @@ ScannerPlugin qrcScanner = NoScannerFlags }; -ScannerPlugin *qtScanners[] = {&qrcScanner, NULL}; +ScannerPlugin *qtScanners[] = {&qrcScanner, nullptr}; static void QbsQtScannerPluginLoad() { diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp index 6599bd68b..cb6e91f51 100644 --- a/src/shared/json/json.cpp +++ b/src/shared/json/json.cpp @@ -3672,7 +3672,7 @@ bool JsonDocument::operator==(const JsonDocument &other) const */ bool JsonDocument::isNull() const { - return (d == 0); + return (d == nullptr); } |