commit 109aa6d0f673aee11a398aae478fb758fc73a33f
author Lei Zhang <thestig@chromium.org> Thu Sep 20 01:21:05 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Sep 20 01:21:05 2018 +0000
tree 0ec791dcb33395953b5afb8b667b0a1823daa789
parent f3cc72fd2b6910d4d7437f71efce23b501c5b526

Remove more unneeded STL #includes from headers.

Remove some variables named "string" to avoid false positives from the
linter.

Change-Id: I00a53e6970451fd0cea8ab2f8178183650ca00d2
Reviewed-on: https://pdfium-review.googlesource.com/42810
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fxjs/cjs_delaydata.h

diff --git a/fxjs/cjs_delaydata.h b/fxjs/cjs_delaydata.h
index deeb65d..f4c7820 100644
--- a/fxjs/cjs_delaydata.h
+++ b/fxjs/cjs_delaydata.h
@@ -7,7 +7,6 @@
 #ifndef FXJS_CJS_DELAYDATA_H_
 #define FXJS_CJS_DELAYDATA_H_
 
-#include <string>
 #include <vector>
 
 #include "core/fxcrt/fx_coordinates.h"
@@ -24,7 +23,7 @@
   WideString sFieldName;
   int32_t num;
   bool b;
-  ByteString string;
+  ByteString bytestring;
   WideString widestring;
   CFX_FloatRect rect;
   CFX_Color color;

fxjs/cjs_field.cpp

diff --git a/fxjs/cjs_field.cpp b/fxjs/cjs_field.cpp
index 1f39051..45baf61 100644
--- a/fxjs/cjs_field.cpp
+++ b/fxjs/cjs_field.cpp
@@ -2608,10 +2608,10 @@
   m_pJSDoc->AddDelayData(std::move(pNewData));
 }
 
-void CJS_Field::AddDelay_String(FIELD_PROP prop, const ByteString& string) {
+void CJS_Field::AddDelay_String(FIELD_PROP prop, const ByteString& str) {
   auto pNewData =
       pdfium::MakeUnique<CJS_DelayData>(prop, m_nFormControlIndex, m_FieldName);
-  pNewData->string = string;
+  pNewData->bytestring = str;
   m_pJSDoc->AddDelayData(std::move(pNewData));
 }
 
@@ -2644,7 +2644,7 @@
   switch (pData->eProp) {
     case FP_BORDERSTYLE:
       SetBorderStyle(pFormFillEnv, pData->sFieldName, pData->nControlIndex,
-                     pData->string);
+                     pData->bytestring);
       break;
     case FP_CURRENTVALUEINDICES:
       SetCurrentValueIndices(pFormFillEnv, pData->sFieldName,

fxjs/cjs_field.h

diff --git a/fxjs/cjs_field.h b/fxjs/cjs_field.h
index 4f21710..d4abb69 100644
--- a/fxjs/cjs_field.h
+++ b/fxjs/cjs_field.h
@@ -360,7 +360,7 @@
 
   void AddDelay_Int(FIELD_PROP prop, int32_t n);
   void AddDelay_Bool(FIELD_PROP prop, bool b);
-  void AddDelay_String(FIELD_PROP prop, const ByteString& string);
+  void AddDelay_String(FIELD_PROP prop, const ByteString& str);
   void AddDelay_Rect(FIELD_PROP prop, const CFX_FloatRect& rect);
   void AddDelay_WordArray(FIELD_PROP prop, const std::vector<uint32_t>& array);
   void AddDelay_WideStringArray(FIELD_PROP prop,

fxjs/cjs_publicmethods.h

diff --git a/fxjs/cjs_publicmethods.h b/fxjs/cjs_publicmethods.h
index f83375c..049fa68 100644
--- a/fxjs/cjs_publicmethods.h
+++ b/fxjs/cjs_publicmethods.h
@@ -7,7 +7,6 @@
 #ifndef FXJS_CJS_PUBLICMETHODS_H_
 #define FXJS_CJS_PUBLICMETHODS_H_
 
-#include <string>
 #include <vector>
 
 #include "fxjs/js_define.h"
@@ -137,11 +136,11 @@
       const v8::FunctionCallbackInfo<v8::Value>& info);
 
   static const JSMethodSpec GlobalFunctionSpecs[];
-  static int ParseStringInteger(const WideString& string,
+  static int ParseStringInteger(const WideString& str,
                                 size_t nStart,
                                 size_t* pSkip,
                                 size_t nMaxStep);
-  static WideString ParseStringString(const WideString& string,
+  static WideString ParseStringString(const WideString& str,
                                       size_t nStart,
                                       size_t* pSkip);
   static double ParseNormalDate(const WideString& value, bool* bWrongFormat);

fxjs/js_define.h

diff --git a/fxjs/js_define.h b/fxjs/js_define.h
index 0d8c43f..9187e60 100644
--- a/fxjs/js_define.h
+++ b/fxjs/js_define.h
@@ -7,7 +7,6 @@
 #ifndef FXJS_JS_DEFINE_H_
 #define FXJS_JS_DEFINE_H_
 
-#include <utility>
 #include <vector>
 
 #include "core/fxcrt/unowned_ptr.h"