Rename CPDF_Object::Type enumerators with k prefixes

This was originally motivated by Clang's newly enhanced -Wshadow
warning, which complained about BOOLEAN shadowing a BOOLEAN typedef
in winnt.h. The warning has since been changed to not fire on enums
shadowing types, but it was suggested that this kind of naming change
was desirable anyway.

Bug: chromium:895475
Change-Id: I278ce9dbbd88f802fe5bc77fca28b082aa5e684d
Reviewed-on: https://pdfium-review.googlesource.com/c/44330
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

1 files changed, 27 insertions, 27 deletions

diff --git a/core/fpdfapi/parser/cpdf_object_unittest.cpp b/core/fpdfapi/parser/cpdf_object_unittest.cpp
index c3ec3aeddb..0b6909660b 100644
--- a/core/fpdfapi/parser/cpdf_object_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_object_unittest.cpp
@@ -86,10 +86,10 @@ class PDFObjectsTest : public testing::Test {
                            name_obj,          m_ArrayObj.Get(), m_DictObj.Get(),
                            stream_obj,        null_obj};
     m_DirectObjTypes = {
-        CPDF_Object::BOOLEAN, CPDF_Object::BOOLEAN, CPDF_Object::NUMBER,
-        CPDF_Object::NUMBER,  CPDF_Object::STRING,  CPDF_Object::STRING,
-        CPDF_Object::NAME,    CPDF_Object::ARRAY,   CPDF_Object::DICTIONARY,
-        CPDF_Object::STREAM,  CPDF_Object::NULLOBJ};
+        CPDF_Object::kBoolean, CPDF_Object::kBoolean, CPDF_Object::kNumber,
+        CPDF_Object::kNumber,  CPDF_Object::kString,  CPDF_Object::kString,
+        CPDF_Object::kName,    CPDF_Object::kArray,   CPDF_Object::kDictionary,
+        CPDF_Object::kStream,  CPDF_Object::kNullobj};
     for (size_t i = 0; i < FX_ArraySize(objs); ++i)
       m_DirectObjs.emplace_back(objs[i]);
 
