Fix more code which has shadow variables
The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.
Review-Url: https://codereview.chromium.org/2034253003
diff --git a/fpdfsdk/javascript/JS_GlobalData.cpp b/fpdfsdk/javascript/JS_GlobalData.cpp
index 8f7810f..b34bf09 100644
--- a/fpdfsdk/javascript/JS_GlobalData.cpp
+++ b/fpdfsdk/javascript/JS_GlobalData.cpp
@@ -61,21 +61,21 @@
}
void CJS_GlobalVariableArray::Add(CJS_KeyValue* p) {
- array.Add(p);
+ m_Array.Add(p);
}
int CJS_GlobalVariableArray::Count() const {
- return array.GetSize();
+ return m_Array.GetSize();
}
CJS_KeyValue* CJS_GlobalVariableArray::GetAt(int index) const {
- return array.GetAt(index);
+ return m_Array.GetAt(index);
}
void CJS_GlobalVariableArray::Empty() {
- for (int i = 0, sz = array.GetSize(); i < sz; i++)
- delete array.GetAt(i);
- array.RemoveAll();
+ for (int i = 0, sz = m_Array.GetSize(); i < sz; i++)
+ delete m_Array.GetAt(i);
+ m_Array.RemoveAll();
}
#define READER_JS_GLOBALDATA_FILENAME L"Reader_JsGlobal.Data"