Merge to XFA: Member function name refactoring

This is needed by Cl 1634373003 as the name collision with virtual functions
will be shown as warnings on Linux. Also, it is better to use
different names for different cases.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1644633003 .

(cherry picked from commit d45e7a51904164fb22049f0a7a80d2a94c06936b)

Review URL: https://codereview.chromium.org/1648233002 .

1 files changed, 10 insertions, 10 deletions

diff --git a/core/src/fpdfdoc/doc_viewerPreferences.cpp b/core/src/fpdfdoc/doc_viewerPreferences.cpp
index 05f50c03d0..6ef09255c6 100644
--- a/core/src/fpdfdoc/doc_viewerPreferences.cpp
+++ b/core/src/fpdfdoc/doc_viewerPreferences.cpp
@@ -11,43 +11,43 @@ CPDF_ViewerPreferences::CPDF_ViewerPreferences(CPDF_Document* pDoc)
 CPDF_ViewerPreferences::~CPDF_ViewerPreferences() {}
 FX_BOOL CPDF_ViewerPreferences::IsDirectionR2L() const {
   CPDF_Dictionary* pDict = m_pDoc->GetRoot();
-  pDict = pDict->GetDict("ViewerPreferences");
+  pDict = pDict->GetDictBy("ViewerPreferences");
   if (!pDict) {
     return FALSE;
   }
-  return "R2L" == pDict->GetString("Direction");
+  return "R2L" == pDict->GetStringBy("Direction");
 }
 FX_BOOL CPDF_ViewerPreferences::PrintScaling() const {
   CPDF_Dictionary* pDict = m_pDoc->GetRoot();
-  pDict = pDict->GetDict("ViewerPreferences");
+  pDict = pDict->GetDictBy("ViewerPreferences");
   if (!pDict) {
     return TRUE;
   }
-  return "None" != pDict->GetString("PrintScaling");
+  return "None" != pDict->GetStringBy("PrintScaling");
 }
 int32_t CPDF_ViewerPreferences::NumCopies() const {
   CPDF_Dictionary* pDict = m_pDoc->GetRoot();
-  pDict = pDict->GetDict("ViewerPreferences");
+  pDict = pDict->GetDictBy("ViewerPreferences");
   if (!pDict) {
     return 1;
   }
-  return pDict->GetInteger("NumCopies");
+  return pDict->GetIntegerBy("NumCopies");
 }
 CPDF_Array* CPDF_ViewerPreferences::PrintPageRange() const {
   CPDF_Dictionary* pDict = m_pDoc->GetRoot();
   CPDF_Array* pRange = NULL;
-  pDict = pDict->GetDict("ViewerPreferences");
+  pDict = pDict->GetDictBy("ViewerPreferences");
   if (!pDict) {
     return pRange;
   }
-  pRange = pDict->GetArray("PrintPageRange");
+  pRange = pDict->GetArrayBy("PrintPageRange");
   return pRange;
 }
 CFX_ByteString CPDF_ViewerPreferences::Duplex() const {
   CPDF_Dictionary* pDict = m_pDoc->GetRoot();
-  pDict = pDict->GetDict("ViewerPreferences");
+  pDict = pDict->GetDictBy("ViewerPreferences");
   if (!pDict) {
     return "None";
   }
-  return pDict->GetString("Duplex");
+  return pDict->GetStringBy("Duplex");
 }