@@ -114,15 +114,15 @@ class PDFObjectsTest : public testing::Test {
     if (!obj1 || !obj2 || obj1->GetType() != obj2->GetType())
       return false;
     switch (obj1->GetType()) {
-      case CPDF_Object::BOOLEAN:
+      case CPDF_Object::kBoolean:
         return obj1->GetInteger() == obj2->GetInteger();
-      case CPDF_Object::NUMBER:
+      case CPDF_Object::kNumber:
         return obj1->AsNumber()->IsInteger() == obj2->AsNumber()->IsInteger() &&
                obj1->GetInteger() == obj2->GetInteger();
-      case CPDF_Object::STRING:
-      case CPDF_Object::NAME:
+      case CPDF_Object::kString:
+      case CPDF_Object::kName:
         return obj1->GetString() == obj2->GetString();
-      case CPDF_Object::ARRAY: {
+      case CPDF_Object::kArray: {
         const CPDF_Array* array1 = obj1->AsArray();
         const CPDF_Array* array2 = obj2->AsArray();
         if (array1->size() != array2->size())
@@ -133,7 +133,7 @@ class PDFObjectsTest : public testing::Test {
         }
         return true;
       }
-      case CPDF_Object::DICTIONARY: {
+      case CPDF_Object::kDictionary: {
         const CPDF_Dictionary* dict1 = obj1->AsDictionary();
         const CPDF_Dictionary* dict2 = obj2->AsDictionary();
         if (dict1->size() != dict2->size())
@@ -145,9 +145,9 @@ class PDFObjectsTest : public testing::Test {
         }
         return true;
       }
-      case CPDF_Object::NULLOBJ:
+      case CPDF_Object::kNullobj:
         return true;
-      case CPDF_Object::STREAM: {
+      case CPDF_Object::kStream: {
         const CPDF_Stream* stream1 = obj1->AsStream();
         const CPDF_Stream* stream2 = obj2->AsStream();
         if (!stream1->GetDict() && !stream2->GetDict())
@@ -168,7 +168,7 @@ class PDFObjectsTest : public testing::Test {
         return memcmp(streamAcc1->GetData(), streamAcc2->GetData(),
                       streamAcc2->GetSize()) == 0;
       }
-      case CPDF_Object::REFERENCE:
+      case CPDF_Object::kReference:
         return obj1->AsReference()->GetRefObjNum() ==
                obj2->AsReference()->GetRefObjNum();
     }
@@ -300,7 +300,7 @@ TEST_F(PDFObjectsTest, GetType) {
 
   // Check indirect references.
   for (const auto& it : m_RefObjs)
-    EXPECT_EQ(CPDF_Object::REFERENCE, it->GetType());
+    EXPECT_EQ(CPDF_Object::kReference, it->GetType());
 }
 
 TEST_F(PDFObjectsTest, GetDirect) {
@@ -328,7 +328,7 @@ TEST_F(PDFObjectsTest, SetString) {
 TEST_F(PDFObjectsTest, IsTypeAndAsType) {
   // Check for direct objects.
   for (size_t i = 0; i < m_DirectObjs.size(); ++i) {
-    if (m_DirectObjTypes[i] == CPDF_Object::ARRAY) {
+    if (m_DirectObjTypes[i] == CPDF_Object::kArray) {
       EXPECT_TRUE(m_DirectObjs[i]->IsArray());
       EXPECT_EQ(m_DirectObjs[i].get(), m_DirectObjs[i]->AsArray());
     } else {
@@ -336,7 +336,7 @@ TEST_F(PDFObjectsTest, IsTypeAndAsType) {
       EXPECT_EQ(nullptr, m_DirectObjs[i]->AsArray());
     }
 
-    if (m_DirectObjTypes[i] == CPDF_Object::BOOLEAN) {
+    if (m_DirectObjTypes[i] == CPDF_Object::kBoolean) {
       EXPECT_TRUE(m_DirectObjs[i]->IsBoolean());
       EXPECT_EQ(m_DirectObjs[i].get(), m_DirectObjs[i]->AsBoolean());
     } else {
@@ -344,7 +344,7 @@ TEST_F(PDFObjectsTest, IsTypeAndAsType) {
       EXPECT_EQ(nullptr, m_DirectObjs[i]->AsBoolean());
     }
 
-    if (m_DirectObjTypes[i] == CPDF_Object::NAME) {
+    if (m_DirectObjTypes[i] == CPDF_Object::kName) {
       EXPECT_TRUE(m_DirectObjs[i]->IsName());
       EXPECT_EQ(m_DirectObjs[i].get(), m_DirectObjs[i]->AsName());
     } else {
@@ -352,7 +352,7 @@ TEST_F(PDFObjectsTest, IsTypeAndAsType) {
       EXPECT_EQ(nullptr, m_DirectObjs[i]->AsName());
     }
 
-    if (m_DirectObjTypes[i] == CPDF_Object::NUMBER) {
+    if (m_DirectObjTypes[i] == CPDF_Object::kNumber) {
       EXPECT_TRUE(m_DirectObjs[i]->IsNumber());
       EXPECT_EQ(m_DirectObjs[i].get(), m_DirectObjs[i]->AsNumber());
     } else {
@@ -360,7 +360,7 @@ TEST_F(PDFObjectsTest, IsTypeAndAsType) {
       EXPECT_EQ(nullptr, m_DirectObjs[i]->AsNumber());
     }
 
-    if (m_DirectObjTypes[i] == CPDF_Object::STRING) {
+    if (m_DirectObjTypes[i] == CPDF_Object::kString) {
       EXPECT_TRUE(m_DirectObjs[i]->IsString());
       EXPECT_EQ(m_DirectObjs[i].get(), m_DirectObjs[i]->AsString());
     } else {
@@ -368,7 +368,7 @@ TEST_F(PDFObjectsTest, IsTypeAndAsType) {
       EXPECT_EQ(nullptr, m_DirectObjs[i]->AsString());
     }
 
-    if (m_DirectObjTypes[i] == CPDF_Object::DICTIONARY) {
+    if (m_DirectObjTypes[i] == CPDF_Object::kDictionary) {
       EXPECT_TRUE(m_DirectObjs[i]->IsDictionary());
       EXPECT_EQ(m_DirectObjs[i].get(), m_DirectObjs[i]->AsDictionary());
     } else {
@@ -376,7 +376,7 @@ TEST_F(PDFObjectsTest, IsTypeAndAsType) {
       EXPECT_EQ(nullptr, m_DirectObjs[i]->AsDictionary());
     }
 
-    if (m_DirectObjTypes[i] == CPDF_Object::STREAM) {
+    if (m_DirectObjTypes[i] == CPDF_Object::kStream) {
       EXPECT_TRUE(m_DirectObjs[i]->IsStream());
       EXPECT_EQ(m_DirectObjs[i].get(), m_DirectObjs[i]->AsStream());
     } else {
@@ -697,7 +697,7 @@ TEST(PDFArrayTest, AddNumber) {
   for (size_t i = 0; i < FX_ArraySize(vals); ++i)
     arr->AddNew<CPDF_Number>(vals[i]);
   for (size_t i = 0; i < FX_ArraySize(vals); ++i) {
-    EXPECT_EQ(CPDF_Object::NUMBER, arr->GetObjectAt(i)->GetType());
+    EXPECT_EQ(CPDF_Object::kNumber, arr->GetObjectAt(i)->GetType());
     EXPECT_EQ(vals[i], arr->GetObjectAt(i)->GetNumber());
   }
 }
@@ -708,7 +708,7 @@ TEST(PDFArrayTest, AddInteger) {
   for (size_t i = 0; i < FX_ArraySize(vals); ++i)
     arr->AddNew<CPDF_Number>(vals[i]);
   for (size_t i = 0; i < FX_ArraySize(vals); ++i) {
-    EXPECT_EQ(CPDF_Object::NUMBER, arr->GetObjectAt(i)->GetType());
+    EXPECT_EQ(CPDF_Object::kNumber, arr->GetObjectAt(i)->GetType());
     EXPECT_EQ(vals[i], arr->GetObjectAt(i)->GetNumber());
   }
 }
@@ -724,9 +724,9 @@ TEST(PDFArrayTest, AddStringAndName) {
     name_array->AddNew<CPDF_Name>(vals[i]);
   }
   for (size_t i = 0; i < FX_ArraySize(vals); ++i) {
-    EXPECT_EQ(CPDF_Object::STRING, string_array->GetObjectAt(i)->GetType());
+    EXPECT_EQ(CPDF_Object::kString, string_array->GetObjectAt(i)->GetType());
     EXPECT_STREQ(vals[i], string_array->GetObjectAt(i)->GetString().c_str());
-    EXPECT_EQ(CPDF_Object::NAME, name_array->GetObjectAt(i)->GetType());
+    EXPECT_EQ(CPDF_Object::kName, name_array->GetObjectAt(i)->GetType());
     EXPECT_STREQ(vals[i], name_array->GetObjectAt(i)->GetString().c_str());
   }
 }
@@ -758,10 +758,10 @@ TEST(PDFArrayTest, AddReferenceAndGetObjectAt) {
   // Check arrays.
   EXPECT_EQ(arr->size(), arr1->size());
   for (size_t i = 0; i < arr->size(); ++i) {
-    EXPECT_EQ(CPDF_Object::REFERENCE, arr->GetObjectAt(i)->GetType());
+    EXPECT_EQ(CPDF_Object::kReference, arr->GetObjectAt(i)->GetType());
     EXPECT_EQ(indirect_objs[i], arr->GetObjectAt(i)->GetDirect());
     EXPECT_EQ(indirect_objs[i], arr->GetDirectObjectAt(i));
-    EXPECT_EQ(CPDF_Object::REFERENCE, arr1->GetObjectAt(i)->GetType());
+    EXPECT_EQ(CPDF_Object::kReference, arr1->GetObjectAt(i)->GetType());
     EXPECT_EQ(indirect_objs[i], arr1->GetObjectAt(i)->GetDirect());
     EXPECT_EQ(indirect_objs[i], arr1->GetDirectObjectAt(i));
   }