1 files changed, 22 insertions, 22 deletions

diff --git a/source/blender/blenlib/tests/BLI_string_test.cc b/source/blender/blenlib/tests/BLI_string_test.cc
index 12f0fd5ac62..58135adbcca 100644
--- a/source/blender/blenlib/tests/BLI_string_test.cc
+++ b/source/blender/blenlib/tests/BLI_string_test.cc
@@ -4,7 +4,7 @@
 
 #include <array>
 #include <initializer_list>
-#include <ostream>  // NOLINT
+#include <ostream> /* NOLINT */
 #include <string>
 #include <utility>
 #include <vector>
@@ -66,8 +66,8 @@ TEST(string, StrPartition)
     /* "" -> "", NULL, NULL, 0 */
     pre_ln = BLI_str_partition(str, delim, &sep, &suf);
     EXPECT_EQ(pre_ln, 0);
-    EXPECT_EQ(sep, (void *)NULL);
-    EXPECT_EQ(suf, (void *)NULL);
+    EXPECT_EQ(sep, (void *)nullptr);
+    EXPECT_EQ(suf, (void *)nullptr);
   }
 
   {
@@ -76,8 +76,8 @@ TEST(string, StrPartition)
     /* "material" -> "material", NULL, NULL, 8 */
     pre_ln = BLI_str_partition(str, delim, &sep, &suf);
     EXPECT_EQ(pre_ln, 8);
-    EXPECT_EQ(sep, (void *)NULL);
-    EXPECT_EQ(suf, (void *)NULL);
+    EXPECT_EQ(sep, (void *)nullptr);
+    EXPECT_EQ(suf, (void *)nullptr);
   }
 }
 
@@ -125,8 +125,8 @@ TEST(string, StrRPartition)
     /* "" -> "", NULL, NULL, 0 */
     pre_ln = BLI_str_rpartition(str, delim, &sep, &suf);
     EXPECT_EQ(pre_ln, 0);
-    EXPECT_EQ(sep, (void *)NULL);
-    EXPECT_EQ(suf, (void *)NULL);
+    EXPECT_EQ(sep, (void *)nullptr);
+    EXPECT_EQ(suf, (void *)nullptr);
   }
 
   {
@@ -135,8 +135,8 @@ TEST(string, StrRPartition)
     /* "material" -> "material", NULL, NULL, 8 */
     pre_ln = BLI_str_rpartition(str, delim, &sep, &suf);
     EXPECT_EQ(pre_ln, 8);
-    EXPECT_EQ(sep, (void *)NULL);
-    EXPECT_EQ(suf, (void *)NULL);
+    EXPECT_EQ(sep, (void *)nullptr);
+    EXPECT_EQ(suf, (void *)nullptr);
   }
 }
 
@@ -166,8 +166,8 @@ TEST(string, StrPartitionEx)
     /* "mate.rial" over "mate" -> "mate.rial", NULL, NULL, 4 */
     pre_ln = BLI_str_partition_ex(str, str + 4, delim, &sep, &suf, true);
     EXPECT_EQ(pre_ln, 4);
-    EXPECT_EQ(sep, (void *)NULL);
-    EXPECT_EQ(suf, (void *)NULL);
+    EXPECT_EQ(sep, (void *)nullptr);
+    EXPECT_EQ(suf, (void *)nullptr);
   }
 }
 
@@ -215,8 +215,8 @@ TEST(string, StrPartitionUtf8)
     /* "" -> "", NULL, NULL, 0 */
     pre_ln = BLI_str_partition_utf8(str, delim, &sep, &suf);
     EXPECT_EQ(pre_ln, 0);
-    EXPECT_EQ(sep, (void *)NULL);
-    EXPECT_EQ(suf, (void *)NULL);
+    EXPECT_EQ(sep, (void *)nullptr);
+    EXPECT_EQ(suf, (void *)nullptr);
   }
 
   {
@@ -225,8 +225,8 @@ TEST(string, StrPartitionUtf8)
     /* "material" -> "material", NULL, NULL, 8 */
     pre_ln = BLI_str_partition_utf8(str, delim, &sep, &suf);
     EXPECT_EQ(pre_ln, 8);
-    EXPECT_EQ(sep, (void *)NULL);
-    EXPECT_EQ(suf, (void *)NULL);
+    EXPECT_EQ(sep, (void *)nullptr);
+    EXPECT_EQ(suf, (void *)nullptr);
   }
 }
 
@@ -274,8 +274,8 @@ TEST(string, StrRPartitionUtf8)
     /* "" -> "", NULL, NULL, 0 */
     pre_ln = BLI_str_rpartition_utf8(str, delim, &sep, &suf);
     EXPECT_EQ(pre_ln, 0);
-    EXPECT_EQ(sep, (void *)NULL);
-    EXPECT_EQ(suf, (void *)NULL);
+    EXPECT_EQ(sep, (void *)nullptr);
+    EXPECT_EQ(suf, (void *)nullptr);
   }
 
   {
@@ -284,8 +284,8 @@ TEST(string, StrRPartitionUtf8)
     /* "material" -> "material", NULL, NULL, 8 */
     pre_ln = BLI_str_rpartition_utf8(str, delim, &sep, &suf);
     EXPECT_EQ(pre_ln, 8);
-    EXPECT_EQ(sep, (void *)NULL);
-    EXPECT_EQ(suf, (void *)NULL);
+    EXPECT_EQ(sep, (void *)nullptr);
+    EXPECT_EQ(suf, (void *)nullptr);
   }
 }
 
@@ -316,8 +316,8 @@ TEST(string, StrPartitionExUtf8)
     /* "mate\xe2\x98\xafrial" over "mate" -> "mate\xe2\x98\xafrial", NULL, NULL, 4 */
     pre_ln = BLI_str_partition_ex_utf8(str, str + 4, delim, &sep, &suf, true);
     EXPECT_EQ(pre_ln, 4);
-    EXPECT_EQ(sep, (void *)NULL);
-    EXPECT_EQ(suf, (void *)NULL);
+    EXPECT_EQ(sep, (void *)nullptr);
+    EXPECT_EQ(suf, (void *)nullptr);
   }
 }
 
@@ -567,7 +567,7 @@ TEST(string, StringStrncasestr)
   EXPECT_EQ(res, str_test0 + 1);
 
   res = BLI_strncasestr(str_test0, "not there", 9);
-  EXPECT_EQ(res, (void *)NULL);
+  EXPECT_EQ(res, (void *)nullptr);
 }
 
 /* BLI_string_max_possible_word_count */