summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-04-17 15:38:19 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-04-18 17:17:36 +0000
commit3c3e271ea9fd19dd535a74b5546b27e3e82dcb81 (patch)
treee73049f2d18718da9ff8d42b46f31009c5e6e887 /fpdfsdk
parent94c5e25840046b7bf976d2d568e19ad63b656ade (diff)
downloadpdfium-3c3e271ea9fd19dd535a74b5546b27e3e82dcb81.tar.xz
Use Byte/WideString iterators
Change-Id: I85c8423c177fd7ecd5da90ef89419efc0f9cf44b Reviewed-on: https://pdfium-review.googlesource.com/4262 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/cpdfsdk_widget.cpp6
-rw-r--r--fpdfsdk/javascript/PublicMethods.cpp20
-rw-r--r--fpdfsdk/javascript/app.cpp15
3 files changed, 13 insertions, 28 deletions
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 5f0bf1dc17..a1cd8c7ce4 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -249,10 +249,10 @@ bool CPDFSDK_Widget::OnXFAAAction(PDFSDK_XFAAActionType eXFAAAT,
if (data.nSelEnd > data.nSelStart)
param.m_wsNewText.Delete(data.nSelStart, data.nSelEnd - data.nSelStart);
- for (int i = 0; i < data.sChange.GetLength(); i++)
- param.m_wsNewText.Insert(data.nSelStart, data.sChange[i]);
- param.m_wsPrevText = data.sValue;
+ for (const auto& c : data.sChange)
+ param.m_wsNewText.Insert(data.nSelStart, c);
+ param.m_wsPrevText = data.sValue;
if ((eEventType == XFA_EVENT_Click || eEventType == XFA_EVENT_Change) &&
GetFieldType() == FIELDTYPE_RADIOBUTTON) {
if (CXFA_FFWidget* hGroupWidget = GetGroupMixXFAWidget()) {
diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index f479527ef6..b5d4f7ba55 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -1141,8 +1141,7 @@ bool CJS_PublicMethods::AFDate_FormatEx(CJS_Runtime* pRuntime,
double CJS_PublicMethods::MakeInterDate(const CFX_WideString& strValue) {
std::vector<CFX_WideString> wsArray;
CFX_WideString sTemp = L"";
- for (int i = 0; i < strValue.GetLength(); ++i) {
- wchar_t c = strValue.GetAt(i);
+ for (const auto& c : strValue) {
if (c == L' ' || c == L':') {
wsArray.push_back(sTemp);
sTemp = L"";
@@ -1775,22 +1774,17 @@ bool CJS_PublicMethods::AFExtractNums(CJS_Runtime* pRuntime,
CFX_WideString sPart;
CJS_Array nums;
int nIndex = 0;
- for (int i = 0, sz = str.GetLength(); i < sz; i++) {
- wchar_t wc = str.GetAt(i);
+ for (const auto& wc : str) {
if (FXSYS_iswdigit(wc)) {
sPart += wc;
- } else {
- if (sPart.GetLength() > 0) {
- nums.SetElement(pRuntime, nIndex, CJS_Value(pRuntime, sPart.c_str()));
- sPart = L"";
- nIndex++;
- }
+ } else if (sPart.GetLength() > 0) {
+ nums.SetElement(pRuntime, nIndex, CJS_Value(pRuntime, sPart.c_str()));
+ sPart = L"";
+ nIndex++;
}
}
-
- if (sPart.GetLength() > 0) {
+ if (sPart.GetLength() > 0)
nums.SetElement(pRuntime, nIndex, CJS_Value(pRuntime, sPart.c_str()));
- }
if (nums.GetLength(pRuntime) > 0)
vRet = CJS_Value(pRuntime, nums);
diff --git a/fpdfsdk/javascript/app.cpp b/fpdfsdk/javascript/app.cpp
index 400340e38d..6d31d7e2e4 100644
--- a/fpdfsdk/javascript/app.cpp
+++ b/fpdfsdk/javascript/app.cpp
@@ -696,19 +696,10 @@ bool app::browseForDoc(CJS_Runtime* pRuntime,
CFX_WideString app::SysPathToPDFPath(const CFX_WideString& sOldPath) {
CFX_WideString sRet = L"/";
-
- for (int i = 0, sz = sOldPath.GetLength(); i < sz; i++) {
- wchar_t c = sOldPath.GetAt(i);
- if (c == L':') {
- } else {
- if (c == L'\\') {
- sRet += L"/";
- } else {
- sRet += c;
- }
- }
+ for (const wchar_t& c : sOldPath) {
+ if (c != L':')
+ sRet += (c == L'\\') ? L'/' : c;
}
-
return sRet;
}