Rename both As{Byte,Wide}StringC() helpers to AsStringC().

fpdfsdk/fpdf_flatten.cpp

 // 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
 
 #include "public/fpdf_flatten.h"
 
 #include <algorithm>
 
@@ skipping 377 matching lines @@
   }
 
   CFX_ByteString key = "";
   int nStreams = ObjectArray.GetSize();
 
   if (nStreams > 0) {
     for (int iKey = 0; /*iKey < 100*/; iKey++) {
       char sExtend[5] = {};
       FXSYS_itoa(iKey, sExtend, 10);
       key = CFX_ByteString("FFT") + CFX_ByteString(sExtend);
-      if (!pPageXObject->KeyExist(key.AsByteStringC()))
+      if (!pPageXObject->KeyExist(key.AsStringC()))
         break;
     }
   }
 
   SetPageContents(key, pPageDict, pDocument);
 
   CPDF_Dictionary* pNewXORes = NULL;
 
   if (!key.IsEmpty()) {
-    pPageXObject->SetAtReference(key.AsByteStringC(), pDocument, dwObjNum);
+    pPageXObject->SetAtReference(key.AsStringC(), pDocument, dwObjNum);
     CPDF_Dictionary* pNewOXbjectDic = pNewXObject->GetDict();
     pNewXORes = new CPDF_Dictionary;
     pNewOXbjectDic->SetAt("Resources", pNewXORes);
     pNewOXbjectDic->SetAtName("Type", "XObject");
     pNewOXbjectDic->SetAtName("Subtype", "Form");
     pNewOXbjectDic->SetAtInteger("FormType", 1);
     pNewOXbjectDic->SetAtName("Name", "FRM");
     CFX_FloatRect rcBBox = pPageDict->GetRectBy("ArtBox");
     pNewOXbjectDic->SetAtRect("BBox", rcBBox);
   }
@@ skipping 11 matching lines @@
     if (!pAnnotAP)
       continue;
 
     CPDF_Stream* pAPStream = pAnnotAP->GetStreamBy("N");
     if (!pAPStream) {
       CPDF_Dictionary* pAPDic = pAnnotAP->GetDictBy("N");
       if (!pAPDic)
         continue;
 
       if (!sAnnotState.IsEmpty()) {
-        pAPStream = pAPDic->GetStreamBy(sAnnotState.AsByteStringC());
+        pAPStream = pAPDic->GetStreamBy(sAnnotState.AsStringC());
       } else {
         auto it = pAPDic->begin();
         if (it != pAPDic->end()) {
           CPDF_Object* pFirstObj = it->second;
           if (pFirstObj) {
             if (pFirstObj->IsReference())
               pFirstObj = pFirstObj->GetDirect();
             if (!pFirstObj->IsStream())
               continue;
             pAPStream = pFirstObj->AsStream();
@@ skipping 28 matching lines @@
 
     CPDF_Dictionary* pXObject = pNewXORes->GetDictBy("XObject");
     if (!pXObject) {
       pXObject = new CPDF_Dictionary;
       pNewXORes->SetAt("XObject", pXObject);
     }
 
     CFX_ByteString sFormName;
     sFormName.Format("F%d", i);
     uint32_t dwObjNum = pDocument->AddIndirectObject(pObj);
-    pXObject->SetAtReference(sFormName.AsByteStringC(), pDocument, dwObjNum);
+    pXObject->SetAtReference(sFormName.AsStringC(), pDocument, dwObjNum);
 
     CPDF_StreamAcc acc;
     acc.LoadAllData(pNewXObject);
 
     const uint8_t* pData = acc.GetData();
     CFX_ByteString sStream(pData, acc.GetSize());
     CFX_ByteString sTemp;
 
     if (matrix.IsIdentity()) {
       matrix.a = 1.0f;
@@ skipping 12 matching lines @@
     pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
                          FALSE);
   }
   pPageDict->RemoveAt("Annots");
 
   ObjectArray.RemoveAll();
   RectArray.RemoveAll();
 
   return FLATTEN_SUCCESS;
 }