Make CPDF_ApSettings take CFX_ByteString args.

core/fpdfdoc/include/fpdf_doc.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_
 #define CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_
 
 #include <map>
@@ skipping 822 matching lines @@
                    CPDF_Annot::AppearanceMode mode,
                    const CPDF_RenderOptions* pOptions = nullptr);
 
   CFX_ByteString GetCheckedAPState();
   CFX_WideString GetExportValue();
 
   bool IsChecked() const;
   bool IsDefaultChecked() const;
 
   HighlightingMode GetHighlightingMode();
-  bool HasMKEntry(CFX_ByteString csEntry) const;
+  bool HasMKEntry(const CFX_ByteString& csEntry) const;
   int GetRotation();
 
   inline FX_ARGB GetBorderColor(int& iColorType) {
     return GetColor(iColorType, "BC");
   }
 
   FX_FLOAT GetOriginalBorderColor(int index) {
     return GetOriginalColor(index, "BC");
   }
 
   void GetOriginalBorderColor(int& iColorType, FX_FLOAT fc[4]) {
     GetOriginalColor(iColorType, fc, "BC");
   }
 
   FX_ARGB GetBackgroundColor(int& iColorType) {
     return GetColor(iColorType, "BG");
   }
 
   FX_FLOAT GetOriginalBackgroundColor(int index) {
     return GetOriginalColor(index, "BG");
   }
 
   void GetOriginalBackgroundColor(int& iColorType, FX_FLOAT fc[4]) {
     GetOriginalColor(iColorType, fc, "BG");
   }
 
   CFX_WideString GetNormalCaption() { return GetCaption("CA"); }
-
   CFX_WideString GetRolloverCaption() { return GetCaption("RC"); }
-
   CFX_WideString GetDownCaption() { return GetCaption("AC"); }
 
   CPDF_Stream* GetNormalIcon() { return GetIcon("I"); }
-
   CPDF_Stream* GetRolloverIcon() { return GetIcon("RI"); }
-
   CPDF_Stream* GetDownIcon() { return GetIcon("IX"); }
-
   CPDF_IconFit GetIconFit();
 
   int GetTextPosition();
-
   CPDF_Action GetAction();
-
   CPDF_AAction GetAdditionalAction();
-
   CPDF_DefaultAppearance GetDefaultAppearance();
 
   CPDF_Font* GetDefaultControlFont();
-
   int GetControlAlignment();
 
  protected:
   CPDF_FormControl(CPDF_FormField* pField, CPDF_Dictionary* pWidgetDict);
 
   CFX_ByteString GetOnStateName() const;
   void SetOnStateName(const CFX_ByteString& csOn);
-
   void CheckControl(FX_BOOL bChecked);
-
-  FX_ARGB GetColor(int& iColorType, CFX_ByteString csEntry);
-
-  FX_FLOAT GetOriginalColor(int index, CFX_ByteString csEntry);
-
+  FX_ARGB GetColor(int& iColorType, const CFX_ByteString& csEntry);
+  FX_FLOAT GetOriginalColor(int index, const CFX_ByteString& csEntry);
   void GetOriginalColor(int& iColorType,
                         FX_FLOAT fc[4],
-                        CFX_ByteString csEntry);
+                        const CFX_ByteString& csEntry);
 
-  CFX_WideString GetCaption(CFX_ByteString csEntry);
-
-  CPDF_Stream* GetIcon(CFX_ByteString csEntry);
-
+  CFX_WideString GetCaption(const CFX_ByteString& csEntry);
+  CPDF_Stream* GetIcon(const CFX_ByteString& csEntry);
   CPDF_ApSettings GetMK() const;
 
   CPDF_InterForm* m_pForm;
+  CPDF_FormField* m_pField;
+  CPDF_Dictionary* m_pWidgetDict;
 
-  CPDF_FormField* m_pField;
-
-  CPDF_Dictionary* m_pWidgetDict;
   friend class CPDF_InterForm;
   friend class CPDF_FormField;
 };
 
 class CPDF_FormNotify {
  public:
   virtual ~CPDF_FormNotify() {}
 
   virtual int BeforeValueChange(CPDF_FormField* pField,
                                 const CFX_WideString& csValue) {
@@ skipping 47 matching lines @@
   CFX_ByteString Duplex() const;
 
  protected:
   CPDF_Document* const m_pDoc;
 };
 
 class CPDF_ApSettings {
  public:
   explicit CPDF_ApSettings(CPDF_Dictionary* pDict);
 
-  bool HasMKEntry(const CFX_ByteStringC& csEntry) const;
+  bool HasMKEntry(const CFX_ByteString& csEntry) const;
   int GetRotation() const;
 
   FX_ARGB GetBorderColor(int& iColorType) const {
     return GetColor(iColorType, "BC");
   }
 
   FX_FLOAT GetOriginalBorderColor(int index) const {
     return GetOriginalColor(index, "BC");
   }
 
   void GetOriginalBorderColor(int& iColorType, FX_FLOAT fc[4]) const {
     GetOriginalColor(iColorType, fc, "BC");
   }
 
   FX_ARGB GetBackgroundColor(int& iColorType) const {
     return GetColor(iColorType, "BG");
   }
 
   FX_FLOAT GetOriginalBackgroundColor(int index) const {
     return GetOriginalColor(index, "BG");
   }
 
   void GetOriginalBackgroundColor(int& iColorType, FX_FLOAT fc[4]) const {
     GetOriginalColor(iColorType, fc, "BG");
   }
 
   CFX_WideString GetNormalCaption() const { return GetCaption("CA"); }
-
   CFX_WideString GetRolloverCaption() const { return GetCaption("RC"); }
-
   CFX_WideString GetDownCaption() const { return GetCaption("AC"); }
-
   CPDF_Stream* GetNormalIcon() const { return GetIcon("I"); }
-
   CPDF_Stream* GetRolloverIcon() const { return GetIcon("RI"); }
-
   CPDF_Stream* GetDownIcon() const { return GetIcon("IX"); }
-
   CPDF_IconFit GetIconFit() const;
-
   int GetTextPosition() const;
 
  protected:
   friend class CPDF_FormControl;
 
-  FX_ARGB GetColor(int& iColorType, const CFX_ByteStringC& csEntry) const;
-
-  FX_FLOAT GetOriginalColor(int index, const CFX_ByteStringC& csEntry) const;
-
+  FX_ARGB GetColor(int& iColorType, const CFX_ByteString& csEntry) const;
+  FX_FLOAT GetOriginalColor(int index, const CFX_ByteString& csEntry) const;
   void GetOriginalColor(int& iColorType,
                         FX_FLOAT fc[4],
-                        const CFX_ByteStringC& csEntry) const;
+                        const CFX_ByteString& csEntry) const;
 
-  CFX_WideString GetCaption(const CFX_ByteStringC& csEntry) const;
-
-  CPDF_Stream* GetIcon(const CFX_ByteStringC& csEntry) const;
+  CFX_WideString GetCaption(const CFX_ByteString& csEntry) const;
+  CPDF_Stream* GetIcon(const CFX_ByteString& csEntry) const;
 
   CPDF_Dictionary* const m_pDict;
 };
 
-CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath);
-
 #endif  // CORE_FPDFDOC_INCLUDE_FPDF_DOC_H_